summaryrefslogtreecommitdiff
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
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>
-rw-r--r--refs.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/refs.c b/refs.c
index 64aadd1..7820a52 100644
--- a/refs.c
+++ b/refs.c
@@ -684,7 +684,8 @@ static int write_pseudoref(const char *pseudoref, const struct object_id *oid,
if (read_ref(pseudoref, &actual_old_oid))
die("could not read ref '%s'", pseudoref);
if (oidcmp(&actual_old_oid, old_oid)) {
- strbuf_addf(err, "unexpected sha1 when writing '%s'", pseudoref);
+ strbuf_addf(err, "unexpected object ID when writing '%s'",
+ pseudoref);
rollback_lock_file(&lock);
goto done;
}
@@ -722,7 +723,8 @@ static int delete_pseudoref(const char *pseudoref, const struct object_id *old_o
if (read_ref(pseudoref, &actual_old_oid))
die("could not read ref '%s'", pseudoref);
if (oidcmp(&actual_old_oid, old_oid)) {
- warning("Unexpected sha1 when deleting %s", pseudoref);
+ error("unexpected object ID when deleting '%s'",
+ pseudoref);
rollback_lock_file(&lock);
return -1;
}