Petr BaudisWhen 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(-)
Show changes to update-ref.c +1 −1
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);