From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Jan 2010 04:28:51 +0000 (-0800)
Subject: Merge branch 'ag/patch-header-verify'
X-Git-Tag: v1.7.0-rc0~52
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/41905647fc6c94632b48b7caf65eaf3ae18f6d70?ds=inline;hp=-c

Merge branch 'ag/patch-header-verify'

* ag/patch-header-verify:
builtin-apply.c: fix the --- and +++ header filename consistency check
---

41905647fc6c94632b48b7caf65eaf3ae18f6d70
diff --combined builtin-apply.c
index b99db0b800,8ca86f66c8..2a1004d025
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@@ -404,9 -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] == '/')
@@@ -419,10 -416,7 +419,10 @@@
  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;
@@@ -692,7 -686,7 +692,7 @@@ static char *gitdiff_verify_name(const 
  		if (isnull)
  			die("git apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
  		another = find_name(line, NULL, p_value, TERM_TAB);
- 		if (!another || memcmp(another, name, len))
+ 		if (!another || memcmp(another, name, len + 1))
  			die("git apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
  		free(another);
  		return orig_name;
@@@ -1205,8 -1199,7 +1205,8 @@@ static int find_header(char *line, unsi
  				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;
@@@ -2673,7 -2666,7 +2673,7 @@@ static int verify_index_match(struct ca
  			return -1;
  		return 0;
  	}
 -	return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID);
 +	return ce_match_stat(ce, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
  }
  
  static int check_preimage(struct patch *patch, struct cache_entry **ce, struct stat *st)