From: Matt Graham <mdg149@gmail.com>
To: git@vger.kernel.org
Subject: [BUG] git add -p doesn't actually add
Date: Wed, 13 May 2009 00:41:34 -0400 [thread overview]
Message-ID: <1c5969370905122141x527e46dev3929c4cb43c9409d@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 749 bytes --]
Hi,
I'm having a couple problems with git add -p
First problem:
1. I run "git add -p filename"
2. Split the first diff
3. Edit the first diff
4. Don't change the file, immediately write it and close the editor
I get this error:
Stage this hunk [y,n,q,a,d,/,j,J,g,e,?]? e
error: patch failed: src/pygrate/pygrator.py:1
error: src/pygrate/pygrator.py: patch does not apply
Your edited hunk does not apply. Edit again (saying "no" discards!) [y/n]? n
Second problem (on the same file):
1. I run "git add -p filename"
2. Split the first diff
3. answer 'y' to all
I run git status and it says the file is changed but not updated
The attached file shows this behavior for my version of git.
git version 1.6.3.9.g6345 (pulled from master tonight)
[-- Attachment #2: git-add-p.tar.gz --]
[-- Type: application/x-gzip, Size: 7018 bytes --]
reply other threads:[~2009-05-13 4:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1c5969370905122141x527e46dev3929c4cb43c9409d@mail.gmail.com \
--to=mdg149@gmail.com \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).