From 6b38a402e97274037982a5346ca4168cc8ee026c Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 21 Jun 2005 14:04:13 -0700 Subject: 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. --- git-fetch-script | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'git-fetch-script') diff --git a/git-fetch-script b/git-fetch-script index 7cd88b93b2..2e62f001b1 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 -- cgit v1.2.1