Re: [PATCH 1/2] completion: create variable for untracked file modes

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 1, 2016, 07:02 UTC
Message-ID: <xmqqk2i91jf5.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20160601040542.GA18978@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 17 quoted lines

>> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
>> index 3402475..57a0acc 100644
>> --- a/contrib/completion/git-completion.bash
>> +++ b/contrib/completion/git-completion.bash
>> @@ -1098,6 +1098,8 @@ _git_clone ()
>>  	esac
>>  }
>>  +__git_untracked_file_modes="all no normal"
>> +
>>  _git_commit ()
>>  {
>>  	case "$prev" in
>
> There's something funny about the formatting of your patch. The first
> "+" line is indented, which it shouldn't be. As it is, it looks like
> context (but it's not actually part of the preimage). But if it's not
> context, then you are missing a context line.

Not just that. Count the context lines and notice that this appears to have only 2 lines of precontext.

I think the MUA is somehow eating a blank line context (i.e. a single SP on a line by itself) immediately after the closing brace of the function before _git_commit and the next new line that began with '+' in the original and made them into a single line. I've seen this exact breakage before, I think.