A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Shawn O. Pearce 7bd197c7ba 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 <spearce@spearce.org>
2007-07-22 04:09:53 -04:00
lib git-gui: Fix unnecessary fast-forward during checkout 2007-07-22 04:09:53 -04:00
.gitignore git-gui: Refactor into multiple files to save my sanity 2007-05-07 23:35:48 -04:00
GIT-VERSION-GEN Merge branch 'maint' 2007-06-11 19:06:15 -04:00
Makefile Merge branch 'maint' 2007-06-27 00:36:38 -04:00
git-gui.sh git-gui: Completely remove my Tools/Migrate hack 2007-07-22 03:08:34 -04:00