diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-24 22:09:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-24 22:09:54 -0800 |
| commit | faf723a631aff822b4808c496c0970edb0ca2a99 (patch) | |
| tree | 6ac7646bf0e31bc5ee177b358a8cdda5ea7d3fc6 /refs.c | |
| parent | 9874fca7122563e28d699a911404fc49d2a24f1c (diff) | |
| parent | a46442f1675722eb68238b329a4a285f03f41dda (diff) | |
| download | git-faf723a631aff822b4808c496c0970edb0ca2a99.tar.gz git-faf723a631aff822b4808c496c0970edb0ca2a99.tar.xz | |
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 'refs.c')
| -rw-r--r-- | refs.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -1618,8 +1618,7 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags, unsigned char *resolve_refdup(const char *ref, int resolve_flags, unsigned char *sha1, int *flags) { - const char *ret = resolve_ref_unsafe(ref, resolve_flags, sha1, flags); - return ret ? xstrdup(ret) : NULL; + return xstrdup_or_null(resolve_ref_unsafe(ref, resolve_flags, sha1, flags)); } /* The argument to filter_refs */ |