Re: [PATCH v2 01/18] t1404: new tests of ref D/F conflicts within transactions

From: Michael Haggerty <mhagger@alum.mit.edu>
Date: May 12, 2015, 08:45 UTC
Message-ID: <5551BD94.4050200@alum.mit.edu>
In-Reply-To: <xmqqpp672bh2.fsf@gitster.dls.corp.google.com>

On 05/11/2015 08:52 PM, Junio C Hamano wrote:

Show 14 quoted lines

> Michael Haggerty <mhagger@alum.mit.edu> writes:
> 
>>  t/t1404-update-ref-df-conflicts.sh | 107 +++++++++++++++++++++++++++++++++++++
>>  1 file changed, 107 insertions(+)
>>  create mode 100755 t/t1404-update-ref-df-conflicts.sh
>>
>> diff --git a/t/t1404-update-ref-df-conflicts.sh b/t/t1404-update-ref-df-conflicts.sh
>> new file mode 100755
>> index 0000000..ed1b93e
>> --- /dev/null
>> +++ b/t/t1404-update-ref-df-conflicts.sh
>> @@ -0,1 +1,107 @@
> 
> Where does this "-0,1" come from???

Good question. I had forgotten to insert the space in

        test_update_rejected () {
                            ^ space was missing when I ran format-patch

so I edited the email file in emacs. Emacs detected that the file contained a patch, so when I edited the hunk, it tried to adjust the hunk line numbers to keep them in agreement with the patch. Obviously, it screwed up. So the incorrect line numbers were caused by a bug in emacs diff-mode.

Sorry for the confusion.

> [...]

Michael

-- 
Michael Haggerty
mhagger@alum.mit.edu