summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorMartin Ågren <martin.agren@gmail.com>2020-12-31 11:56:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-01-04 21:01:55 (GMT)
commit1e6771e5046232e448e2dde4f0fee1752c9e1d04 (patch)
tree3bdc0ca1ca85837e6bc579ceada483ba3baed312 /t
parent71ca53e8125e36efbda17293c50027d31681a41f (diff)
downloadgit-1e6771e5046232e448e2dde4f0fee1752c9e1d04.zip
git-1e6771e5046232e448e2dde4f0fee1752c9e1d04.tar.gz
git-1e6771e5046232e448e2dde4f0fee1752c9e1d04.tar.bz2
object-name.c: rename from sha1-name.c
Generalize the last remnants of "sha" and "sha1" in this file and rename it to reflect that we're not just able to handle SHA-1 these days. We need to update one test to check for an updated error string. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t1512-rev-parse-disambiguation.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index 18fa6cf..cc889d7 100755
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh
@@ -48,7 +48,7 @@ test_expect_success 'blob and tree' '
test_expect_success 'warn ambiguity when no candidate matches type hint' '
test_must_fail git rev-parse --verify 000000000^{commit} 2>actual &&
- test_i18ngrep "short SHA1 000000000 is ambiguous" actual
+ test_i18ngrep "short object ID 000000000 is ambiguous" actual
'
test_expect_success 'disambiguate tree-ish' '