Re: Help: Found odd git bug

From: Marc Branchaud <marcnarc@xiplink.com>
Date: Jun 4, 2012, 19:52 UTC
Message-ID: <4FCD11E7.2060509@xiplink.com>
In-Reply-To: <7vd35ft159.fsf@alter.siamese.dyndns.org>

On 12-06-04 01:52 PM, Junio C Hamano wrote:

Show 20 quoted lines

> Marc Branchaud <marcnarc@xiplink.com> writes:
> 
>> A commit claims to add a line to a file.  Indeed, "git diff" shows the line
>> being added.
>>
>> However, when I check out the commit, the file contains a *different* line,
>> with slightly modified contents.
>>
>> What's more, "git show SHA:path/to/file" shows that the blob contains the
>> wrong line.
>>
>> I found this using git 1.7.9, but 1.7.11.rc1 also shows the problem.
>>
>> How can I narrow down what's causing this problem?
> 
> Without any information useful to diagnose, I would say it probably
> is not a bug but is an operator error when either of the "git diff"
> or "check out the commit" steps were done.  Even if you cannot share
> the repository, at least a _complete_ command line with arguments is
> needed.

(Apply egg to face...)

Indeed, not a bug, nor a misunderstanding of git's workings. Rather, the offending file already had a line that the no-longer-problematic commit should have replaced, instead of adding a nearly-identical new line later on in the file. So all this basically stems from not paying enough attention to the diff's context surrounding the change.

Sorry for the false alarm, and thanks for the patient reply!

M.