All of lore.kernel.org
 help / color / mirror / Atom feed
* [BUG] git add -p doesn't actually add
@ 2009-05-13  4:41 Matt Graham
  0 siblings, 0 replies; only message in thread
From: Matt Graham @ 2009-05-13  4:41 UTC (permalink / raw)
  To: git

[-- 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 --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-05-13  4:41 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-05-13  4:41 [BUG] git add -p doesn't actually add Matt Graham

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.