summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorMartin Ågren <martin.agren@gmail.com>2018-05-10 19:29:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-13 01:36:11 (GMT)
commitc0bdd658bd2f06dc1c0d8fd578e80831f8d53b43 (patch)
tree0decf0297f3e219065fc0af00184abc530222952 /notes-merge.c
parentccdcbd54c4475c2238b310f7113ab3075b5abc9c (diff)
downloadgit-c0bdd658bd2f06dc1c0d8fd578e80831f8d53b43.zip
git-c0bdd658bd2f06dc1c0d8fd578e80831f8d53b43.tar.gz
git-c0bdd658bd2f06dc1c0d8fd578e80831f8d53b43.tar.bz2
refs.c: refer to "object ID", not "sha1", in error messages
We have two error messages that complain about the "sha1". Because we are about to touch one of these sites and add some tests, let's first modernize the messages to say "object ID" instead. While at it, make the second one use `error()` instead of `warning()`. After printing the message, we do not continue, but actually drop the lock and return -1 without deleting the pseudoref. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions