diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-02-25 09:09:54 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-02-25 09:09:54 +0300 |
commit | faf723a631aff822b4808c496c0970edb0ca2a99 (patch) | |
tree | 6ac7646bf0e31bc5ee177b358a8cdda5ea7d3fc6 /walker.c | |
parent | 9874fca7122563e28d699a911404fc49d2a24f1c (diff) | |
parent | a46442f1675722eb68238b329a4a285f03f41dda (diff) |
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 'walker.c')
-rw-r--r-- | walker.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); |