diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:50 -0800 |
| commit | df91d0e4d30ddc9bf2c55e3a63be9cb5318a409a (patch) | |
| tree | 0de68b9b3ef9f2b0a72363af19fce18156d31537 | |
| parent | fcb2a7e4a3c7899a3432f5804889fa3ea5779220 (diff) | |
| parent | 158620872737067e4a74ca7aed5302af8debb714 (diff) | |
| download | git-df91d0e4d30ddc9bf2c55e3a63be9cb5318a409a.tar.gz git-df91d0e4d30ddc9bf2c55e3a63be9cb5318a409a.tar.xz | |
Merge branch 'ag/maint-apply-too-large-p'
* ag/maint-apply-too-large-p:
builtin-apply.c: Skip filenames without enough components
| -rw-r--r-- | builtin-apply.c | 11 | ||||
| -rwxr-xr-x | t/t4120-apply-popt.sh | 5 |
2 files changed, 14 insertions, 2 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 541493e1b..b99db0b80 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -404,6 +404,9 @@ static char *squash_slash(char *name) { int i = 0, j = 0; + if (!name) + return NULL; + while (name[i]) { if ((name[j++] = name[i++]) == '/') while (name[i] == '/') @@ -416,7 +419,10 @@ static char *squash_slash(char *name) static char *find_name(const char *line, char *def, int p_value, int terminate) { int len; - const char *start = line; + const char *start = NULL; + + if (p_value == 0) + start = line; if (*line == '"') { struct strbuf name = STRBUF_INIT; @@ -1199,7 +1205,8 @@ static int find_header(char *line, unsigned long size, int *hdrsize, struct patc continue; if (!patch->old_name && !patch->new_name) { if (!patch->def_name) - die("git diff header lacks filename information (line %d)", linenr); + die("git diff header lacks filename information when removing " + "%d leading pathname components (line %d)" , p_value, linenr); patch->old_name = patch->new_name = patch->def_name; } patch->is_toplevel_relative = 1; diff --git a/t/t4120-apply-popt.sh b/t/t4120-apply-popt.sh index 83d4ba679..b463b4f05 100755 --- a/t/t4120-apply-popt.sh +++ b/t/t4120-apply-popt.sh @@ -22,4 +22,9 @@ test_expect_success 'apply git diff with -p2' ' git apply -p2 patch.file ' +test_expect_success 'apply with too large -p' ' + test_must_fail git apply --stat -p3 patch.file 2>err && + grep "removing 3 leading" err +' + test_done |