Skip to content

Commit a466637

Browse files
gitstergitster
committed
git-fetch test: test tracking fetch results, not just FETCH_HEAD
We really should have done this long time ago. Existing t5515 test was written for the specific purpose of catching regression to the contents of generated FETCH_HEAD file, but it also is a good place to make sure various fetch configurations do fetch what they intend to fetch (and nothing else). Signed-off-by: Junio C Hamano <[email protected]>
1 parent 472fa4c commit a466637

File tree

65 files changed

+831
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+831
-7
lines changed

‎t/t5515-fetch-merge-logic.sh

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,10 @@ do
131131
test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
132132
cnt=`expr $test_count + 1`
133133
pfx=`printf "%04d" $cnt`
134-
expect="../../t5515/fetch.$test"
135-
actual="$pfx-fetch.$test"
134+
expect_f="../../t5515/fetch.$test"
135+
actual_f="$pfx-fetch.$test"
136+
expect_r="../../t5515/refs.$test"
137+
actual_r="$pfx-refs.$test"
136138

137139
test_expect_success "$cmd" '
138140
{
@@ -145,14 +147,24 @@ do
145147
rm -f .git/refs/tags/*
146148
git fetch "$@" >/dev/null
147149
cat .git/FETCH_HEAD
148-
} >"$actual" &&
149-
if test -f "$expect"
150+
} >"$actual_f" &&
151+
git show-ref >"$actual_r" &&
152+
if test -f "$expect_f"
150153
then
151-
git diff -u "$expect" "$actual" &&
152-
rm -f "$actual"
154+
git diff -u "$expect_f" "$actual_f" &&
155+
rm -f "$actual_f"
153156
else
154157
# this is to help developing new tests.
155-
cp "$actual" "$expect"
158+
cp "$actual_f" "$expect_f"
159+
false
160+
fi &&
161+
if test -f "$expect_r"
162+
then
163+
git diff -u "$expect_r" "$actual_r" &&
164+
rm -f "$actual_r"
165+
else
166+
# this is to help developing new tests.
167+
cp "$actual_r" "$expect_r"
156168
false
157169
fi
158170
'

‎t/t5515/refs.br-branches-default

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
2+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
3+
754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
4+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
5+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6+
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
7+
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
8+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
9+
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
10+
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
11+
0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
12+
525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two

‎t/t5515/refs.br-branches-default-merge

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
2+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
3+
754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
4+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
5+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6+
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
7+
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
8+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
9+
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
10+
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
11+
0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
12+
525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two

‎t/t5515/refs.br-branches-default-merge_branches-default

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
2+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
3+
754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
4+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
5+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6+
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
7+
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
8+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
9+
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
10+
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
11+
0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
12+
525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two

‎t/t5515/refs.br-branches-default-octopus

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
2+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
3+
754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
4+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
5+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6+
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
7+
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
8+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
9+
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
10+
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
11+
0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
12+
525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two

‎t/t5515/refs.br-branches-default-octopus_branches-default

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
2+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
3+
754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
4+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
5+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6+
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
7+
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
8+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
9+
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
10+
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
11+
0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
12+
525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two

‎t/t5515/refs.br-branches-default_branches-default

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
2+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
3+
754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
4+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
5+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6+
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
7+
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
8+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
9+
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
10+
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
11+
0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
12+
525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two

‎t/t5515/refs.br-branches-one

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
2+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
3+
754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
4+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
5+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6+
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
7+
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
8+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
9+
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
10+
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
11+
0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
12+
525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two

‎t/t5515/refs.br-branches-one-merge

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
2+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
3+
754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
4+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
5+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6+
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
7+
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
8+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
9+
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
10+
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
11+
0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
12+
525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two

‎t/t5515/refs.br-branches-one-merge_branches-one

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
2+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
3+
754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
4+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
5+
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6+
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
7+
6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
8+
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
9+
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
10+
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
11+
0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
12+
525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two

0 commit comments

Comments
 (0)