From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 May 2015 18:52:25 GMT
Subject: Re: [PATCH v2 01/18] t1404: new tests of ref D/F conflicts within transactions
Message-ID: <xmqqpp672bh2.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1431357920-25090-2-git-send-email-mhagger@alum.mit.edu>

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???

After fixing it up and then running "format-patch" (or "show"), I
would get

    diff --git a/t/t1404-update-ref-df-conflicts.sh b/t/t1404-update-ref-df-conflicts.sh
    new file mode 100755
    index 0000000..2541a23
    --- /dev/null
    +++ b/t/t1404-update-ref-df-conflicts.sh
    @@ -0,0 +1,107 @@
    ...

which is more in line with what I would expect.