object-name: make get_oid quietly return an error
A reasonable person looking at the signature and usage of get_oid and friends might conclude that in the event of an error, it always returns -1. However, this is not the case. Instead, get_oid_basic dies if we go too far back into the history of a reflog (or, when quiet, simply exits). This is not especially useful, since in many cases, we might want to handle this error differently. Let's add a flag here to make it just return -1 like elsewhere in these code paths. Note that we cannot make this behavior the default, since we have many other codepaths that rely on the existing behavior, including in tests. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Jun 12, 2025 at 01:12 UTC
393bbb21c977d4dbfcfc8ffd7474712b65719d3d
2 files changed
+6
-1
hash.h
+1
@@ -216,6 +216,7 @@ struct object_id {
216
#define GET_OID_REQUIRE_PATH 010000
217
#define GET_OID_HASH_ANY 020000
218
#define GET_OID_SKIP_AMBIGUITY_CHECK 040000
219
+#define GET_OID_GENTLY 0100000
220
221
#define GET_OID_DISAMBIGUATORS \
222
(GET_OID_COMMIT | GET_OID_COMMITTISH | \
object-name.c
+5
-1
@@ -1081,13 +1081,17 @@ static int get_oid_basic(struct repository *r, const char *str, int len,
1081
* still fill in the oid with the "old" value,
1082
* which we can use.
1083
*/
1084
- } else {
1084
+ } else if (!(flags & GET_OID_GENTLY)) {
1085
if (flags & GET_OID_QUIETLY) {
1086
exit(128);
1087
}
1088
die(_("log for '%.*s' only has %d entries"),
1089
len, str, co_cnt);
1090
}
1091
+ if (flags & GET_OID_GENTLY) {
1092
+ free(real_ref);
1093
+ return -1;
1094
+ }
1095
}
1096
}
1097