Re: [PATCH 1/9] Fix git patch header processing in git-apply.

with these patches and rebased them. * New option --ignore-whitespace for git-apply. This change was just wrong and could cause file corruption, I've got another version in the works which fixes the problem and adds some of the suggested features. Robert Fitzsimons [EMAIL PROTECTED] - To unsubscribe from

git-apply patches

cases for patches with mulitple fragments. [PATCH 9/9] New git-apply test cases for scanning forwards and backwards. Robert Fitzsimons [EMAIL PROTECTED] - To unsubscribe from this list: send the line unsubscribe git in the body of a message to [EMAIL PROTECTED] More majordomo info at http

[PATCH 1/9] Fix git patch header processing in git-apply.

Stop processing and return NULL if we encounter a '\n' character before we have two matching names in the git header. Signed-off-by: Robert Fitzsimons [EMAIL PROTECTED] --- apply.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 289e53f770e37dfe25c740788256d24c19c2e16d diff --git

[PATCH 2/9] Fix detection of files with only one line in git-apply.

A patch which added one line to an empty file or removed the only line from a one line file would be incorrectly detected as an invalid new or delete patch. Added a new test case. Signed-off-by: Robert Fitzsimons [EMAIL PROTECTED] --- apply.c |4 ++-- t/t4103-apply

[PATCH 4/9] Fix the procssing of multiple patch files with --check in git-apply.

with multiple patch files. Signed-off-by: Robert Fitzsimons [EMAIL PROTECTED] --- apply.c| 10 - t/t4105-apply-check.sh | 89 2 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 t/t4105-apply-check.sh

[PATCH 5/9] New option --force-delete for git-apply.

Allow the user to force a patch that deletes a file to succeed even though the file might still contain data. Added a test case. Signed-off-by: Robert Fitzsimons [EMAIL PROTECTED] --- Documentation/git-apply.txt |8 +- apply.c | 12 - t/t4106-apply

[PATCH 6/9] New option --ignore-whitespace for git-apply.

Allow the user to force a patch to be applied even though there might be whitespace differences. Added a test case for the new option. Signed-off-by: Robert Fitzsimons [EMAIL PROTECTED] --- Documentation/git-apply.txt|7 +++- apply.c| 38

[PATCH 7/9] New option --ignore-applied for git-apply.

Allow the user to allow a patch which has some hunks (fragments) already applied to succeed. Added test case and documentation. Signed-off-by: Robert Fitzsimons [EMAIL PROTECTED] --- Documentation/git-apply.txt |6 ++ apply.c | 12 + t/t4108-apply-ignore

[PATCH 8/9] New git-apply test cases for patches with mulitple fragments.

Added a test case for patches with multiple fragments. Signed-off-by: Robert Fitzsimons [EMAIL PROTECTED] --- t/t4109-apply-multifrag.sh | 176 1 files changed, 176 insertions(+), 0 deletions(-) create mode 100644 t/t4109-apply-multifrag.sh

[PATCH 9/9] New git-apply test cases for scanning forwards and backwards.

Added a new test case for the scanning forwards and backwards for the correct location to apply a patch fragment. Signed-off-by: Robert Fitzsimons [EMAIL PROTECTED] --- t/t4110-apply-scan.sh | 101 + 1 files changed, 101 insertions(+), 0