Commit Diff

Commit:
8a9c582ba19796492dd5fa3415eccd70d406d7d4
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
make gotd show relevant commit hashes in error message if ref-updates collide
Actions:
Patch | Tree
commit - 169def413f9c30c59bd16b6ea8c65db2ccce4017
commit + 8a9c582ba19796492dd5fa3415eccd70d406d7d4
blob - 0ed0622f85bbd5ae402928986b6417762d895068
blob + 7a8d4d56a34369a687e7052f5f0279c608065fae
--- gotd/session.c
+++ gotd/session.c
@@ -407,6 +407,8 @@ update_ref(int *shut, struct gotd_session_client *clie
 	char *refname = NULL;
 	size_t datalen;
 	int locked = 0;
+	char hex1[SHA1_DIGEST_STRING_LENGTH];
+	char hex2[SHA1_DIGEST_STRING_LENGTH];
 
 	log_debug("update-ref from uid %d", client->euid);
 
@@ -448,10 +450,17 @@ update_ref(int *shut, struct gotd_session_client *clie
 			if (err)
 				goto done;
 		} else {
+			err = got_ref_resolve(&id, repo, ref);
+			if (err)
+				goto done;
+			got_object_id_hex(&new_id, hex1, sizeof(hex1));
+			got_object_id_hex(id, hex2, sizeof(hex2));
 			err = got_error_fmt(GOT_ERR_REF_BUSY,
-			    "%s has been created by someone else "
-			    "while transaction was in progress",
-			    got_ref_get_name(ref));
+			    "Addition %s: %s failed; %s: %s has been "
+			    "created by someone else while transaction "
+			    "was in progress",
+			    got_ref_get_name(ref), hex1,
+			    got_ref_get_name(ref), hex2);
 			goto done;
 		}
 	} else if (iref.delete_ref) {
@@ -465,10 +474,14 @@ update_ref(int *shut, struct gotd_session_client *clie
 			goto done;
 
 		if (got_object_id_cmp(id, &old_id) != 0) {
+			got_object_id_hex(&old_id, hex1, sizeof(hex1));
+			got_object_id_hex(id, hex2, sizeof(hex2));
 			err = got_error_fmt(GOT_ERR_REF_BUSY,
-			    "%s has been modified by someone else "
-			    "while transaction was in progress",
-			    got_ref_get_name(ref));
+			    "Deletion %s: %s failed; %s: %s has been "
+			    "created by someone else while transaction "
+			    "was in progress",
+			    got_ref_get_name(ref), hex1,
+			    got_ref_get_name(ref), hex2);
 			goto done;
 		}
 
@@ -489,10 +502,14 @@ update_ref(int *shut, struct gotd_session_client *clie
 			goto done;
 
 		if (got_object_id_cmp(id, &old_id) != 0) {
+			got_object_id_hex(&old_id, hex1, sizeof(hex1));
+			got_object_id_hex(id, hex2, sizeof(hex2));
 			err = got_error_fmt(GOT_ERR_REF_BUSY,
-			    "%s has been modified by someone else "
-			    "while transaction was in progress",
-			    got_ref_get_name(ref));
+			    "Update %s: %s failed; %s: %s has been "
+			    "created by someone else while transaction "
+			    "was in progress",
+			    got_ref_get_name(ref), hex1,
+			    got_ref_get_name(ref), hex2);
 			goto done;
 		}