Skip to content

Commit 7673ecd

Browse files
ebiedermgitster
ebiederm
authored and
gitster
committed
t1016-compatObjectFormat: add tests to verify the conversion between objects
For now my strategy is simple. Create two identical repositories one in each format. Use fixed timestamps. Verify the dynamically computed compatibility objects from one repository match the objects stored in the other repository. A general limitation of this strategy is that the git when generating signed tags and commits with compatObjectFormat enabled will generate a signature for both formats. To overcome this limitation I have added "test-tool delete-gpgsig" that when fed an signed commit or tag with two signatures deletes one of the signatures. With that in place I can have "git commit" and "git tag" generate signed objects, have my tool delete one, and feed the new object into "git hash-object" to create the kinds of commits and tags git without compatObjectFormat enabled will generate. Signed-off-by: "Eric W. Biederman" <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3afa8d8 commit 7673ecd

File tree

6 files changed

+348
-0
lines changed

6 files changed

+348
-0
lines changed

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -790,6 +790,7 @@ TEST_BUILTINS_OBJS += test-crontab.o
790790
TEST_BUILTINS_OBJS += test-csprng.o
791791
TEST_BUILTINS_OBJS += test-ctype.o
792792
TEST_BUILTINS_OBJS += test-date.o
793+
TEST_BUILTINS_OBJS += test-delete-gpgsig.o
793794
TEST_BUILTINS_OBJS += test-delta.o
794795
TEST_BUILTINS_OBJS += test-dir-iterator.o
795796
TEST_BUILTINS_OBJS += test-drop-caches.o

‎t/helper/test-delete-gpgsig.c

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#include "test-tool.h"
2+
#include "gpg-interface.h"
3+
#include "strbuf.h"
4+
5+
6+
int cmd__delete_gpgsig(int argc, const char **argv)
7+
{
8+
struct strbuf buf = STRBUF_INIT;
9+
const char *pattern = "gpgsig";
10+
const char *bufptr, *tail, *eol;
11+
int deleting = 0;
12+
size_t plen;
13+
14+
if (argc >= 2) {
15+
pattern = argv[1];
16+
argv++;
17+
argc--;
18+
}
19+
20+
plen = strlen(pattern);
21+
strbuf_read(&buf, 0, 0);
22+
23+
if (!strcmp(pattern, "trailer")) {
24+
size_t payload_size = parse_signed_buffer(buf.buf, buf.len);
25+
fwrite(buf.buf, 1, payload_size, stdout);
26+
fflush(stdout);
27+
return 0;
28+
}
29+
30+
bufptr = buf.buf;
31+
tail = bufptr + buf.len;
32+
33+
while (bufptr < tail) {
34+
/* Find the end of the line */
35+
eol = memchr(bufptr, '\n', tail - bufptr);
36+
if (!eol)
37+
eol = tail;
38+
39+
/* Drop continuation lines */
40+
if (deleting && (bufptr < eol) && (bufptr[0] == ' ')) {
41+
bufptr = eol + 1;
42+
continue;
43+
}
44+
deleting = 0;
45+
46+
/* Does the line match the prefix? */
47+
if (((bufptr + plen) < eol) &&
48+
!memcmp(bufptr, pattern, plen) &&
49+
(bufptr[plen] == ' ')) {
50+
deleting = 1;
51+
bufptr = eol + 1;
52+
continue;
53+
}
54+
55+
/* Print all other lines */
56+
fwrite(bufptr, 1, (eol - bufptr) + 1, stdout);
57+
bufptr = eol + 1;
58+
}
59+
fflush(stdout);
60+
61+
return 0;
62+
}

‎t/helper/test-tool.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ static struct test_cmd cmds[] = {
2121
{ "csprng", cmd__csprng },
2222
{ "ctype", cmd__ctype },
2323
{ "date", cmd__date },
24+
{ "delete-gpgsig", cmd__delete_gpgsig },
2425
{ "delta", cmd__delta },
2526
{ "dir-iterator", cmd__dir_iterator },
2627
{ "drop-caches", cmd__drop_caches },

‎t/helper/test-tool.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ int cmd__csprng(int argc, const char **argv);
1515
int cmd__ctype(int argc, const char **argv);
1616
int cmd__date(int argc, const char **argv);
1717
int cmd__delta(int argc, const char **argv);
18+
int cmd__delete_gpgsig(int argc, const char **argv);
1819
int cmd__dir_iterator(int argc, const char **argv);
1920
int cmd__drop_caches(int argc, const char **argv);
2021
int cmd__dump_cache_tree(int argc, const char **argv);

‎t/t1016-compatObjectFormat.sh

Lines changed: 281 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,281 @@
1+
#!/bin/sh
2+
#
3+
# Copyright (c) 2023 Eric Biederman
4+
#
5+
6+
test_description='Test how well compatObjectFormat works'
7+
8+
TEST_PASSES_SANITIZE_LEAK=true
9+
. ./test-lib.sh
10+
. "$TEST_DIRECTORY"/lib-gpg.sh
11+
12+
# All of the follow variables must be defined in the environment:
13+
# GIT_AUTHOR_NAME
14+
# GIT_AUTHOR_EMAIL
15+
# GIT_AUTHOR_DATE
16+
# GIT_COMMITTER_NAME
17+
# GIT_COMMITTER_EMAIL
18+
# GIT_COMMITTER_DATE
19+
#
20+
# The test relies on these variables being set so that the two
21+
# different commits in two different repositories encoded with two
22+
# different hash functions result in the same content in the commits.
23+
# This means that when the commit is translated between hash functions
24+
# the commit is identical to the commit in the other repository.
25+
26+
compat_hash () {
27+
case "$1" in
28+
"sha1")
29+
echo "sha256"
30+
;;
31+
"sha256")
32+
echo "sha1"
33+
;;
34+
esac
35+
}
36+
37+
hello_oid () {
38+
case "$1" in
39+
"sha1")
40+
echo "$hello_sha1_oid"
41+
;;
42+
"sha256")
43+
echo "$hello_sha256_oid"
44+
;;
45+
esac
46+
}
47+
48+
tree_oid () {
49+
case "$1" in
50+
"sha1")
51+
echo "$tree_sha1_oid"
52+
;;
53+
"sha256")
54+
echo "$tree_sha256_oid"
55+
;;
56+
esac
57+
}
58+
59+
commit_oid () {
60+
case "$1" in
61+
"sha1")
62+
echo "$commit_sha1_oid"
63+
;;
64+
"sha256")
65+
echo "$commit_sha256_oid"
66+
;;
67+
esac
68+
}
69+
70+
commit2_oid () {
71+
case "$1" in
72+
"sha1")
73+
echo "$commit2_sha1_oid"
74+
;;
75+
"sha256")
76+
echo "$commit2_sha256_oid"
77+
;;
78+
esac
79+
}
80+
81+
del_sigcommit () {
82+
local delete=$1
83+
84+
if test "$delete" = "sha256" ; then
85+
local pattern="gpgsig-sha256"
86+
else
87+
local pattern="gpgsig"
88+
fi
89+
test-tool delete-gpgsig "$pattern"
90+
}
91+
92+
93+
del_sigtag () {
94+
local storage=$1
95+
local delete=$2
96+
97+
if test "$storage" = "$delete" ; then
98+
local pattern="trailer"
99+
elif test "$storage" = "sha256" ; then
100+
local pattern="gpgsig"
101+
else
102+
local pattern="gpgsig-sha256"
103+
fi
104+
test-tool delete-gpgsig "$pattern"
105+
}
106+
107+
base=$(pwd)
108+
for hash in sha1 sha256
109+
do
110+
cd "$base"
111+
mkdir -p repo-$hash
112+
cd repo-$hash
113+
114+
test_expect_success "setup $hash repository" '
115+
git init --object-format=$hash &&
116+
git config core.repositoryformatversion 1 &&
117+
git config extensions.objectformat $hash &&
118+
git config extensions.compatobjectformat $(compat_hash $hash) &&
119+
git config gpg.program $TEST_DIRECTORY/t1016/gpg &&
120+
echo "Hellow World!" > hello &&
121+
eval hello_${hash}_oid=$(git hash-object hello) &&
122+
git update-index --add hello &&
123+
git commit -m "Initial commit" &&
124+
eval commit_${hash}_oid=$(git rev-parse HEAD) &&
125+
eval tree_${hash}_oid=$(git rev-parse HEAD^{tree})
126+
'
127+
test_expect_success "create a $hash tagged blob" '
128+
git tag --no-sign -m "This is a tag" hellotag $(hello_oid $hash) &&
129+
eval hellotag_${hash}_oid=$(git rev-parse hellotag)
130+
'
131+
test_expect_success "create a $hash tagged tree" '
132+
git tag --no-sign -m "This is a tag" treetag $(tree_oid $hash) &&
133+
eval treetag_${hash}_oid=$(git rev-parse treetag)
134+
'
135+
test_expect_success "create a $hash tagged commit" '
136+
git tag --no-sign -m "This is a tag" committag $(commit_oid $hash) &&
137+
eval committag_${hash}_oid=$(git rev-parse committag)
138+
'
139+
test_expect_success GPG2 "create a $hash signed commit" '
140+
git commit --gpg-sign --allow-empty -m "This is a signed commit" &&
141+
eval signedcommit_${hash}_oid=$(git rev-parse HEAD)
142+
'
143+
test_expect_success GPG2 "create a $hash signed tag" '
144+
git tag -s -m "This is a signed tag" signedtag HEAD &&
145+
eval signedtag_${hash}_oid=$(git rev-parse signedtag)
146+
'
147+
test_expect_success "create a $hash branch" '
148+
git checkout -b branch $(commit_oid $hash) &&
149+
echo "More more more give me more!" > more &&
150+
eval more_${hash}_oid=$(git hash-object more) &&
151+
echo "Another and another and another" > another &&
152+
eval another_${hash}_oid=$(git hash-object another) &&
153+
git update-index --add more another &&
154+
git commit -m "Add more files!" &&
155+
eval commit2_${hash}_oid=$(git rev-parse HEAD) &&
156+
eval tree2_${hash}_oid=$(git rev-parse HEAD^{tree})
157+
'
158+
test_expect_success GPG2 "create another $hash signed tag" '
159+
git tag -s -m "This is another signed tag" signedtag2 $(commit2_oid $hash) &&
160+
eval signedtag2_${hash}_oid=$(git rev-parse signedtag2)
161+
'
162+
test_expect_success GPG2 "merge the $hash branches together" '
163+
git merge -S -m "merge some signed tags together" signedtag signedtag2 &&
164+
eval signedcommit2_${hash}_oid=$(git rev-parse HEAD)
165+
'
166+
test_expect_success GPG2 "create additional $hash signed commits" '
167+
git commit --gpg-sign --allow-empty -m "This is an additional signed commit" &&
168+
git cat-file commit HEAD | del_sigcommit sha256 > "../${hash}_signedcommit3" &&
169+
git cat-file commit HEAD | del_sigcommit sha1 > "../${hash}_signedcommit4" &&
170+
eval signedcommit3_${hash}_oid=$(git hash-object -t commit -w ../${hash}_signedcommit3) &&
171+
eval signedcommit4_${hash}_oid=$(git hash-object -t commit -w ../${hash}_signedcommit4)
172+
'
173+
test_expect_success GPG2 "create additional $hash signed tags" '
174+
git tag -s -m "This is an additional signed tag" signedtag34 HEAD &&
175+
git cat-file tag signedtag34 | del_sigtag "${hash}" sha256 > ../${hash}_signedtag3 &&
176+
git cat-file tag signedtag34 | del_sigtag "${hash}" sha1 > ../${hash}_signedtag4 &&
177+
eval signedtag3_${hash}_oid=$(git hash-object -t tag -w ../${hash}_signedtag3) &&
178+
eval signedtag4_${hash}_oid=$(git hash-object -t tag -w ../${hash}_signedtag4)
179+
'
180+
done
181+
cd "$base"
182+
183+
compare_oids () {
184+
test "$#" = 5 && { local PREREQ=$1; shift; } || PREREQ=
185+
local type="$1"
186+
local name="$2"
187+
local sha1_oid="$3"
188+
local sha256_oid="$4"
189+
190+
echo ${sha1_oid} > ${name}_sha1_expected
191+
echo ${sha256_oid} > ${name}_sha256_expected
192+
echo ${type} > ${name}_type_expected
193+
194+
git --git-dir=repo-sha1/.git rev-parse --output-object-format=sha256 ${sha1_oid} > ${name}_sha1_sha256_found
195+
git --git-dir=repo-sha256/.git rev-parse --output-object-format=sha1 ${sha256_oid} > ${name}_sha256_sha1_found
196+
local sha1_sha256_oid=$(cat ${name}_sha1_sha256_found)
197+
local sha256_sha1_oid=$(cat ${name}_sha256_sha1_found)
198+
199+
test_expect_success $PREREQ "Verify ${type} ${name}'s sha1 oid" '
200+
git --git-dir=repo-sha256/.git rev-parse --output-object-format=sha1 ${sha256_oid} > ${name}_sha1 &&
201+
test_cmp ${name}_sha1 ${name}_sha1_expected
202+
'
203+
204+
test_expect_success $PREREQ "Verify ${type} ${name}'s sha256 oid" '
205+
git --git-dir=repo-sha1/.git rev-parse --output-object-format=sha256 ${sha1_oid} > ${name}_sha256 &&
206+
test_cmp ${name}_sha256 ${name}_sha256_expected
207+
'
208+
209+
test_expect_success $PREREQ "Verify ${name}'s sha1 type" '
210+
git --git-dir=repo-sha1/.git cat-file -t ${sha1_oid} > ${name}_type1 &&
211+
git --git-dir=repo-sha256/.git cat-file -t ${sha256_sha1_oid} > ${name}_type2 &&
212+
test_cmp ${name}_type1 ${name}_type2 &&
213+
test_cmp ${name}_type1 ${name}_type_expected
214+
'
215+
216+
test_expect_success $PREREQ "Verify ${name}'s sha256 type" '
217+
git --git-dir=repo-sha256/.git cat-file -t ${sha256_oid} > ${name}_type3 &&
218+
git --git-dir=repo-sha1/.git cat-file -t ${sha1_sha256_oid} > ${name}_type4 &&
219+
test_cmp ${name}_type3 ${name}_type4 &&
220+
test_cmp ${name}_type3 ${name}_type_expected
221+
'
222+
223+
test_expect_success $PREREQ "Verify ${name}'s sha1 size" '
224+
git --git-dir=repo-sha1/.git cat-file -s ${sha1_oid} > ${name}_size1 &&
225+
git --git-dir=repo-sha256/.git cat-file -s ${sha256_sha1_oid} > ${name}_size2 &&
226+
test_cmp ${name}_size1 ${name}_size2
227+
'
228+
229+
test_expect_success $PREREQ "Verify ${name}'s sha256 size" '
230+
git --git-dir=repo-sha256/.git cat-file -s ${sha256_oid} > ${name}_size3 &&
231+
git --git-dir=repo-sha1/.git cat-file -s ${sha1_sha256_oid} > ${name}_size4 &&
232+
test_cmp ${name}_size3 ${name}_size4
233+
'
234+
235+
test_expect_success $PREREQ "Verify ${name}'s sha1 pretty content" '
236+
git --git-dir=repo-sha1/.git cat-file -p ${sha1_oid} > ${name}_content1 &&
237+
git --git-dir=repo-sha256/.git cat-file -p ${sha256_sha1_oid} > ${name}_content2 &&
238+
test_cmp ${name}_content1 ${name}_content2
239+
'
240+
241+
test_expect_success $PREREQ "Verify ${name}'s sha256 pretty content" '
242+
git --git-dir=repo-sha256/.git cat-file -p ${sha256_oid} > ${name}_content3 &&
243+
git --git-dir=repo-sha1/.git cat-file -p ${sha1_sha256_oid} > ${name}_content4 &&
244+
test_cmp ${name}_content3 ${name}_content4
245+
'
246+
247+
test_expect_success $PREREQ "Verify ${name}'s sha1 content" '
248+
git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_oid} > ${name}_content5 &&
249+
git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_sha1_oid} > ${name}_content6 &&
250+
test_cmp ${name}_content5 ${name}_content6
251+
'
252+
253+
test_expect_success $PREREQ "Verify ${name}'s sha256 content" '
254+
git --git-dir=repo-sha256/.git cat-file ${type} ${sha256_oid} > ${name}_content7 &&
255+
git --git-dir=repo-sha1/.git cat-file ${type} ${sha1_sha256_oid} > ${name}_content8 &&
256+
test_cmp ${name}_content7 ${name}_content8
257+
'
258+
259+
}
260+
261+
compare_oids 'blob' hello "$hello_sha1_oid" "$hello_sha256_oid"
262+
compare_oids 'tree' tree "$tree_sha1_oid" "$tree_sha256_oid"
263+
compare_oids 'commit' commit "$commit_sha1_oid" "$commit_sha256_oid"
264+
compare_oids GPG2 'commit' signedcommit "$signedcommit_sha1_oid" "$signedcommit_sha256_oid"
265+
compare_oids 'tag' hellotag "$hellotag_sha1_oid" "$hellotag_sha256_oid"
266+
compare_oids 'tag' treetag "$treetag_sha1_oid" "$treetag_sha256_oid"
267+
compare_oids 'tag' committag "$committag_sha1_oid" "$committag_sha256_oid"
268+
compare_oids GPG2 'tag' signedtag "$signedtag_sha1_oid" "$signedtag_sha256_oid"
269+
270+
compare_oids 'blob' more "$more_sha1_oid" "$more_sha256_oid"
271+
compare_oids 'blob' another "$another_sha1_oid" "$another_sha256_oid"
272+
compare_oids 'tree' tree2 "$tree2_sha1_oid" "$tree2_sha256_oid"
273+
compare_oids 'commit' commit2 "$commit2_sha1_oid" "$commit2_sha256_oid"
274+
compare_oids GPG2 'tag' signedtag2 "$signedtag2_sha1_oid" "$signedtag2_sha256_oid"
275+
compare_oids GPG2 'commit' signedcommit2 "$signedcommit2_sha1_oid" "$signedcommit2_sha256_oid"
276+
compare_oids GPG2 'commit' signedcommit3 "$signedcommit3_sha1_oid" "$signedcommit3_sha256_oid"
277+
compare_oids GPG2 'commit' signedcommit4 "$signedcommit4_sha1_oid" "$signedcommit4_sha256_oid"
278+
compare_oids GPG2 'tag' signedtag3 "$signedtag3_sha1_oid" "$signedtag3_sha256_oid"
279+
compare_oids GPG2 'tag' signedtag4 "$signedtag4_sha1_oid" "$signedtag4_sha256_oid"
280+
281+
test_done

‎t/t1016/gpg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/sh
2+
exec gpg --faked-system-time "20230918T154812" "$@"

0 commit comments

Comments
 (0)