blob: 0ba8194403f6740807cbd63d1bda8a69091e3d6b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
#!/bin/sh
test_description='git am handling submodules'
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-submodule-update.sh
am () {
git format-patch --stdout --ignore-submodules=dirty "..$1" | git am -
}
test_submodule_switch "am"
am_3way () {
git format-patch --stdout --ignore-submodules=dirty "..$1" | git am --3way -
}
KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
test_submodule_switch "am_3way"
test_expect_success 'setup diff.submodule' '
test_commit one &&
INITIAL=$(git rev-parse HEAD) &&
git init submodule &&
(
cd submodule &&
test_commit two &&
git rev-parse HEAD >../initial-submodule
) &&
git submodule add ./submodule &&
git commit -m first &&
(
cd submodule &&
test_commit three &&
git rev-parse HEAD >../first-submodule
) &&
git add submodule &&
git commit -m second &&
SECOND=$(git rev-parse HEAD) &&
(
cd submodule &&
git mv two.t four.t &&
git commit -m "second submodule" &&
git rev-parse HEAD >../second-submodule
) &&
test_commit four &&
git add submodule &&
git commit --amend --no-edit &&
THIRD=$(git rev-parse HEAD) &&
git submodule update --init
'
run_test() {
START_COMMIT=$1 &&
EXPECT=$2 &&
# Abort any merges in progress: the previous
# test may have failed, and we should clean up.
test_might_fail git am --abort &&
git reset --hard $START_COMMIT &&
rm -f *.patch &&
git format-patch -1 &&
git reset --hard $START_COMMIT^ &&
git submodule update &&
git am *.patch &&
git submodule update &&
git -C submodule rev-parse HEAD >actual &&
test_cmp $EXPECT actual
}
test_expect_success 'diff.submodule unset' '
test_unconfig diff.submodule &&
run_test $SECOND first-submodule
'
test_expect_success 'diff.submodule unset with extra file' '
test_unconfig diff.submodule &&
run_test $THIRD second-submodule
'
test_expect_success 'diff.submodule=log' '
test_config diff.submodule log &&
run_test $SECOND first-submodule
'
test_expect_success 'diff.submodule=log with extra file' '
test_config diff.submodule log &&
run_test $THIRD second-submodule
'
test_done
|
