commit 730a8aa0c1088c8ba0135932f9d1015bdf217f9c from: Stefan Sperling date: Tue Apr 24 11:49:33 2018 UTC don't override error codes in diff_modified_blob() commit - 1a6b3ab742f2a8039449fff685356b89ac6fef6e commit + 730a8aa0c1088c8ba0135932f9d1015bdf217f9c blob - 884fe20b6f347fcfbaadd3f185d388f2488cad42 blob + 2edc9fdd16423ddcf986299d5139b69fdf772c6d --- lib/diff.c +++ lib/diff.c @@ -185,17 +185,15 @@ diff_modified_blob(struct got_object_id *id1, struct g err = got_object_open(&obj1, repo, id1); if (err) - return got_error(GOT_ERR_BAD_OBJ_HDR); + return err; if (got_object_get_type(obj1) != GOT_OBJ_TYPE_BLOB) { err = got_error(GOT_ERR_OBJ_TYPE); goto done; } err = got_object_open(&obj2, repo, id2); - if (err) { - err= got_error(GOT_ERR_BAD_OBJ_HDR); + if (err) goto done; - } if (got_object_get_type(obj2) != GOT_OBJ_TYPE_BLOB) { err = got_error(GOT_ERR_BAD_OBJ_DATA); goto done;