* [PATCH] Fix confusing git-update-ref error message
@ 2005-11-10 19:55 Petr Baudis
0 siblings, 0 replies; only message in thread
From: Petr Baudis @ 2005-11-10 19:55 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
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>
---
update-ref.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/update-ref.c b/update-ref.c
index 65dc3d6..d79dc52 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);
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2005-11-10 19:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-11-10 19:55 [PATCH] Fix confusing git-update-ref error message Petr Baudis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).