summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-20 21:46:38 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-20 21:46:38 -0700
commit09236d80480c15f6da804e56a80c08d320475fb1 (patch)
treefcffb58dc5dc9ae53e93f4f28357f8a15cb43da4 /ll-merge.c
parent7c74c3926ad60ba1bbfed13355f00a29813a0f32 (diff)
parented342fdea0b7fd466ed3257c5e68aa81c391b782 (diff)
downloadgit-09236d80480c15f6da804e56a80c08d320475fb1.tar.gz
Merge branch 'sb/maint-1.6.0-add-config-fix'
* sb/maint-1.6.0-add-config-fix: add: allow configurations to be overriden by command line use xstrdup, not strdup in ll-merge.c Conflicts: builtin-add.c
Diffstat (limited to 'll-merge.c')
-rw-r--r--ll-merge.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ll-merge.c b/ll-merge.c
index 31d6f0a2ee..9168958e86 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -231,7 +231,7 @@ static int read_merge_config(const char *var, const char *value, void *cb)
if (!strcmp(var, "merge.default")) {
if (value)
- default_ll_merge = strdup(value);
+ default_ll_merge = xstrdup(value);
return 0;
}
@@ -265,7 +265,7 @@ static int read_merge_config(const char *var, const char *value, void *cb)
if (!strcmp("name", ep)) {
if (!value)
return error("%s: lacks value", var);
- fn->description = strdup(value);
+ fn->description = xstrdup(value);
return 0;
}
@@ -288,14 +288,14 @@ static int read_merge_config(const char *var, const char *value, void *cb)
* file named by %A, and signal that it has done with zero exit
* status.
*/
- fn->cmdline = strdup(value);
+ fn->cmdline = xstrdup(value);
return 0;
}
if (!strcmp("recursive", ep)) {
if (!value)
return error("%s: lacks value", var);
- fn->recursive = strdup(value);
+ fn->recursive = xstrdup(value);
return 0;
}