projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix confusing git-update-ref error message
[git.git]
/
update-ref.c
diff --git
a/update-ref.c
b/update-ref.c
index
65dc3d6
..
d79dc52
100644
(file)
--- 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))
if (oldval) {
if (memcmp(currsha1, oldsha1, 20))
- die("Ref %s
changed to %s", refname, sha1_to_hex(curr
sha1));
+ die("Ref %s
is at %s but expected %s", refname, sha1_to_hex(currsha1), sha1_to_hex(old
sha1));
/* Nothing to do? */
if (!memcmp(oldsha1, sha1, 20))
exit(0);
/* Nothing to do? */
if (!memcmp(oldsha1, sha1, 20))
exit(0);