summaryrefslogtreecommitdiff
path: root/git-pull-script
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-26 01:15:32 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-27 05:06:17 (GMT)
commitb10ac50f1e9ef851128f9800cd481d8cace18f01 (patch)
treeb48c2fd1edb6d80609a94e2078b23034057e9a1e /git-pull-script
parent90bc118fc53916a623cad84e72b7dec597907b1e (diff)
downloadgit-b10ac50f1e9ef851128f9800cd481d8cace18f01.zip
git-b10ac50f1e9ef851128f9800cd481d8cace18f01.tar.gz
git-b10ac50f1e9ef851128f9800cd481d8cace18f01.tar.bz2
Fix pulling into the same branch.
When the "git pull" command updates the branch head you are currently on, before doing anything else, first update your index file and the working tree contents to that of the new branch head. Otherwise, the later resolving steps would think your index file is attempting to revert the change between the original head commit and the updated head commit. It uses two-tree fast-forward form of "read-tree -m -u" to prevent losing whatever local changes you may have in the working tree to do this update. I think this would at least make things safer (a lot safer), and prevent mistakes. Also "git fetch" command is forbidden from fetching and fast forwarding the current branch head unless --update-head-ok flag is given. "git pull" passes the flag when it internally calls "git fetch". Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull-script')
-rwxr-xr-xgit-pull-script20
1 files changed, 19 insertions, 1 deletions
diff --git a/git-pull-script b/git-pull-script
index 7016fbf..c31a65c 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -5,7 +5,25 @@
# Fetch one or more remote refs and merge it/them into the current HEAD.
. git-sh-setup-script || die "Not a git archive"
-git-fetch-script "$@" || exit 1
+
+orig_head=$(cat "$GIT_DIR/HEAD") || die "Pulling into a black hole?"
+git-fetch-script --update-head-ok "$@" || exit 1
+
+curr_head=$(cat "$GIT_DIR/HEAD")
+if test "$curr_head" != "$orig_head"
+then
+ # The fetch involved updating the current branch.
+
+ # The working tree and the index file is still based on the
+ # $orig_head commit, but we are merging into $curr_head.
+ # First update the working tree to match $curr_head.
+
+ echo >&2 "Warning: fetch updated the current branch head."
+ echo >&2 "Warning: fast forwarding your working tree."
+ git-read-tree -u -m "$orig_head" "$curr_head" ||
+ die "You need to first update your working tree."
+fi
+
merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
merge_name=$(sed -e 's/^[0-9a-f]* //' "$GIT_DIR"/FETCH_HEAD |
tr '\012' ' ')