summaryrefslogtreecommitdiff
path: root/shallow.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-02-24 22:09:54 -0800
committerJunio C Hamano <gitster@pobox.com>2015-02-24 22:09:54 -0800
commitfaf723a631aff822b4808c496c0970edb0ca2a99 (patch)
tree6ac7646bf0e31bc5ee177b358a8cdda5ea7d3fc6 /shallow.c
parent9874fca7122563e28d699a911404fc49d2a24f1c (diff)
parenta46442f1675722eb68238b329a4a285f03f41dda (diff)
downloadgit-faf723a631aff822b4808c496c0970edb0ca2a99.tar.gz
Merge branch 'jk/blame-commit-label' into maint
"git blame HEAD -- missing" failed to correctly say "HEAD" when it tried to say "No such path 'missing' in HEAD". * jk/blame-commit-label: blame.c: fix garbled error message use xstrdup_or_null to replace ternary conditionals builtin/commit.c: use xstrdup_or_null instead of envdup builtin/apply.c: use xstrdup_or_null instead of null_strdup git-compat-util: add xstrdup_or_null helper
Diffstat (limited to 'shallow.c')
-rw-r--r--shallow.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/shallow.c b/shallow.c
index cdd0775146..f5e67204a4 100644
--- a/shallow.c
+++ b/shallow.c
@@ -22,7 +22,7 @@ void set_alternate_shallow_file(const char *path, int override)
if (alternate_shallow_file && !override)
return;
free(alternate_shallow_file);
- alternate_shallow_file = path ? xstrdup(path) : NULL;
+ alternate_shallow_file = xstrdup_or_null(path);
}
int register_shallow(const unsigned char *sha1)