X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=lib%2Ftransport.tcl;h=8e6a9d0a6010cf5efee069a2d488124bcbdb54cd;hb=fbbdaa5f425417e7fee83f543b1d03806f034cab;hp=3b05b8fc2c5620a03014274cd7855868ea468f0e;hpb=d4278b51e362e7a0f0e7922db47552f8c6726986;p=git.git

diff --git a/lib/transport.tcl b/lib/transport.tcl
index 3b05b8fc2..8e6a9d0a6 100644
--- a/lib/transport.tcl
+++ b/lib/transport.tcl
@@ -32,6 +32,7 @@ proc push_to {remote} {
 
 proc start_push_anywhere_action {w} {
 	global push_urltype push_remote push_url push_thin push_tags
+	global push_force
 
 	set r_url {}
 	switch -- $push_urltype {
@@ -45,6 +46,9 @@ proc start_push_anywhere_action {w} {
 	if {$push_thin} {
 		lappend cmd --thin
 	}
+	if {$push_force} {
+		lappend cmd --force
+	}
 	if {$push_tags} {
 		lappend cmd --tags
 	}
@@ -76,6 +80,7 @@ trace add variable push_remote write \
 proc do_push_anywhere {} {
 	global all_remotes current_branch
 	global push_urltype push_remote push_url push_thin push_tags
+	global push_force
 
 	set w .push_setup
 	toplevel $w
@@ -151,6 +156,10 @@ proc do_push_anywhere {} {
 	pack $w.dest -anchor nw -fill x -pady 5 -padx 5
 
 	labelframe $w.options -text [mc "Transfer Options"]
+	checkbutton $w.options.force \
+		-text [mc "Force overwrite existing branch (may discard changes)"] \
+		-variable push_force
+	grid $w.options.force -columnspan 2 -sticky w
 	checkbutton $w.options.thin \
 		-text [mc "Use thin pack (for slow network connections)"] \
 		-variable push_thin
@@ -163,6 +172,7 @@ proc do_push_anywhere {} {
 	pack $w.options -anchor nw -fill x -pady 5 -padx 5
 
 	set push_url {}
+	set push_force 0
 	set push_thin 0
 	set push_tags 0