Instead of a separate "int quietly" argument, make it take "unsigned flags"
so that we can pass other options to it.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
sha1_name.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index 852d5c2..7cca7d9 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -218,13 +218,16 @@ static int finish_object_disambiguation(struct disambiguate_state *ds,
return 0;
}
+#define GET_SHORT_QUIETLY 01
+
static int get_short_sha1(const char *name, int len, unsigned char *sha1,
- int quietly)
+ unsigned flags)
{
int i, status;
char hex_pfx[40];
unsigned char bin_pfx[20];
struct disambiguate_state ds;
+ int quietly = !!(flags & GET_SHORT_QUIETLY);
if (len < MINIMUM_ABBREV || len > 40)
return -1;
@@ -272,7 +275,7 @@ const char *find_unique_abbrev(const unsigned char *sha1, int len)
return hex;
while (len < 40) {
unsigned char sha1_ret[20];
- status = get_short_sha1(hex, len, sha1_ret, 1);
+ status = get_short_sha1(hex, len, sha1_ret, GET_SHORT_QUIETLY);
if (exists
? !status
: status == SHORT_NAME_NOT_FOUND) {
@@ -603,7 +606,7 @@ static int get_describe_name(const char *name, int len, unsigned char *sha1)
if (ch == 'g' && cp[-1] == '-') {
cp++;
len -= cp - name;
- return get_short_sha1(cp, len, sha1, 1);
+ return get_short_sha1(cp, len, sha1, GET_SHORT_QUIETLY);
}
}
}
--
1.7.11.1.29.gf71be5c
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html