X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=update-ref.c;h=ba4bf5153efb38914f66658c59784b58d8b69a0a;hb=93ddef3e2dd5f7f3238fad9d52e974d03c7844f2;hp=4a1704c1a538ffde8eed46d4efb253b2d9b31b7f;hpb=a876ed83be5467d6075da8a16306724cb1babc2a;p=git.git

diff --git a/update-ref.c b/update-ref.c
index 4a1704c1..ba4bf515 100644
--- 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>]";
 
@@ -20,11 +19,13 @@ static int re_verify(const char *path, unsigned char *oldsha1, unsigned char *cu
 int main(int argc, char **argv)
 {
 	char *hex;
-	const char *refname, *value, *oldval, *path, *lockpath;
+	const char *refname, *value, *oldval, *path;
+	char *lockpath;
 	unsigned char sha1[20], oldsha1[20], currsha1[20];
 	int fd, written;
 
 	setup_git_directory();
+	git_config(git_default_config);
 	if (argc < 3 || argc > 4)
 		usage(git_update_ref_usage);
 
@@ -43,13 +44,15 @@ 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);
 	}
 	path = strdup(path);
 	lockpath = mkpath("%s.lock", path);
+	if (safe_create_leading_directories(lockpath) < 0)
+		die("Unable to create all of %s", lockpath);
 
 	fd = open(lockpath, O_CREAT | O_EXCL | O_WRONLY, 0666);
 	if (fd < 0)