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-applied.sh | 94 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 t/t4108-apply-ignore-applied.sh 5e36f3b7c8ca0710096552ce3f20f16da04e601b diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -12,7 +12,7 @@ SYNOPSIS 'git-apply' [--no-merge] [--stat] [--summary] [--check] [--index] [--show-files] [--apply] [--force-delete] [--ignore-whitespace] - [<patch>...] + [--ignore-applied] [<patch>...] DESCRIPTION ----------- @@ -73,6 +73,10 @@ OPTIONS When matching the patch to the file contents ignore sequences of tabs or spaces. +--ignore-applied:: + If a patch hunk (fragment) fails to apply, reverse the + hunk and check if the hunk has already been applied. + Author ------ Written by Linus Torvalds <[EMAIL PROTECTED]> diff --git a/apply.c b/apply.c --- a/apply.c +++ b/apply.c @@ -34,8 +34,9 @@ static int apply = 1; static int show_files = 0; static int force_delete = 0; static int ignore_whitespace = 0; +static int ignore_applied = 0; static const char apply_usage[] = -"git-apply [--no-merge] [--stat] [--summary] [--check] [--index] [--apply] [--show-files] [--force-delete] [--ignore-whitespace] <patch>..."; +"git-apply [--no-merge] [--stat] [--summary] [--check] [--index] [--apply] [--show-files] [--force-delete] [--ignore-whitespace] [--ignore-applied] <patch>..."; /* * For "diff-stat" like behaviour, we keep track of the biggest change @@ -985,6 +986,11 @@ static int apply_one_fragment(struct buf memmove(buf + offset + newsize, buf + offset + oldsize, size - offset - newsize); memcpy(buf + offset, new, newsize); offset = 0; + } else if (ignore_applied) { + offset = find_offset(buf, desc->size, new, newsize, frag->newpos); + if (offset >= 0) { + offset = 0; + } } free(old); @@ -1607,6 +1613,10 @@ int main(int argc, char **argv) ignore_whitespace = 1; continue; } + if (!strcmp(arg, "--ignore-applied")) { + ignore_applied = 1; + continue; + } fd = open(arg, O_RDONLY); if (fd < 0) usage(apply_usage); diff --git a/t/t4108-apply-ignore-applied.sh b/t/t4108-apply-ignore-applied.sh new file mode 100644 --- /dev/null +++ b/t/t4108-apply-ignore-applied.sh @@ -0,0 +1,94 @@ +#!/bin/sh +# +# Copyright (c) 2005 Junio C Hamano +# Copyright (c) 2005 Robert Fitzsimons +# + +test_description='git-apply --ignore-applied. + +' +. ./test-lib.sh + +# setup + +cat > patch1.patch <<\EOF +diff --git a/main.c b/main.c +new file mode 100644 +--- /dev/null ++++ b/main.c +@@ -0,0 +1,23 @@ ++#include <stdio.h> ++ ++void print_int(int num); ++int func(int num); ++ ++int main() { ++ int i; ++ ++ for (i = 0; i < 10; i++) { ++ print_int(func(i)); ++ } ++ ++ return 0; ++} ++ ++int func(int num) { ++ return num * num; ++} ++ ++void print_int(int num) { ++ printf("%d", num); ++} ++ +EOF +cat > patch2.patch <<\EOF +diff --git a/main.c b/main.c +--- a/main.c ++++ b/main.c +@@ -10,6 +10,8 @@ + print_int(func(i)); + } + ++ printf("\n"); ++ + return 0; + } + +EOF +cat > patch3.patch <<\EOF +diff --git a/main.c b/main.c +--- a/main.c ++++ b/main.c +@@ -10,6 +10,8 @@ + print_int(func(i)); + } + ++ printf("\n"); ++ + return 0; + } + +@@ -18,6 +20,6 @@ + } + + void print_int(int num) { +- printf("%d", num); ++ printf("%d ", num); + } + +EOF + +test_expect_failure "F = test 1" \ + 'cat patch1.patch patch2.patch patch2.patch | git-apply --check' + +test_expect_success "S = test 2" \ + 'cat patch1.patch patch2.patch patch2.patch | git-apply --check --ignore-applied' + +test_expect_failure "F = test 3" \ + 'cat patch1.patch patch3.patch patch3.patch | git-apply --check' + +test_expect_success "S = test 4" \ + 'cat patch1.patch patch2.patch patch3.patch | git-apply --check --ignore-applied' + +test_done + - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html