summaryrefslogtreecommitdiff
path: root/notes.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-02-11 13:39:50 -0800
committerJunio C Hamano <gitster@pobox.com>2015-02-11 13:39:50 -0800
commit092c4be7f5d691809913eb83a2360f035c67ab06 (patch)
tree5dfeb837fe69c3295daf4106c06436a16abae7e7 /notes.c
parent5c9c3dfaff886d9882252f03b7f5a11c435f5688 (diff)
parenta46442f1675722eb68238b329a4a285f03f41dda (diff)
downloadgit-092c4be7f5d691809913eb83a2360f035c67ab06.tar.gz
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 'notes.c')
-rw-r--r--notes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/notes.c b/notes.c
index c763a21eef..2be4d7f3fd 100644
--- a/notes.c
+++ b/notes.c
@@ -1006,7 +1006,7 @@ void init_notes(struct notes_tree *t, const char *notes_ref,
t->root = (struct int_node *) xcalloc(1, sizeof(struct int_node));
t->first_non_note = NULL;
t->prev_non_note = NULL;
- t->ref = notes_ref ? xstrdup(notes_ref) : NULL;
+ t->ref = xstrdup_or_null(notes_ref);
t->combine_notes = combine_notes;
t->initialized = 1;
t->dirty = 0;