threads / discuss / 46951

Unable to use --patch with git add

Subject: Unable to use --patch with git add

## tl;dr

8 messages between Oct 11, 2017 and Oct 12, 2017.

replies: 7people: 5as markdown or json

Santiago Torres· Oct 11, 2017, 17:49 UTC · re: Ayush Goel · lore

Re: Unable to use --patch with git add

It'd be helpful to know:
- What did you do?
- What did you expect to happen?
- What happened instead?

I suspect you are using --patch with a new file, so you probably need to first add it with -N or so. This is just a shot in the dark though...

Thanks, -Santiago.

On Wed, Oct 11, 2017 at 11:16:39PM +0530, Ayush Goel wrote:
Show 8 quoted lines
> $ git --version
> git version 2.14.2
> 
> What more details can I provide to help debug this?
> 
> -- 
> Regards,
> Ayush Goel
Ayush Goel· Oct 11, 2017, 17:55 UTC · re: Santiago Torres · lore

Re: Unable to use --patch with git add

Hello Santiago,
Thank you for picking this up.
On Wed, Oct 11, 2017 at 11:19 PM, Santiago Torres <santiago@nyu.edu> wrote:
> It'd be helpful to know:
>
> - What did you do?

I have recently updated to git version 2.14.2. The problem started happening after that. Made changes to a file. Tried `git add -p`.

> - What did you expect to happen?
Enter the patch add mode of git.
> - What happened instead?

Usual git patch mode is that it shows a patch and expects user to add/skip/split etc. Instead it never stops to take input from me.

See this ->
git add -p
diff --git a/Tests/OSXTests/TDTStreamingTests.m
b/Tests/OSXTests/TDTStreamingTests.m
index 35757bc..525fe56 100644
--- a/Tests/OSXTests/TDTStreamingTests.m
+++ b/Tests/OSXTests/TDTStreamingTests.m
@@ -116,7 +116,7 @@ static NSTask *compressionServerTask;
 }

 - (void)breathe {
-  NSDate *date = [NSDate dateWithTimeIntervalSinceNow:0.1];
+  NSDate *date = [NSDate dateWithTimeIntervalSinceNow:0.01];
   [[NSRunLoop currentRunLoop] runUntilDate:date];
 }

#### Expecting git input mode to stop the process here #####
#### Instead git exits without any error #####

>
> I suspect you are using --patch with a new file, so you probably need to first
> add it with -N or so. This is just a shot in the dark though...
>

Not adding new file.

> Thanks,
> -Santiago.
>
> On Wed, Oct 11, 2017 at 11:16:39PM +0530, Ayush Goel wrote:
>> $ git --version
>> git version 2.14.2
>>
>> What more details can I provide to help debug this?
>>
>> --
>> Regards,
>> Ayush Goel

-- 
Regards,
Ayush Goel
Jeff King· Oct 11, 2017, 18:00 UTC · re: Ayush Goel · lore

Re: Unable to use --patch with git add

On Wed, Oct 11, 2017 at 11:25:52PM +0530, Ayush Goel wrote:
Show 8 quoted lines
> On Wed, Oct 11, 2017 at 11:19 PM, Santiago Torres <santiago@nyu.edu> wrote:
> > It'd be helpful to know:
> >
> > - What did you do?
> 
> I have recently updated to git version 2.14.2. The problem started
> happening after that.
> Made changes to a file. Tried `git add -p`.

This is a known issue in v2.14.2 with having "color.ui" set to "always" in your config.

There's a fix in v2.15.0-rc1. You can either upgrade to that, or as a workaround set "color.ui" to "auto" (or remove it completely from your config, as "auto" is the default).

-Peff
Ayush Goel· Oct 11, 2017, 18:13 UTC · re: Jeff King · lore

Re: Unable to use --patch with git add

Hey Jeff,
Thank you for your mail. It works :)
For future reference, is there a page for known issues of git?
On Wed, Oct 11, 2017 at 11:30 PM, Jeff King <peff@peff.net> wrote:
Show 19 quoted lines
> On Wed, Oct 11, 2017 at 11:25:52PM +0530, Ayush Goel wrote:
>
>> On Wed, Oct 11, 2017 at 11:19 PM, Santiago Torres <santiago@nyu.edu> wrote:
>> > It'd be helpful to know:
>> >
>> > - What did you do?
>>
>> I have recently updated to git version 2.14.2. The problem started
>> happening after that.
>> Made changes to a file. Tried `git add -p`.
>
> This is a known issue in v2.14.2 with having "color.ui" set to "always"
> in your config.
>
> There's a fix in v2.15.0-rc1. You can either upgrade to that, or as a
> workaround set "color.ui" to "auto" (or remove it completely from your
> config, as "auto" is the default).
>
> -Peff
-- 
Regards,
Ayush Goel
Jeff King· Oct 11, 2017, 18:27 UTC · re: Ayush Goel · lore

Re: Unable to use --patch with git add

On Wed, Oct 11, 2017 at 11:43:46PM +0530, Ayush Goel wrote:
> Thank you for your mail. It works :)
> 
> For future reference, is there a page for known issues of git?
No, there's just the mailing list archive. But you can search it. E.g.:
  https://public-inbox.org/git/?q=%22add+-p%22
finds the relevant threads.
-Peff
Jonathan Nieder· Oct 12, 2017, 03:05 UTC · re: Ayush Goel · lore

Re: Unable to use --patch with git add

Hi Ayush,
Ayush Goel wrote:
> Thank you for your mail. It works :)
>
> For future reference, is there a page for known issues of git?

We usually try not to have known issues that would require such a warning for long. And when we fail, reminders like yours are very welcome, though a search through the mailing list archive for an existing thread to reply to instead of starting a new one is always welcome.

Sorry for the trouble.

Sincerely, Jonathan

Kevin Daudt· Oct 11, 2017, 18:49 UTC · re: Ayush Goel · lore

Re: Unable to use --patch with git add

On Wed, Oct 11, 2017 at 11:16:39PM +0530, Ayush Goel wrote:
Show 5 quoted lines
> $ git --version
> git version 2.14.2
> 
> What more details can I provide to help debug this?
> 
Hello Ayush,
Run:
  git config --global color.ui auto
  git config --unset --local color.ui #in case it's set locally

This is a known 'breakage' because people have set color.ui to always (which should not be used anyway).

Kind regards, Kevin

← back to recent threads