From 7bd197c7ba0b93744bf0f804ec4fb0d448044e83 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Sun, 22 Jul 2007 04:09:53 -0400 Subject: [PATCH] git-gui: Fix unnecessary fast-forward during checkout If we are trying to checkout a local branch which is matched to a remote tracking branch, but the local branch is newer than the remote tracking branch we actually just want to switch to the local branch. The local branch is "Already up to date". Unfortunately we tossed away the local branch's commit SHA-1 and kept the remote tracking branch's SHA-1, which meant that the user lost the local changes when we updated the working directory. At least we did not update the local branch ref, so the user's data was still intact. We now toss the tracking branch's SHA-1 and replace with the local branch's SHA-1 before the checkout, ensuring that we pass of the right tree to git-read-tree when we update the working directory. Signed-off-by: Shawn O. Pearce --- lib/checkout_op.tcl | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/checkout_op.tcl b/lib/checkout_op.tcl index 0571115128..8c42ca8005 100644 --- a/lib/checkout_op.tcl +++ b/lib/checkout_op.tcl @@ -201,6 +201,7 @@ method _update_ref {} { # The current branch is actually newer. # set new $cur + set new_hash $cur } else { _error $this "Branch '$newbranch' already exists.\n\nIt cannot fast-forward to $new_expr.\nA merge is required." return 0