t3404 (rebase -i): move comment to description
Add a comment describing the setup in t3404 to its --help output. This should make it easier to decide where to put new functions without disrupting the flow of the file or obstructing the description of the test setup. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Oct 31, 2010 at 02:39 UTC
99b028e5589702320630c094d510d885ac8c9e50
1 file changed
+17
-18
t/t3404-rebase-interactive.sh
+17
-18
@@ -7,6 +7,23 @@ test_description='git rebase interactive
7
8
This test runs git rebase "interactively", by faking an edit, and verifies
9
that the result still makes sense.
10
+
11
+Initial setup:
12
+
13
+ one - two - three - four (conflict-branch)
14
+ /
15
+ A - B - C - D - E (master)
16
+ | \
17
+ | F - G - H (branch1)
18
+ | \
19
+ |\ I (branch2)
20
+ | \
21
+ | J - K - L - M (no-conflict-branch)
22
+ \
23
+ N - O - P (no-ff-branch)
24
+
25
+ where A, B, D and G all touch file1, and one, two, three, four all
26
+ touch file "conflict".
27
'
28
. ./test-lib.sh
29
@@ -14,27 +31,9 @@ that the result still makes sense.
31
32
set_fake_editor
33
17
-# Set up the repository like this:
18
-#
19
-# one - two - three - four (conflict-branch)
20
-# /
21
-# A - B - C - D - E (master)
22
-# | \
23
-# | F - G - H (branch1)
24
-# | \
25
-# |\ I (branch2)
26
-# | \
27
-# | J - K - L - M (no-conflict-branch)
28
-# \
29
-# N - O - P (no-ff-branch)
30
-#
31
-# where A, B, D and G all touch file1, and one, two, three, four all
32
-# touch file "conflict".
33
-#
34
# WARNING: Modifications to the initial repository can change the SHA ID used
35
# in the expect2 file for the 'stop on conflicting pick' test.
36
37
-
37
test_expect_success 'setup' '
38
test_commit A file1 &&
39
test_commit B file1 &&