From: Ayush Goel <ayushgoel111@gmail.com>
To: Santiago Torres <santiago@nyu.edu>
Cc: git@vger.kernel.org
Subject: Re: Unable to use --patch with git add
Date: Wed, 11 Oct 2017 23:25:52 +0530 [thread overview]
Message-ID: <CAEBs8jKAsb3B-6WJ=ptL2AsGvDRFVPYLCsztpdTN6KCBLOo1XA@mail.gmail.com> (raw)
In-Reply-To: <20171011174952.almye3qa2tmyrmol@LykOS.localdomain>
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
next prev parent reply other threads:[~2017-10-11 17:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-11 17:46 Unable to use --patch with git add Ayush Goel
2017-10-11 17:49 ` Santiago Torres
2017-10-11 17:55 ` Ayush Goel [this message]
2017-10-11 18:00 ` Jeff King
2017-10-11 18:13 ` Ayush Goel
2017-10-11 18:27 ` Jeff King
2017-10-12 3:05 ` Jonathan Nieder
2017-10-11 18:49 ` Kevin Daudt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAEBs8jKAsb3B-6WJ=ptL2AsGvDRFVPYLCsztpdTN6KCBLOo1XA@mail.gmail.com' \
--to=ayushgoel111@gmail.com \
--cc=git@vger.kernel.org \
--cc=santiago@nyu.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).