Commit Diff

Commit:
ded8fbb852004c3af2b31b1286f4fcfb50b998ba
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
include the relevant object ID in NO_OBJ error messages where possible
Actions:
Patch | Tree
commit - 86d8a25a424bf9dff8061b9a5cf9c76f0a97327e
commit + ded8fbb852004c3af2b31b1286f4fcfb50b998ba
blob - 510b59e911ac900872569b89923df71d5eb9eecf
blob + 9c2965561dafc92cf9ff2ae9a4b44e4f2e4db6cb
--- lib/object_idset.c
+++ lib/object_idset.c
@@ -150,7 +150,7 @@ got_object_idset_remove(void **data, struct got_object
 	else
 		entry = find_element(set, id);
 	if (entry == NULL)
-		return got_error(GOT_ERR_NO_OBJ);
+		return got_error_no_obj(id);
 
 	RB_REMOVE(got_object_idset_tree, &set->entries, entry);
 	if (data)
blob - 82d26fe885d8449f2848d1c83b04195769cdc8bf
blob + 7531c15dc53560bdff8f322c2b1f6f3c61d849f4
--- lib/repository.c
+++ lib/repository.c
@@ -1432,7 +1432,7 @@ got_repo_object_match_tag(struct got_tag_object **tag,
 
 	got_ref_list_free(&refs);
 	if (err == NULL && *tag == NULL)
-		err = got_error(GOT_ERR_NO_OBJ);
+		err = got_error_path(name, GOT_ERR_NO_OBJ);
 	return err;
 }
 
blob - b66f6065e2c02dedef1895df6032263be70e7738
blob + 599d0595e970d295d9b6f9757db86cb8a72662d8
--- libexec/got-read-pack/got-read-pack.c
+++ libexec/got-read-pack/got-read-pack.c
@@ -497,13 +497,13 @@ tree_path_changed(int *changed, uint8_t **buf1, uint8_
 			struct got_object_id id1, id2;
 			int idx;
 
+			memcpy(id1.sha1, pte1->id, SHA1_DIGEST_LENGTH);
 			idx = got_packidx_get_object_idx_sha1(packidx,
 			    pte1->id);
 			if (idx == -1) {
-				err = got_error(GOT_ERR_NO_OBJ);
+				err = got_error_no_obj(&id1);
 				break;
 			}
-			memcpy(id1.sha1, pte1->id, SHA1_DIGEST_LENGTH);
 			got_object_parsed_tree_entries_free(entries1);
 			*nentries1 = 0;
 			free(*buf1);
@@ -514,13 +514,13 @@ tree_path_changed(int *changed, uint8_t **buf1, uint8_
 			if (err)
 				break;
 
+			memcpy(id2.sha1, pte2->id, SHA1_DIGEST_LENGTH);
 			idx = got_packidx_get_object_idx_sha1(packidx,
 			    pte2->id);
 			if (idx == -1) {
-				err = got_error(GOT_ERR_NO_OBJ);
+				err = got_error_no_obj(&id2);
 				break;
 			}
-			memcpy(id2.sha1, pte2->id, SHA1_DIGEST_LENGTH);
 			got_object_parsed_tree_entries_free(entries2);
 			*nentries2 = 0;
 			free(*buf2);