diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-20 02:14:52 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-20 02:14:52 +0300 |
| commit | 2a978f827388a4645a405a2ea9c203a7940f0281 (patch) | |
| tree | 1a0ec4c23811884362630c1755de1680620caa08 /builtin/pack-objects.c | |
| parent | 336fbd18bb371f26cbe25682b38d088088cb7fd8 (diff) | |
| parent | 4279000d3e11a374a0a28d8284ca2774bd842c75 (diff) | |
Merge branch 'jc/object-names-are-not-sha-1'
A few end-user facing messages have been updated to be
hash-algorithm agnostic.
* jc/object-names-are-not-sha-1:
messages: avoid SHA-1 in end-user facing messages
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index a8692d27f18..5617c01b5aa 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -3357,7 +3357,7 @@ static void get_object_list(int ac, const char **av) if (starts_with(line, "--shallow ")) { struct object_id oid; if (get_oid_hex(line + 10, &oid)) - die("not an SHA-1 '%s'", line + 10); + die("not an object name '%s'", line + 10); register_shallow(the_repository, &oid); use_bitmap_index = 0; continue; |