diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-01-15 23:20:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-15 23:20:29 (GMT) |
| commit | 8b327f1784d21c52bc177b5ca75665db388d6367 (patch) | |
| tree | 6a2ac96412bbb0dbc86c9c84ba2c05146dbd0fb7 /t | |
| parent | 16a8055daebdf95ca4bb97e3efe07e87f588767e (diff) | |
| parent | bc626927575cea80b8bc5fd0dbb6c6439e34e606 (diff) | |
| download | git-8b327f1784d21c52bc177b5ca75665db388d6367.zip git-8b327f1784d21c52bc177b5ca75665db388d6367.tar.gz git-8b327f1784d21c52bc177b5ca75665db388d6367.tar.bz2 | |
Merge branch 'ma/sha1-is-a-hash'
Retire more names with "sha1" in it.
* ma/sha1-is-a-hash:
hash-lookup: rename from sha1-lookup
sha1-lookup: rename `sha1_pos()` as `hash_pos()`
object-file.c: rename from sha1-file.c
object-name.c: rename from sha1-name.c
Diffstat (limited to 't')
| -rw-r--r-- | t/oid-info/README | 2 | ||||
| -rwxr-xr-x | t/t1512-rev-parse-disambiguation.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/t/oid-info/README b/t/oid-info/README index 27f843f..ca56a74 100644 --- a/t/oid-info/README +++ b/t/oid-info/README @@ -5,7 +5,7 @@ starting with `#` are ignored. The key and value are separated by whitespace (specifically, those whitespace in the default `$IFS`). The key consists only of shell identifier characters, and the value consists of a hash algorithm, colon, and value. The hash algorithm also consists only of shell identifier -characters; it should match the value in sha1-file.c. +characters; it should match the value in object-file.c. For example, the following lines map the key "rawsz" to "20" if SHA-1 is in use and to "32" if SHA-256 is in use: 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' ' |