summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2010-01-17 02:05:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-18 18:32:05 (GMT)
commit158620872737067e4a74ca7aed5302af8debb714 (patch)
treef6d80d07207cff8387c93b9ce32f2de290757e68 /builtin-apply.c
parent902f235378cb2b2f6dd5dd664b9630c95321f0ae (diff)
downloadgit-158620872737067e4a74ca7aed5302af8debb714.zip
git-158620872737067e4a74ca7aed5302af8debb714.tar.gz
git-158620872737067e4a74ca7aed5302af8debb714.tar.bz2
builtin-apply.c: Skip filenames without enough components
find_name() wrongly returned the whole filename for filenames without enough leading pathname components (e.g., when applying a patch to a top-level file with -p2). Include the -p value used in the error message when no filenames can be found. [jc: squashed a test from Nanako Shiraishi] Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-apply.c')
-rw-r--r--builtin-apply.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index 36e2f9d..218363f 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;