]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: edf0424) | patch
t6024: update for SHA-256
authorbrian m. carlson <sandals@crustytoothpaste.net>
Fri, 7 Feb 2020 00:52:54 +0000 (00:52 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Feb 2020 19:07:31 +0000 (11:07 -0800)
commitf3037657e8431073f0b240691877ca32baa142eb
tree75f787232ca2626d2c2000453e77c93854141ccctree | snapshot
parentedf04243b2b805c4730c531745e8a5b317cd0a90commit | diff
t6024: update for SHA-256

To make this test work with SHA-256, compute two of the items in the
conflicted index entry.  The other entry is a conflict within a conflict
and computing it is difficult, so use test_oid_cache to specify the
proper values for both hash algorithms.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6024-recursive-merge.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.