diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-02-11 13:39:50 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-02-11 13:39:50 -0800 |
commit | 092c4be7f5d691809913eb83a2360f035c67ab06 (patch) | |
tree | 5dfeb837fe69c3295daf4106c06436a16abae7e7 /walker.c | |
parent | 5c9c3dfaff886d9882252f03b7f5a11c435f5688 (diff) | |
parent | a46442f1675722eb68238b329a4a285f03f41dda (diff) |
Merge branch 'jk/blame-commit-label'
"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 'walker.c')
-rw-r--r-- | walker.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/walker.c b/walker.c index f149371e71..483da4e0fb 100644 --- a/walker.c +++ b/walker.c @@ -232,7 +232,7 @@ int walker_targets_stdin(char ***target, const char ***write_ref) REALLOC_ARRAY(*write_ref, targets_alloc); } (*target)[targets] = xstrdup(tg_one); - (*write_ref)[targets] = rf_one ? xstrdup(rf_one) : NULL; + (*write_ref)[targets] = xstrdup_or_null(rf_one); targets++; } strbuf_release(&buf); |