[BUG] git add -p doesn't actually add

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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: git-add-p.tar.gz
Description: GNU Zip compressed data


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]