mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Counto-fix in merge-recursive

Browse Source 
When the configuration has variables unrelated to low-level
merge drivers (e.g. merge.summary), the code failed to ignore
them but did something totally senseless.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2007-04-18 19:05:57 -07:00
parent a5e92abde6
commit 15ba3af2d5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
merge-recursive.c
View File

@ -809,6 +809,9 @@ static int ll_ext_merge(const struct ll_merge_driver *fn,
int status, fd, i; int status, fd, i;
struct stat st; struct stat st;
if (fn->cmdline == NULL)
die("custom merge driver %s lacks command line.", fn->name);
result->ptr = NULL; result->ptr = NULL;
result->size = 0; result->size = 0;
create_temp(orig, temp[0]); create_temp(orig, temp[0]);
@ -879,7 +882,7 @@ static int read_merge_config(const char *var, const char *value)
* especially, we do not want to look at variables such as * especially, we do not want to look at variables such as
* "merge.summary", "merge.tool", and "merge.verbosity". * "merge.summary", "merge.tool", and "merge.verbosity".
*/ */
if (prefixcmp(var, "merge.") || (ep = strrchr(var, '.')) == var + 6) if (prefixcmp(var, "merge.") || (ep = strrchr(var, '.')) == var + 5)
return 0; return 0;
/* /*