2018-08-13 11:33:16 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='range-diff tests'
|
|
|
|
|
2020-11-18 23:44:23 +00:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-18 23:44:19 +00:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
2018-08-13 11:33:16 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
# Note that because of the range-diff's heuristics, test_commit does more
|
|
|
|
# harm than good. We need some real history.
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
2019-11-20 21:18:33 +00:00
|
|
|
git fast-import <"$TEST_DIRECTORY"/t3206/history.export &&
|
2019-11-20 21:18:36 +00:00
|
|
|
test_oid_cache <<-\EOF
|
2019-08-18 19:16:34 +00:00
|
|
|
# topic
|
|
|
|
t1 sha1:4de457d
|
|
|
|
t2 sha1:fccce22
|
|
|
|
t3 sha1:147e64e
|
|
|
|
t4 sha1:a63e992
|
|
|
|
t1 sha256:b89f8b9
|
|
|
|
t2 sha256:5f12aad
|
|
|
|
t3 sha256:ea8b273
|
|
|
|
t4 sha256:14b7336
|
|
|
|
|
|
|
|
# unmodified
|
|
|
|
u1 sha1:35b9b25
|
|
|
|
u2 sha1:de345ab
|
|
|
|
u3 sha1:9af6654
|
|
|
|
u4 sha1:2901f77
|
|
|
|
u1 sha256:e3731be
|
|
|
|
u2 sha256:14fadf8
|
|
|
|
u3 sha256:736c4bc
|
|
|
|
u4 sha256:673e77d
|
|
|
|
|
|
|
|
# reordered
|
|
|
|
r1 sha1:aca177a
|
|
|
|
r2 sha1:14ad629
|
|
|
|
r3 sha1:ee58208
|
|
|
|
r4 sha1:307b27a
|
|
|
|
r1 sha256:f59d3aa
|
|
|
|
r2 sha256:fb261a8
|
|
|
|
r3 sha256:cb2649b
|
|
|
|
r4 sha256:958577e
|
|
|
|
|
|
|
|
# removed (deleted)
|
|
|
|
d1 sha1:7657159
|
|
|
|
d2 sha1:43d84d3
|
|
|
|
d3 sha1:a740396
|
|
|
|
d1 sha256:e312513
|
|
|
|
d2 sha256:eb19258
|
|
|
|
d3 sha256:1ccb3c1
|
|
|
|
|
|
|
|
# added
|
|
|
|
a1 sha1:2716022
|
|
|
|
a2 sha1:b62accd
|
|
|
|
a3 sha1:df46cfa
|
|
|
|
a4 sha1:3e64548
|
|
|
|
a5 sha1:12b4063
|
|
|
|
a1 sha256:d724f4d
|
|
|
|
a2 sha256:1de7762
|
|
|
|
a3 sha256:e159431
|
|
|
|
a4 sha256:b3e483c
|
|
|
|
a5 sha256:90866a7
|
|
|
|
|
|
|
|
# rebased
|
|
|
|
b1 sha1:cc9c443
|
|
|
|
b2 sha1:c5d9641
|
|
|
|
b3 sha1:28cc2b6
|
|
|
|
b4 sha1:5628ab7
|
|
|
|
b5 sha1:a31b12e
|
|
|
|
b1 sha256:a1a8717
|
|
|
|
b2 sha256:20a5862
|
|
|
|
b3 sha256:587172a
|
|
|
|
b4 sha256:2721c5d
|
|
|
|
b5 sha256:7b57864
|
|
|
|
|
|
|
|
# changed
|
|
|
|
c1 sha1:a4b3333
|
|
|
|
c2 sha1:f51d370
|
|
|
|
c3 sha1:0559556
|
|
|
|
c4 sha1:d966c5c
|
|
|
|
c1 sha256:f8c2b9d
|
|
|
|
c2 sha256:3fb6318
|
|
|
|
c3 sha256:168ab68
|
|
|
|
c4 sha256:3526539
|
|
|
|
|
|
|
|
# changed-message
|
|
|
|
m1 sha1:f686024
|
|
|
|
m2 sha1:4ab067d
|
|
|
|
m3 sha1:b9cb956
|
|
|
|
m4 sha1:8add5f1
|
|
|
|
m1 sha256:31e6281
|
|
|
|
m2 sha256:a06bf1b
|
|
|
|
m3 sha256:82dc654
|
|
|
|
m4 sha256:48470c5
|
|
|
|
|
|
|
|
# renamed
|
|
|
|
n1 sha1:f258d75
|
|
|
|
n2 sha1:017b62d
|
|
|
|
n3 sha1:3ce7af6
|
|
|
|
n4 sha1:1e6226b
|
|
|
|
n1 sha256:ad52114
|
|
|
|
n2 sha256:3b54c8f
|
|
|
|
n3 sha256:3b0a644
|
|
|
|
n4 sha256:e461653
|
|
|
|
|
2020-02-07 00:52:35 +00:00
|
|
|
# mode change
|
|
|
|
o1 sha1:4d39cb3
|
|
|
|
o2 sha1:26c107f
|
|
|
|
o3 sha1:4c1e0f5
|
|
|
|
o1 sha256:d0dd598
|
|
|
|
o2 sha256:c4a279e
|
|
|
|
o3 sha256:78459d7
|
|
|
|
|
2019-08-18 19:16:34 +00:00
|
|
|
# added and removed
|
|
|
|
s1 sha1:096b1ba
|
|
|
|
s2 sha1:d92e698
|
|
|
|
s3 sha1:9a1db4d
|
|
|
|
s4 sha1:fea3b5c
|
|
|
|
s1 sha256:a7f9134
|
|
|
|
s2 sha256:b4c2580
|
|
|
|
s3 sha256:1d62aa2
|
|
|
|
s4 sha256:48160e8
|
|
|
|
|
|
|
|
# Empty delimiter (included so lines match neatly)
|
|
|
|
__ sha1:-------
|
|
|
|
__ sha256:-------
|
|
|
|
EOF
|
2018-08-13 11:33:16 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'simple A..B A..C (unmodified)' '
|
2020-11-18 23:44:23 +00:00
|
|
|
git range-diff --no-color main..topic main..unmodified \
|
2018-08-13 11:33:16 +00:00
|
|
|
>actual &&
|
2019-11-20 21:18:38 +00:00
|
|
|
cat >expect <<-EOF &&
|
2019-08-18 19:16:34 +00:00
|
|
|
1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/
|
|
|
|
2: $(test_oid t2) = 2: $(test_oid u2) s/4/A/
|
|
|
|
3: $(test_oid t3) = 3: $(test_oid u3) s/11/B/
|
|
|
|
4: $(test_oid t4) = 4: $(test_oid u4) s/12/B/
|
2018-08-13 11:33:16 +00:00
|
|
|
EOF
|
2019-11-20 21:18:38 +00:00
|
|
|
test_cmp expect actual
|
2018-08-13 11:33:16 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'simple B...C (unmodified)' '
|
|
|
|
git range-diff --no-color topic...unmodified >actual &&
|
2019-11-20 21:18:38 +00:00
|
|
|
# same "expect" as above
|
|
|
|
test_cmp expect actual
|
2018-08-13 11:33:16 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'simple A B C (unmodified)' '
|
2020-11-18 23:44:23 +00:00
|
|
|
git range-diff --no-color main topic unmodified >actual &&
|
2019-11-20 21:18:38 +00:00
|
|
|
# same "expect" as above
|
|
|
|
test_cmp expect actual
|
2018-08-13 11:33:16 +00:00
|
|
|
'
|
|
|
|
|
2021-02-05 14:44:48 +00:00
|
|
|
test_expect_success 'A^! and A^-<n> (unmodified)' '
|
|
|
|
git range-diff --no-color topic^! unmodified^-1 >actual &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
1: $(test_oid t4) = 1: $(test_oid u4) s/12/B/
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'A^{/..} is not mistaken for a range' '
|
|
|
|
test_must_fail git range-diff topic^.. topic^{/..} 2>error &&
|
|
|
|
test_i18ngrep "not a commit range" error
|
|
|
|
'
|
|
|
|
|
2018-08-13 11:33:16 +00:00
|
|
|
test_expect_success 'trivial reordering' '
|
2020-11-18 23:44:23 +00:00
|
|
|
git range-diff --no-color main topic reordered >actual &&
|
2019-11-20 21:18:38 +00:00
|
|
|
cat >expect <<-EOF &&
|
2019-08-18 19:16:34 +00:00
|
|
|
1: $(test_oid t1) = 1: $(test_oid r1) s/5/A/
|
|
|
|
3: $(test_oid t3) = 2: $(test_oid r2) s/11/B/
|
|
|
|
4: $(test_oid t4) = 3: $(test_oid r3) s/12/B/
|
|
|
|
2: $(test_oid t2) = 4: $(test_oid r4) s/4/A/
|
2018-08-13 11:33:16 +00:00
|
|
|
EOF
|
2019-11-20 21:18:38 +00:00
|
|
|
test_cmp expect actual
|
2018-08-13 11:33:16 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'removed a commit' '
|
2020-11-18 23:44:23 +00:00
|
|
|
git range-diff --no-color main topic removed >actual &&
|
2019-11-20 21:18:38 +00:00
|
|
|
cat >expect <<-EOF &&
|
2019-08-18 19:16:34 +00:00
|
|
|
1: $(test_oid t1) = 1: $(test_oid d1) s/5/A/
|
|
|
|
2: $(test_oid t2) < -: $(test_oid __) s/4/A/
|
|
|
|
3: $(test_oid t3) = 2: $(test_oid d2) s/11/B/
|
|
|
|
4: $(test_oid t4) = 3: $(test_oid d3) s/12/B/
|
2018-08-13 11:33:16 +00:00
|
|
|
EOF
|
2019-11-20 21:18:38 +00:00
|
|
|
test_cmp expect actual
|
2018-08-13 11:33:16 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'added a commit' '
|
2020-11-18 23:44:23 +00:00
|
|
|
git range-diff --no-color main topic added >actual &&
|
2019-11-20 21:18:38 +00:00
|
|
|
cat >expect <<-EOF &&
|
2019-08-18 19:16:34 +00:00
|
|
|
1: $(test_oid t1) = 1: $(test_oid a1) s/5/A/
|
|
|
|
2: $(test_oid t2) = 2: $(test_oid a2) s/4/A/
|
|
|
|
-: $(test_oid __) > 3: $(test_oid a3) s/6/A/
|
|
|
|
3: $(test_oid t3) = 4: $(test_oid a4) s/11/B/
|
|
|
|
4: $(test_oid t4) = 5: $(test_oid a5) s/12/B/
|
2018-08-13 11:33:16 +00:00
|
|
|
EOF
|
2019-11-20 21:18:38 +00:00
|
|
|
test_cmp expect actual
|
2018-08-13 11:33:16 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'new base, A B C' '
|
2020-11-18 23:44:23 +00:00
|
|
|
git range-diff --no-color main topic rebased >actual &&
|
2019-11-20 21:18:38 +00:00
|
|
|
cat >expect <<-EOF &&
|
2019-08-18 19:16:34 +00:00
|
|
|
1: $(test_oid t1) = 1: $(test_oid b1) s/5/A/
|
|
|
|
2: $(test_oid t2) = 2: $(test_oid b2) s/4/A/
|
|
|
|
3: $(test_oid t3) = 3: $(test_oid b3) s/11/B/
|
|
|
|
4: $(test_oid t4) = 4: $(test_oid b4) s/12/B/
|
2018-08-13 11:33:16 +00:00
|
|
|
EOF
|
2019-11-20 21:18:38 +00:00
|
|
|
test_cmp expect actual
|
2018-08-13 11:33:16 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'new base, B...C' '
|
2020-11-18 23:44:23 +00:00
|
|
|
# this syntax includes the commits from main!
|
2018-08-13 11:33:16 +00:00
|
|
|
git range-diff --no-color topic...rebased >actual &&
|
2019-11-20 21:18:38 +00:00
|
|
|
cat >expect <<-EOF &&
|
2019-08-18 19:16:34 +00:00
|
|
|
-: $(test_oid __) > 1: $(test_oid b5) unrelated
|
|
|
|
1: $(test_oid t1) = 2: $(test_oid b1) s/5/A/
|
|
|
|
2: $(test_oid t2) = 3: $(test_oid b2) s/4/A/
|
|
|
|
3: $(test_oid t3) = 4: $(test_oid b3) s/11/B/
|
|
|
|
4: $(test_oid t4) = 5: $(test_oid b4) s/12/B/
|
2018-08-13 11:33:16 +00:00
|
|
|
EOF
|
2019-11-20 21:18:38 +00:00
|
|
|
test_cmp expect actual
|
2018-08-13 11:33:16 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'changed commit' '
|
|
|
|
git range-diff --no-color topic...changed >actual &&
|
2019-11-20 21:18:38 +00:00
|
|
|
cat >expect <<-EOF &&
|
2019-08-18 19:16:34 +00:00
|
|
|
1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/
|
|
|
|
2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/
|
|
|
|
3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/
|
2019-07-11 16:08:51 +00:00
|
|
|
@@ file: A
|
2018-08-13 11:33:16 +00:00
|
|
|
9
|
|
|
|
10
|
|
|
|
-11
|
|
|
|
-+B
|
|
|
|
++BB
|
|
|
|
12
|
|
|
|
13
|
|
|
|
14
|
2019-08-18 19:16:34 +00:00
|
|
|
4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/
|
2019-07-11 16:08:51 +00:00
|
|
|
@@ file
|
2019-07-11 16:08:50 +00:00
|
|
|
@@ file: A
|
2018-08-13 11:33:16 +00:00
|
|
|
9
|
|
|
|
10
|
|
|
|
- B
|
|
|
|
+ BB
|
|
|
|
-12
|
|
|
|
+B
|
|
|
|
13
|
|
|
|
EOF
|
2019-11-20 21:18:38 +00:00
|
|
|
test_cmp expect actual
|
2018-08-13 11:33:16 +00:00
|
|
|
'
|
|
|
|
|
2018-11-09 10:18:02 +00:00
|
|
|
test_expect_success 'changed commit with --no-patch diff option' '
|
|
|
|
git range-diff --no-color --no-patch topic...changed >actual &&
|
2019-11-20 21:18:38 +00:00
|
|
|
cat >expect <<-EOF &&
|
2019-08-18 19:16:34 +00:00
|
|
|
1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/
|
|
|
|
2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/
|
|
|
|
3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/
|
|
|
|
4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/
|
2018-11-09 10:18:02 +00:00
|
|
|
EOF
|
2019-11-20 21:18:38 +00:00
|
|
|
test_cmp expect actual
|
2018-11-09 10:18:02 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'changed commit with --stat diff option' '
|
|
|
|
git range-diff --no-color --stat topic...changed >actual &&
|
2019-11-20 21:18:38 +00:00
|
|
|
cat >expect <<-EOF &&
|
2019-08-18 19:16:34 +00:00
|
|
|
1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/
|
|
|
|
2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/
|
|
|
|
3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/
|
2020-09-24 07:41:41 +00:00
|
|
|
a => b | 2 +-
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
2019-08-18 19:16:34 +00:00
|
|
|
4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/
|
2020-09-24 07:41:41 +00:00
|
|
|
a => b | 2 +-
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
2018-11-09 10:18:02 +00:00
|
|
|
EOF
|
2019-11-20 21:18:38 +00:00
|
|
|
test_cmp expect actual
|
2018-11-09 10:18:02 +00:00
|
|
|
'
|
|
|
|
|
2018-10-24 19:46:17 +00:00
|
|
|
test_expect_success 'changed commit with sm config' '
|
|
|
|
git range-diff --no-color --submodule=log topic...changed >actual &&
|
2019-11-20 21:18:38 +00:00
|
|
|
cat >expect <<-EOF &&
|
2019-08-18 19:16:34 +00:00
|
|
|
1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/
|
|
|
|
2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/
|
|
|
|
3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/
|
2019-07-11 16:08:51 +00:00
|
|
|
@@ file: A
|
2018-10-24 19:46:17 +00:00
|
|
|
9
|
|
|
|
10
|
|
|
|
-11
|
|
|
|
-+B
|
|
|
|
++BB
|
|
|
|
12
|
|
|
|
13
|
|
|
|
14
|
2019-08-18 19:16:34 +00:00
|
|
|
4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/
|
2019-07-11 16:08:51 +00:00
|
|
|
@@ file
|
2019-07-11 16:08:50 +00:00
|
|
|
@@ file: A
|
2018-10-24 19:46:17 +00:00
|
|
|
9
|
|
|
|
10
|
|
|
|
- B
|
|
|
|
+ BB
|
|
|
|
-12
|
|
|
|
+B
|
|
|
|
13
|
|
|
|
EOF
|
2019-11-20 21:18:38 +00:00
|
|
|
test_cmp expect actual
|
2018-10-24 19:46:17 +00:00
|
|
|
'
|
|
|
|
|
2019-07-11 16:08:49 +00:00
|
|
|
test_expect_success 'renamed file' '
|
|
|
|
git range-diff --no-color --submodule=log topic...renamed-file >actual &&
|
2019-11-20 21:18:38 +00:00
|
|
|
sed s/Z/\ /g >expect <<-EOF &&
|
2019-08-18 19:16:34 +00:00
|
|
|
1: $(test_oid t1) = 1: $(test_oid n1) s/5/A/
|
|
|
|
2: $(test_oid t2) ! 2: $(test_oid n2) s/4/A/
|
2019-07-11 16:08:51 +00:00
|
|
|
@@ Metadata
|
2019-07-11 16:08:49 +00:00
|
|
|
ZAuthor: Thomas Rast <trast@inf.ethz.ch>
|
|
|
|
Z
|
2019-07-11 16:08:51 +00:00
|
|
|
Z ## Commit message ##
|
2019-07-11 16:08:49 +00:00
|
|
|
- s/4/A/
|
|
|
|
+ s/4/A/ + rename file
|
|
|
|
Z
|
|
|
|
- ## file ##
|
|
|
|
+ ## file => renamed-file ##
|
|
|
|
Z@@
|
|
|
|
Z 1
|
|
|
|
Z 2
|
2019-08-18 19:16:34 +00:00
|
|
|
3: $(test_oid t3) ! 3: $(test_oid n3) s/11/B/
|
2019-07-11 16:08:51 +00:00
|
|
|
@@ Metadata
|
|
|
|
Z ## Commit message ##
|
2019-07-11 16:08:49 +00:00
|
|
|
Z s/11/B/
|
|
|
|
Z
|
|
|
|
- ## file ##
|
2019-07-11 16:08:50 +00:00
|
|
|
-@@ file: A
|
2019-07-11 16:08:49 +00:00
|
|
|
+ ## renamed-file ##
|
2019-07-11 16:08:50 +00:00
|
|
|
+@@ renamed-file: A
|
2019-07-11 16:08:49 +00:00
|
|
|
Z 8
|
|
|
|
Z 9
|
2019-07-11 16:08:50 +00:00
|
|
|
Z 10
|
2019-08-18 19:16:34 +00:00
|
|
|
4: $(test_oid t4) ! 4: $(test_oid n4) s/12/B/
|
2019-07-11 16:08:51 +00:00
|
|
|
@@ Metadata
|
|
|
|
Z ## Commit message ##
|
2019-07-11 16:08:49 +00:00
|
|
|
Z s/12/B/
|
|
|
|
Z
|
|
|
|
- ## file ##
|
2019-07-11 16:08:50 +00:00
|
|
|
-@@ file: A
|
2019-07-11 16:08:49 +00:00
|
|
|
+ ## renamed-file ##
|
2019-07-11 16:08:50 +00:00
|
|
|
+@@ renamed-file: A
|
2019-07-11 16:08:49 +00:00
|
|
|
Z 9
|
|
|
|
Z 10
|
2019-07-11 16:08:50 +00:00
|
|
|
Z B
|
2019-07-11 16:08:49 +00:00
|
|
|
EOF
|
2019-11-20 21:18:38 +00:00
|
|
|
test_cmp expect actual
|
2019-07-11 16:08:49 +00:00
|
|
|
'
|
|
|
|
|
2019-10-08 17:38:43 +00:00
|
|
|
test_expect_success 'file with mode only change' '
|
|
|
|
git range-diff --no-color --submodule=log topic...mode-only-change >actual &&
|
2019-11-20 21:18:38 +00:00
|
|
|
sed s/Z/\ /g >expect <<-EOF &&
|
2020-02-07 00:52:35 +00:00
|
|
|
1: $(test_oid t2) ! 1: $(test_oid o1) s/4/A/
|
2019-10-08 17:38:43 +00:00
|
|
|
@@ Metadata
|
|
|
|
ZAuthor: Thomas Rast <trast@inf.ethz.ch>
|
|
|
|
Z
|
|
|
|
Z ## Commit message ##
|
|
|
|
- s/4/A/
|
|
|
|
+ s/4/A/ + add other-file
|
|
|
|
Z
|
|
|
|
Z ## file ##
|
|
|
|
Z@@
|
|
|
|
@@ file
|
|
|
|
Z A
|
|
|
|
Z 6
|
|
|
|
Z 7
|
|
|
|
+
|
|
|
|
+ ## other-file (new) ##
|
2020-02-07 00:52:35 +00:00
|
|
|
2: $(test_oid t3) ! 2: $(test_oid o2) s/11/B/
|
2019-10-08 17:38:43 +00:00
|
|
|
@@ Metadata
|
|
|
|
ZAuthor: Thomas Rast <trast@inf.ethz.ch>
|
|
|
|
Z
|
|
|
|
Z ## Commit message ##
|
|
|
|
- s/11/B/
|
|
|
|
+ s/11/B/ + mode change other-file
|
|
|
|
Z
|
|
|
|
Z ## file ##
|
|
|
|
Z@@ file: A
|
|
|
|
@@ file: A
|
|
|
|
Z 12
|
|
|
|
Z 13
|
|
|
|
Z 14
|
|
|
|
+
|
|
|
|
+ ## other-file (mode change 100644 => 100755) ##
|
2020-02-07 00:52:35 +00:00
|
|
|
3: $(test_oid t4) = 3: $(test_oid o3) s/12/B/
|
2019-10-08 17:38:43 +00:00
|
|
|
EOF
|
2019-11-20 21:18:38 +00:00
|
|
|
test_cmp expect actual
|
2019-10-08 17:38:43 +00:00
|
|
|
'
|
|
|
|
|
2019-07-11 16:08:49 +00:00
|
|
|
test_expect_success 'file added and later removed' '
|
|
|
|
git range-diff --no-color --submodule=log topic...added-removed >actual &&
|
2019-11-20 21:18:38 +00:00
|
|
|
sed s/Z/\ /g >expect <<-EOF &&
|
2019-08-18 19:16:34 +00:00
|
|
|
1: $(test_oid t1) = 1: $(test_oid s1) s/5/A/
|
|
|
|
2: $(test_oid t2) ! 2: $(test_oid s2) s/4/A/
|
2019-07-11 16:08:51 +00:00
|
|
|
@@ Metadata
|
2019-07-11 16:08:49 +00:00
|
|
|
ZAuthor: Thomas Rast <trast@inf.ethz.ch>
|
|
|
|
Z
|
2019-07-11 16:08:51 +00:00
|
|
|
Z ## Commit message ##
|
2019-07-11 16:08:49 +00:00
|
|
|
- s/4/A/
|
|
|
|
+ s/4/A/ + new-file
|
|
|
|
Z
|
|
|
|
Z ## file ##
|
|
|
|
Z@@
|
2019-07-11 16:08:51 +00:00
|
|
|
@@ file
|
2019-07-11 16:08:49 +00:00
|
|
|
Z A
|
|
|
|
Z 6
|
|
|
|
Z 7
|
|
|
|
+
|
|
|
|
+ ## new-file (new) ##
|
2019-08-18 19:16:34 +00:00
|
|
|
3: $(test_oid t3) ! 3: $(test_oid s3) s/11/B/
|
2019-07-11 16:08:51 +00:00
|
|
|
@@ Metadata
|
2019-07-11 16:08:49 +00:00
|
|
|
ZAuthor: Thomas Rast <trast@inf.ethz.ch>
|
|
|
|
Z
|
2019-07-11 16:08:51 +00:00
|
|
|
Z ## Commit message ##
|
2019-07-11 16:08:49 +00:00
|
|
|
- s/11/B/
|
|
|
|
+ s/11/B/ + remove file
|
|
|
|
Z
|
|
|
|
Z ## file ##
|
2019-07-11 16:08:50 +00:00
|
|
|
Z@@ file: A
|
2019-07-11 16:08:51 +00:00
|
|
|
@@ file: A
|
2019-07-11 16:08:49 +00:00
|
|
|
Z 12
|
|
|
|
Z 13
|
|
|
|
Z 14
|
|
|
|
+
|
|
|
|
+ ## new-file (deleted) ##
|
2019-08-18 19:16:34 +00:00
|
|
|
4: $(test_oid t4) = 4: $(test_oid s4) s/12/B/
|
2019-07-11 16:08:49 +00:00
|
|
|
EOF
|
2019-11-20 21:18:38 +00:00
|
|
|
test_cmp expect actual
|
2019-07-11 16:08:49 +00:00
|
|
|
'
|
|
|
|
|
2018-09-24 17:30:53 +00:00
|
|
|
test_expect_success 'no commits on one side' '
|
|
|
|
git commit --amend -m "new message" &&
|
2020-11-18 23:44:23 +00:00
|
|
|
git range-diff main HEAD@{1} HEAD
|
2018-09-24 17:30:53 +00:00
|
|
|
'
|
|
|
|
|
2018-08-13 11:33:16 +00:00
|
|
|
test_expect_success 'changed message' '
|
|
|
|
git range-diff --no-color topic...changed-message >actual &&
|
2019-11-20 21:18:38 +00:00
|
|
|
sed s/Z/\ /g >expect <<-EOF &&
|
2019-08-18 19:16:34 +00:00
|
|
|
1: $(test_oid t1) = 1: $(test_oid m1) s/5/A/
|
|
|
|
2: $(test_oid t2) ! 2: $(test_oid m2) s/4/A/
|
2019-07-11 16:08:51 +00:00
|
|
|
@@ Metadata
|
|
|
|
Z ## Commit message ##
|
2018-08-13 11:33:16 +00:00
|
|
|
Z s/4/A/
|
|
|
|
Z
|
|
|
|
+ Also a silly comment here!
|
|
|
|
+
|
2019-07-11 16:08:49 +00:00
|
|
|
Z ## file ##
|
|
|
|
Z@@
|
|
|
|
Z 1
|
2019-08-18 19:16:34 +00:00
|
|
|
3: $(test_oid t3) = 3: $(test_oid m3) s/11/B/
|
|
|
|
4: $(test_oid t4) = 4: $(test_oid m4) s/12/B/
|
2018-08-13 11:33:16 +00:00
|
|
|
EOF
|
2019-11-20 21:18:38 +00:00
|
|
|
test_cmp expect actual
|
2018-08-13 11:33:16 +00:00
|
|
|
'
|
|
|
|
|
2018-08-14 01:41:16 +00:00
|
|
|
test_expect_success 'dual-coloring' '
|
2019-08-18 19:16:34 +00:00
|
|
|
sed -e "s|^:||" >expect <<-EOF &&
|
|
|
|
:<YELLOW>1: $(test_oid c1) = 1: $(test_oid m1) s/5/A/<RESET>
|
|
|
|
:<RED>2: $(test_oid c2) <RESET><YELLOW>!<RESET><GREEN> 2: $(test_oid m2)<RESET><YELLOW> s/4/A/<RESET>
|
2019-07-11 16:08:51 +00:00
|
|
|
: <REVERSE><CYAN>@@<RESET> <RESET>Metadata<RESET>
|
|
|
|
: ## Commit message ##<RESET>
|
2018-08-14 01:41:16 +00:00
|
|
|
: s/4/A/<RESET>
|
|
|
|
: <RESET>
|
|
|
|
: <REVERSE><GREEN>+<RESET><BOLD> Also a silly comment here!<RESET>
|
2018-08-14 01:41:20 +00:00
|
|
|
: <REVERSE><GREEN>+<RESET>
|
2019-07-11 16:08:49 +00:00
|
|
|
: ## file ##<RESET>
|
|
|
|
: <CYAN> @@<RESET>
|
|
|
|
: 1<RESET>
|
2019-08-18 19:16:34 +00:00
|
|
|
:<RED>3: $(test_oid c3) <RESET><YELLOW>!<RESET><GREEN> 3: $(test_oid m3)<RESET><YELLOW> s/11/B/<RESET>
|
2019-07-11 16:08:51 +00:00
|
|
|
: <REVERSE><CYAN>@@<RESET> <RESET>file: A<RESET>
|
2018-08-14 01:41:16 +00:00
|
|
|
: 9<RESET>
|
|
|
|
: 10<RESET>
|
|
|
|
: <RED> -11<RESET>
|
|
|
|
: <REVERSE><RED>-<RESET><FAINT;GREEN>+BB<RESET>
|
|
|
|
: <REVERSE><GREEN>+<RESET><BOLD;GREEN>+B<RESET>
|
|
|
|
: 12<RESET>
|
|
|
|
: 13<RESET>
|
|
|
|
: 14<RESET>
|
2019-08-18 19:16:34 +00:00
|
|
|
:<RED>4: $(test_oid c4) <RESET><YELLOW>!<RESET><GREEN> 4: $(test_oid m4)<RESET><YELLOW> s/12/B/<RESET>
|
2019-07-11 16:08:51 +00:00
|
|
|
: <REVERSE><CYAN>@@<RESET> <RESET>file<RESET>
|
2019-07-11 16:08:50 +00:00
|
|
|
: <CYAN> @@ file: A<RESET>
|
2018-08-14 01:41:16 +00:00
|
|
|
: 9<RESET>
|
|
|
|
: 10<RESET>
|
|
|
|
: <REVERSE><RED>-<RESET><FAINT> BB<RESET>
|
|
|
|
: <REVERSE><GREEN>+<RESET><BOLD> B<RESET>
|
|
|
|
: <RED> -12<RESET>
|
|
|
|
: <GREEN> +B<RESET>
|
|
|
|
: 13<RESET>
|
|
|
|
EOF
|
|
|
|
git range-diff changed...changed-message --color --dual-color >actual.raw &&
|
|
|
|
test_decode_color >actual <actual.raw &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2020-11-18 23:44:23 +00:00
|
|
|
for prev in topic main..topic
|
2018-07-22 09:57:13 +00:00
|
|
|
do
|
|
|
|
test_expect_success "format-patch --range-diff=$prev" '
|
range-diff: always pass at least minimal diff options
Commit d8981c3f88 ("format-patch: do not let its diff-options affect
--range-diff", 2018-11-30) taught `show_range_diff()` to accept a
NULL-pointer as an indication that it should use its own "reasonable
default". That fixed a regression from a5170794 ("Merge branch
'ab/range-diff-no-patch'", 2018-11-18), but unfortunately it introduced
a regression of its own.
In particular, it means we forget the `file` member of the diff options,
so rather than placing a range-diff in the cover-letter, we write it to
stdout. In order to fix this, rewrite the two callers adjusted by
d8981c3f88 to instead create a "dummy" set of diff options where they
only fill in the fields we absolutely require, such as output file and
color.
Modify and extend the existing tests to try and verify that the right
contents end up in the right place.
Don't revert `show_range_diff()`, i.e., let it keep accepting NULL.
Rather than removing what is dead code and figuring out it isn't
actually dead and we've broken 2.20, just leave it for now.
[es: retain diff coloring when going to stdout]
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-12-03 21:21:31 +00:00
|
|
|
git format-patch --cover-letter --range-diff=$prev \
|
2020-11-18 23:44:23 +00:00
|
|
|
main..unmodified >actual &&
|
range-diff: always pass at least minimal diff options
Commit d8981c3f88 ("format-patch: do not let its diff-options affect
--range-diff", 2018-11-30) taught `show_range_diff()` to accept a
NULL-pointer as an indication that it should use its own "reasonable
default". That fixed a regression from a5170794 ("Merge branch
'ab/range-diff-no-patch'", 2018-11-18), but unfortunately it introduced
a regression of its own.
In particular, it means we forget the `file` member of the diff options,
so rather than placing a range-diff in the cover-letter, we write it to
stdout. In order to fix this, rewrite the two callers adjusted by
d8981c3f88 to instead create a "dummy" set of diff options where they
only fill in the fields we absolutely require, such as output file and
color.
Modify and extend the existing tests to try and verify that the right
contents end up in the right place.
Don't revert `show_range_diff()`, i.e., let it keep accepting NULL.
Rather than removing what is dead code and figuring out it isn't
actually dead and we've broken 2.20, just leave it for now.
[es: retain diff coloring when going to stdout]
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-12-03 21:21:31 +00:00
|
|
|
test_when_finished "rm 000?-*" &&
|
|
|
|
test_line_count = 5 actual &&
|
|
|
|
test_i18ngrep "^Range-diff:$" 0000-* &&
|
|
|
|
grep "= 1: .* s/5/A" 0000-* &&
|
|
|
|
grep "= 2: .* s/4/A" 0000-* &&
|
|
|
|
grep "= 3: .* s/11/B" 0000-* &&
|
|
|
|
grep "= 4: .* s/12/B" 0000-*
|
2018-07-22 09:57:13 +00:00
|
|
|
'
|
|
|
|
done
|
|
|
|
|
2018-09-12 14:31:03 +00:00
|
|
|
test_expect_success 'format-patch --range-diff as commentary' '
|
range-diff: always pass at least minimal diff options
Commit d8981c3f88 ("format-patch: do not let its diff-options affect
--range-diff", 2018-11-30) taught `show_range_diff()` to accept a
NULL-pointer as an indication that it should use its own "reasonable
default". That fixed a regression from a5170794 ("Merge branch
'ab/range-diff-no-patch'", 2018-11-18), but unfortunately it introduced
a regression of its own.
In particular, it means we forget the `file` member of the diff options,
so rather than placing a range-diff in the cover-letter, we write it to
stdout. In order to fix this, rewrite the two callers adjusted by
d8981c3f88 to instead create a "dummy" set of diff options where they
only fill in the fields we absolutely require, such as output file and
color.
Modify and extend the existing tests to try and verify that the right
contents end up in the right place.
Don't revert `show_range_diff()`, i.e., let it keep accepting NULL.
Rather than removing what is dead code and figuring out it isn't
actually dead and we've broken 2.20, just leave it for now.
[es: retain diff coloring when going to stdout]
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-12-03 21:21:31 +00:00
|
|
|
git format-patch --range-diff=HEAD~1 HEAD~1 >actual &&
|
|
|
|
test_when_finished "rm 0001-*" &&
|
|
|
|
test_line_count = 1 actual &&
|
|
|
|
test_i18ngrep "^Range-diff:$" 0001-* &&
|
|
|
|
grep "> 1: .* new message" 0001-*
|
2018-09-12 14:31:03 +00:00
|
|
|
'
|
|
|
|
|
2021-03-23 11:12:25 +00:00
|
|
|
test_expect_success 'format-patch --range-diff reroll-count with a non-integer' '
|
|
|
|
git format-patch --range-diff=HEAD~1 -v2.9 HEAD~1 >actual &&
|
|
|
|
test_when_finished "rm v2.9-0001-*" &&
|
|
|
|
test_line_count = 1 actual &&
|
|
|
|
test_i18ngrep "^Range-diff:$" v2.9-0001-* &&
|
|
|
|
grep "> 1: .* new message" v2.9-0001-*
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'format-patch --range-diff reroll-count with a integer' '
|
|
|
|
git format-patch --range-diff=HEAD~1 -v2 HEAD~1 >actual &&
|
|
|
|
test_when_finished "rm v2-0001-*" &&
|
|
|
|
test_line_count = 1 actual &&
|
|
|
|
test_i18ngrep "^Range-diff ..* v1:$" v2-0001-* &&
|
|
|
|
grep "> 1: .* new message" v2-0001-*
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'format-patch --range-diff with v0' '
|
|
|
|
git format-patch --range-diff=HEAD~1 -v0 HEAD~1 >actual &&
|
|
|
|
test_when_finished "rm v0-0001-*" &&
|
|
|
|
test_line_count = 1 actual &&
|
|
|
|
test_i18ngrep "^Range-diff:$" v0-0001-* &&
|
|
|
|
grep "> 1: .* new message" v0-0001-*
|
|
|
|
'
|
|
|
|
|
2019-10-02 21:10:47 +00:00
|
|
|
test_expect_success 'range-diff overrides diff.noprefix internally' '
|
|
|
|
git -c diff.noprefix=true range-diff HEAD^...
|
|
|
|
'
|
|
|
|
|
2020-04-15 20:32:24 +00:00
|
|
|
test_expect_success 'basic with modified format.pretty with suffix' '
|
|
|
|
git -c format.pretty="format:commit %H%d%n" range-diff \
|
2020-11-18 23:44:23 +00:00
|
|
|
main..topic main..unmodified
|
2020-04-15 20:32:24 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'basic with modified format.pretty without "commit "' '
|
|
|
|
git -c format.pretty="format:%H%n" range-diff \
|
2020-11-18 23:44:23 +00:00
|
|
|
main..topic main..unmodified
|
2020-04-15 20:32:24 +00:00
|
|
|
'
|
|
|
|
|
2019-11-20 21:18:41 +00:00
|
|
|
test_expect_success 'range-diff compares notes by default' '
|
|
|
|
git notes add -m "topic note" topic &&
|
|
|
|
git notes add -m "unmodified note" unmodified &&
|
|
|
|
test_when_finished git notes remove topic unmodified &&
|
2020-11-18 23:44:23 +00:00
|
|
|
git range-diff --no-color main..topic main..unmodified \
|
2019-11-20 21:18:41 +00:00
|
|
|
>actual &&
|
|
|
|
sed s/Z/\ /g >expect <<-EOF &&
|
|
|
|
1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/
|
|
|
|
2: $(test_oid t2) = 2: $(test_oid u2) s/4/A/
|
|
|
|
3: $(test_oid t3) = 3: $(test_oid u3) s/11/B/
|
|
|
|
4: $(test_oid t4) ! 4: $(test_oid u4) s/12/B/
|
2019-11-20 21:18:43 +00:00
|
|
|
@@ Commit message
|
2019-11-20 21:18:41 +00:00
|
|
|
Z
|
2019-11-20 21:18:43 +00:00
|
|
|
Z
|
|
|
|
Z ## Notes ##
|
2019-11-20 21:18:41 +00:00
|
|
|
- topic note
|
|
|
|
+ unmodified note
|
|
|
|
Z
|
|
|
|
Z ## file ##
|
|
|
|
Z@@ file: A
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2019-11-20 21:18:45 +00:00
|
|
|
test_expect_success 'range-diff with --no-notes' '
|
|
|
|
git notes add -m "topic note" topic &&
|
|
|
|
git notes add -m "unmodified note" unmodified &&
|
|
|
|
test_when_finished git notes remove topic unmodified &&
|
2020-11-18 23:44:23 +00:00
|
|
|
git range-diff --no-color --no-notes main..topic main..unmodified \
|
2019-11-20 21:18:45 +00:00
|
|
|
>actual &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/
|
|
|
|
2: $(test_oid t2) = 2: $(test_oid u2) s/4/A/
|
|
|
|
3: $(test_oid t3) = 3: $(test_oid u3) s/11/B/
|
|
|
|
4: $(test_oid t4) = 4: $(test_oid u4) s/12/B/
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'range-diff with multiple --notes' '
|
|
|
|
git notes --ref=note1 add -m "topic note1" topic &&
|
|
|
|
git notes --ref=note1 add -m "unmodified note1" unmodified &&
|
|
|
|
test_when_finished git notes --ref=note1 remove topic unmodified &&
|
|
|
|
git notes --ref=note2 add -m "topic note2" topic &&
|
|
|
|
git notes --ref=note2 add -m "unmodified note2" unmodified &&
|
|
|
|
test_when_finished git notes --ref=note2 remove topic unmodified &&
|
2020-11-18 23:44:23 +00:00
|
|
|
git range-diff --no-color --notes=note1 --notes=note2 main..topic main..unmodified \
|
2019-11-20 21:18:45 +00:00
|
|
|
>actual &&
|
|
|
|
sed s/Z/\ /g >expect <<-EOF &&
|
|
|
|
1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/
|
|
|
|
2: $(test_oid t2) = 2: $(test_oid u2) s/4/A/
|
|
|
|
3: $(test_oid t3) = 3: $(test_oid u3) s/11/B/
|
|
|
|
4: $(test_oid t4) ! 4: $(test_oid u4) s/12/B/
|
|
|
|
@@ Commit message
|
|
|
|
Z
|
|
|
|
Z
|
|
|
|
Z ## Notes (note1) ##
|
|
|
|
- topic note1
|
|
|
|
+ unmodified note1
|
|
|
|
Z
|
|
|
|
Z
|
|
|
|
Z ## Notes (note2) ##
|
|
|
|
- topic note2
|
|
|
|
+ unmodified note2
|
|
|
|
Z
|
|
|
|
Z ## file ##
|
|
|
|
Z@@ file: A
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2019-11-20 21:18:47 +00:00
|
|
|
test_expect_success 'format-patch --range-diff does not compare notes by default' '
|
2019-11-20 21:18:41 +00:00
|
|
|
git notes add -m "topic note" topic &&
|
|
|
|
git notes add -m "unmodified note" unmodified &&
|
|
|
|
test_when_finished git notes remove topic unmodified &&
|
|
|
|
git format-patch --cover-letter --range-diff=$prev \
|
2020-11-18 23:44:23 +00:00
|
|
|
main..unmodified >actual &&
|
2019-11-20 21:18:41 +00:00
|
|
|
test_when_finished "rm 000?-*" &&
|
|
|
|
test_line_count = 5 actual &&
|
|
|
|
test_i18ngrep "^Range-diff:$" 0000-* &&
|
|
|
|
grep "= 1: .* s/5/A" 0000-* &&
|
|
|
|
grep "= 2: .* s/4/A" 0000-* &&
|
|
|
|
grep "= 3: .* s/11/B" 0000-* &&
|
2019-11-20 21:18:47 +00:00
|
|
|
grep "= 4: .* s/12/B" 0000-* &&
|
|
|
|
! grep "Notes" 0000-* &&
|
|
|
|
! grep "note" 0000-*
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'format-patch --range-diff with --no-notes' '
|
|
|
|
git notes add -m "topic note" topic &&
|
|
|
|
git notes add -m "unmodified note" unmodified &&
|
|
|
|
test_when_finished git notes remove topic unmodified &&
|
|
|
|
git format-patch --no-notes --cover-letter --range-diff=$prev \
|
2020-11-18 23:44:23 +00:00
|
|
|
main..unmodified >actual &&
|
2019-11-20 21:18:47 +00:00
|
|
|
test_when_finished "rm 000?-*" &&
|
|
|
|
test_line_count = 5 actual &&
|
|
|
|
test_i18ngrep "^Range-diff:$" 0000-* &&
|
|
|
|
grep "= 1: .* s/5/A" 0000-* &&
|
|
|
|
grep "= 2: .* s/4/A" 0000-* &&
|
|
|
|
grep "= 3: .* s/11/B" 0000-* &&
|
|
|
|
grep "= 4: .* s/12/B" 0000-* &&
|
|
|
|
! grep "Notes" 0000-* &&
|
|
|
|
! grep "note" 0000-*
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'format-patch --range-diff with --notes' '
|
|
|
|
git notes add -m "topic note" topic &&
|
|
|
|
git notes add -m "unmodified note" unmodified &&
|
|
|
|
test_when_finished git notes remove topic unmodified &&
|
|
|
|
git format-patch --notes --cover-letter --range-diff=$prev \
|
2020-11-18 23:44:23 +00:00
|
|
|
main..unmodified >actual &&
|
2019-11-20 21:18:47 +00:00
|
|
|
test_when_finished "rm 000?-*" &&
|
|
|
|
test_line_count = 5 actual &&
|
|
|
|
test_i18ngrep "^Range-diff:$" 0000-* &&
|
|
|
|
grep "= 1: .* s/5/A" 0000-* &&
|
|
|
|
grep "= 2: .* s/4/A" 0000-* &&
|
|
|
|
grep "= 3: .* s/11/B" 0000-* &&
|
2019-11-20 21:18:41 +00:00
|
|
|
grep "! 4: .* s/12/B" 0000-* &&
|
|
|
|
sed s/Z/\ /g >expect <<-EOF &&
|
2019-11-20 21:18:43 +00:00
|
|
|
@@ Commit message
|
2019-11-20 21:18:41 +00:00
|
|
|
Z
|
2019-11-20 21:18:43 +00:00
|
|
|
Z
|
|
|
|
Z ## Notes ##
|
2019-11-20 21:18:41 +00:00
|
|
|
- topic note
|
|
|
|
+ unmodified note
|
|
|
|
Z
|
|
|
|
Z ## file ##
|
|
|
|
Z@@ file: A
|
|
|
|
EOF
|
2019-11-20 21:18:43 +00:00
|
|
|
sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
|
2019-11-20 21:18:41 +00:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2019-12-06 20:16:22 +00:00
|
|
|
test_expect_success 'format-patch --range-diff with format.notes config' '
|
2019-11-20 21:18:47 +00:00
|
|
|
git notes add -m "topic note" topic &&
|
|
|
|
git notes add -m "unmodified note" unmodified &&
|
|
|
|
test_when_finished git notes remove topic unmodified &&
|
|
|
|
test_config format.notes true &&
|
|
|
|
git format-patch --cover-letter --range-diff=$prev \
|
2020-11-18 23:44:23 +00:00
|
|
|
main..unmodified >actual &&
|
2019-11-20 21:18:47 +00:00
|
|
|
test_when_finished "rm 000?-*" &&
|
|
|
|
test_line_count = 5 actual &&
|
|
|
|
test_i18ngrep "^Range-diff:$" 0000-* &&
|
|
|
|
grep "= 1: .* s/5/A" 0000-* &&
|
|
|
|
grep "= 2: .* s/4/A" 0000-* &&
|
|
|
|
grep "= 3: .* s/11/B" 0000-* &&
|
|
|
|
grep "! 4: .* s/12/B" 0000-* &&
|
|
|
|
sed s/Z/\ /g >expect <<-EOF &&
|
|
|
|
@@ Commit message
|
|
|
|
Z
|
|
|
|
Z
|
|
|
|
Z ## Notes ##
|
|
|
|
- topic note
|
|
|
|
+ unmodified note
|
|
|
|
Z
|
|
|
|
Z ## file ##
|
|
|
|
Z@@ file: A
|
|
|
|
EOF
|
|
|
|
sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'format-patch --range-diff with multiple notes' '
|
|
|
|
git notes --ref=note1 add -m "topic note1" topic &&
|
|
|
|
git notes --ref=note1 add -m "unmodified note1" unmodified &&
|
|
|
|
test_when_finished git notes --ref=note1 remove topic unmodified &&
|
|
|
|
git notes --ref=note2 add -m "topic note2" topic &&
|
|
|
|
git notes --ref=note2 add -m "unmodified note2" unmodified &&
|
|
|
|
test_when_finished git notes --ref=note2 remove topic unmodified &&
|
|
|
|
git format-patch --notes=note1 --notes=note2 --cover-letter --range-diff=$prev \
|
2020-11-18 23:44:23 +00:00
|
|
|
main..unmodified >actual &&
|
2019-11-20 21:18:47 +00:00
|
|
|
test_when_finished "rm 000?-*" &&
|
|
|
|
test_line_count = 5 actual &&
|
|
|
|
test_i18ngrep "^Range-diff:$" 0000-* &&
|
|
|
|
grep "= 1: .* s/5/A" 0000-* &&
|
|
|
|
grep "= 2: .* s/4/A" 0000-* &&
|
|
|
|
grep "= 3: .* s/11/B" 0000-* &&
|
|
|
|
grep "! 4: .* s/12/B" 0000-* &&
|
|
|
|
sed s/Z/\ /g >expect <<-EOF &&
|
|
|
|
@@ Commit message
|
|
|
|
Z
|
|
|
|
Z
|
|
|
|
Z ## Notes (note1) ##
|
|
|
|
- topic note1
|
|
|
|
+ unmodified note1
|
|
|
|
Z
|
|
|
|
Z
|
|
|
|
Z ## Notes (note2) ##
|
|
|
|
- topic note2
|
|
|
|
+ unmodified note2
|
|
|
|
Z
|
|
|
|
Z ## file ##
|
|
|
|
Z@@ file: A
|
|
|
|
EOF
|
|
|
|
sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2021-02-05 14:46:13 +00:00
|
|
|
test_expect_success '--left-only/--right-only' '
|
|
|
|
git switch --orphan left-right &&
|
|
|
|
test_commit first &&
|
|
|
|
test_commit unmatched &&
|
|
|
|
test_commit common &&
|
|
|
|
git switch -C left-right first &&
|
|
|
|
git cherry-pick common &&
|
|
|
|
|
|
|
|
git range-diff -s --left-only ...common >actual &&
|
|
|
|
head_oid=$(git rev-parse --short HEAD) &&
|
|
|
|
common_oid=$(git rev-parse --short common) &&
|
|
|
|
echo "1: $head_oid = 2: $common_oid common" >expect &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
range-diff: show submodule changes irrespective of diff.submodule
After generating diffs for each range to be compared using a 'git log'
invocation, range-diff.c::read_patches looks for the "diff --git" header
in those diffs to recognize the beginning of a new change.
In a project with submodules, and with 'diff.submodule=log' set in the
config, this header is missing for the diff of a changed submodule, so
any submodule changes are quietly ignored in the range-diff.
When 'diff.submodule=diff' is set in the config, the "diff --git" header
is also missing for the submodule itself, but is shown for submodule
content changes, which can easily confuse 'git range-diff' and lead to
errors such as:
error: git apply: bad git-diff - inconsistent old filename on line 1
error: could not parse git header 'diff --git path/to/submodule/and/some/file/within
'
error: could not parse log for '@{u}..@{1}'
Force the submodule diff format to its default ("short") when invoking
'git log' to generate the patches for each range, such that submodule
changes are always detected.
Add a test, including an invocation with '--creation-factor=100' to
force the second commit in the range not to be considered a complete
rewrite, in order to verify we do indeed get the "short" format.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-06-06 20:59:13 +00:00
|
|
|
test_expect_success 'submodule changes are shown irrespective of diff.submodule' '
|
|
|
|
git init sub-repo &&
|
|
|
|
test_commit -C sub-repo sub-first &&
|
|
|
|
sub_oid1=$(git -C sub-repo rev-parse HEAD) &&
|
|
|
|
test_commit -C sub-repo sub-second &&
|
|
|
|
sub_oid2=$(git -C sub-repo rev-parse HEAD) &&
|
|
|
|
test_commit -C sub-repo sub-third &&
|
|
|
|
sub_oid3=$(git -C sub-repo rev-parse HEAD) &&
|
|
|
|
|
|
|
|
git checkout -b main-sub topic &&
|
|
|
|
git submodule add ./sub-repo sub &&
|
|
|
|
git -C sub checkout --detach sub-first &&
|
|
|
|
git commit -m "add sub" sub &&
|
|
|
|
sup_oid1=$(git rev-parse --short HEAD) &&
|
|
|
|
git checkout -b topic-sub &&
|
|
|
|
git -C sub checkout sub-second &&
|
|
|
|
git commit -m "change sub" sub &&
|
|
|
|
sup_oid2=$(git rev-parse --short HEAD) &&
|
|
|
|
git checkout -b modified-sub main-sub &&
|
|
|
|
git -C sub checkout sub-third &&
|
|
|
|
git commit -m "change sub" sub &&
|
|
|
|
sup_oid3=$(git rev-parse --short HEAD) &&
|
|
|
|
sup_oid0=$(test_oid __) &&
|
|
|
|
|
|
|
|
test_config diff.submodule log &&
|
|
|
|
git range-diff topic topic-sub modified-sub >actual &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
1: $sup_oid1 = 1: $sup_oid1 add sub
|
|
|
|
2: $sup_oid2 < -: $sup_oid0 change sub
|
|
|
|
-: $sup_oid0 > 2: $sup_oid3 change sub
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual &&
|
|
|
|
test_config diff.submodule diff &&
|
|
|
|
git range-diff topic topic-sub modified-sub >actual &&
|
|
|
|
git range-diff --creation-factor=100 topic topic-sub modified-sub >actual &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
1: $sup_oid1 = 1: $sup_oid1 add sub
|
|
|
|
2: $sup_oid2 ! 2: $sup_oid3 change sub
|
|
|
|
@@ Commit message
|
|
|
|
## sub ##
|
|
|
|
@@
|
|
|
|
-Subproject commit $sub_oid1
|
|
|
|
-+Subproject commit $sub_oid2
|
|
|
|
++Subproject commit $sub_oid3
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual &&
|
|
|
|
test_config diff.submodule diff &&
|
|
|
|
git range-diff --creation-factor=100 topic topic-sub modified-sub >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2018-08-13 11:33:16 +00:00
|
|
|
test_done
|