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 inf
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(-)
289e53f770e37dfe25c740788256d
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
data instead of the on disk image.
Added a series of test cases for the processing of complex single
file patches.
Signed-off-by: Robert Fitzsimons <[EMAIL PROTECTED]>
---
apply.c | 64 +-
t/t4104-apply-complex.sh
check 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-app
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
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
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
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-multif
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
e fixed up the problems 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
11 matches
Mail list logo