From: Petr Baudis <pasky@suse.cz>
Date: Thu, 10 Nov 2005 19:55:13 +0000 (+0100)
Subject: Fix confusing git-update-ref error message
X-Git-Tag: v0.99.9h^2~34
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ad7db62113368279a1b6994790bf30925fabea33;p=git.git

Fix confusing git-update-ref error message

When git-update-ref has hit the "Ref %s changed to %s" error, I just stare
at it, left puzzled. This patch attempts to reword that to a more useful
and less confusing error message.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/update-ref.c b/update-ref.c
index 65dc3d638..d79dc52fd 100644
--- a/update-ref.c
+++ b/update-ref.c
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
 
 	if (oldval) {
 		if (memcmp(currsha1, oldsha1, 20))
-			die("Ref %s changed to %s", refname, sha1_to_hex(currsha1));
+			die("Ref %s is at %s but expected %s", refname, sha1_to_hex(currsha1), sha1_to_hex(oldsha1));
 		/* Nothing to do? */
 		if (!memcmp(oldsha1, sha1, 20))
 			exit(0);