merge with /dev/null as base, instead of punting O==empty case

diff --git a/update-ref.c b/update-ref.c
index 4a1704c1a538ffde8eed46d4efb253b2d9b31b7f..d79dc52fd7d1eb1117e37c6b400c5f99bc8e4fcd 100644 (file)
--- a/update-ref.c
+++ b/update-ref.c
@@ -1,6 +1,5 @@
 #include "cache.h"
 #include "refs.h"
-#include <ctype.h>
 
 static const char git_update_ref_usage[] = "git-update-ref <refname> <value> [<oldval>]";
 
@@ -43,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);