From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 03 Dec 2010 21:02:17 GMT
Subject: Re: cannot find hash in the log output
Message-ID: <7vfwueo9ie.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20101203205534.GA15658@burratino>

Jonathan Nieder <jrnieder@gmail.com> writes:

>> ::SourceMode1 SourceMode2 resultMode Source1-SHA1 Source2-SHA1 resultingSHA1 MM path/to/file
> [...]
>> 1. a) Why this exact output is not provided in "git log --raw" or in
>> "git whatchanged" for the merge commits? b) Can it be provided?
>
> Sorry to be opaque.  "git log" et al accept -c too, of course. :)  I pointed
> to diff-tree because it seems you are scripting, so its simplicity and
> better guarantees about long-term compatibility might be appealing.

Two nits if this is really to help scripters.

 - Both -c and --cc cull merges uninteresting at the file level; if the
   script _really_ wants to view the whole history, giving -m would be
   more appropriate.

 - The default history traversal is --dense and also with merge
   simplification turned on; again, if the script _really_ wants to view
   the whole history, --sparse and/or --full-history would be necessary
   depending on the needs.