Re: Items not covered by repository-layout.txt

From: Junio C Hamano <junkio@cox.net>
Date: Jul 11, 2006, 00:23 UTC
Message-ID: <7vlkr16lc6.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <e8uhjg$5o1$1@sea.gmane.org>

Jakub Narebski <jnareb@gmail.com> writes:

> Could you then tell me what is the format of FETCH_HEAD and what other *_HEADs 
> can be seen in $GIT_DIR (MERGE_HEAD?)?

Which essentially is that you are telling me to do that, but I am a bit busy this week.

If you can use the source to figure them out, that would be great; otherwise this can wait or others can chime in.

For FETCH_HEAD fmt-merge-msg and git-pull would be helpful. The general format is, one entry per line:

	object name <TAB> merge-marker <TAB> notes

where merge-marker is either empty (for commits to be merged by git-pull that called git-fetch) or not-for-merge, and notes is a human readable comment that describes where that object came from. Note that this is read both by humans _AND_ machine; fmt-merge-msg relies on how it is stated.

Others "git grep -e _HEAD -- '*.sh'" perhaps.

	ORIG_HEAD - used to keep the value of HEAD before we do
                    anything we might regret

	MERGE_HEAD - one or more commit object names that are
                    being merged into the current branch during
                    a merge.

	MERGE_MSG - generated message for an automerge.