Re: git-name-rev off-by-one bug

From: Junio C Hamano <junkio@cox.net>
Date: Nov 30, 2005, 06:39 UTC
Message-ID: <7vwtiqzljr.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20051130060906.13277.qmail@science.horizon.com>

linux@horizon.com writes:

Show 8 quoted lines

>> +-0 -1 -2::
>> +	When an unmerged entry is seen, diff against the base version,
>> +	the "first branch" or the "second branch" respectively.
>> +
>> +	The default is to diff against the first branch.
>> +
>
> Er... why are these flags zero-based?

Because -1 means "first branch" (usually "ours", aka HEAD), and -2 means "second branch" ("theirs", aka MERGE_HEAD), and -0 is for the base (aka merge base)?

But I think you are right. The numeric parameters should match stage number for consistency.

How about if I redo the patch to make diff-files accept -1/-2/-3 instead, and in addition accept "--base", "--ours", and "--theirs" as synonyms?

Side note. diff3 says MINE OLDER YOURS and the way to remember the order is they are alphabetical. We can say the same for base, ours and theirs.