summaryrefslogtreecommitdiff
path: root/git-fetch-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-21 21:04:13 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-21 21:04:13 (GMT)
commit6b38a402e97274037982a5346ca4168cc8ee026c (patch)
treedf65bb53e13bac7ef13375fa5f067d14f96e4532 /git-fetch-script
parentd565b3412a0242e2c729bd77d18c74ecd57184dc (diff)
downloadgit-6b38a402e97274037982a5346ca4168cc8ee026c.zip
git-6b38a402e97274037982a5346ca4168cc8ee026c.tar.gz
git-6b38a402e97274037982a5346ca4168cc8ee026c.tar.bz2
Clean up different special *HEAD handling
We codify the following different heads (in addition to the main "HEAD", which points to the current branch, of course): - FETCH_HEAD Populated by "git fetch" - ORIG_HEAD The old HEAD before a "git pull/resolve" (successful or not) - LAST_MERGE The HEAD we're currently merging in "git pull/resolve" - MERGE_HEAD The previous head of a unresolved "git pull", which gets committed by a "git commit" after manually resolving the result We used to have "MERGE_HEAD" be populated directly by the fetch, and we removed ORIG_HEAD and LAST_MERGE too aggressively.
Diffstat (limited to 'git-fetch-script')
-rwxr-xr-xgit-fetch-script4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-fetch-script b/git-fetch-script
index 7cd88b9..2e62f00 100755
--- a/git-fetch-script
+++ b/git-fetch-script
@@ -35,7 +35,7 @@ download_objects () {
}
echo "Getting remote $merge_name"
-download_one "$merge_repo/$merge_name" "$GIT_DIR"/MERGE_HEAD || exit 1
+download_one "$merge_repo/$merge_name" "$GIT_DIR"/FETCH_HEAD || exit 1
echo "Getting object database"
-download_objects "$merge_repo" "$(cat "$GIT_DIR"/MERGE_HEAD)" || exit 1
+download_objects "$merge_repo" "$(cat "$GIT_DIR"/FETCH_HEAD)" || exit 1