2009-02-19 11:13:42 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='git patch-id'
|
|
|
|
|
2020-11-18 23:44:27 +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
|
|
|
|
|
2009-02-19 11:13:42 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
2014-04-27 18:15:51 +00:00
|
|
|
as="a a a a a a a a" && # eight a
|
|
|
|
test_write_lines $as >foo &&
|
|
|
|
test_write_lines $as >bar &&
|
|
|
|
git add foo bar &&
|
|
|
|
git commit -a -m initial &&
|
|
|
|
test_write_lines $as b >foo &&
|
|
|
|
test_write_lines $as b >bar &&
|
|
|
|
git commit -a -m first &&
|
2020-11-18 23:44:27 +00:00
|
|
|
git checkout -b same main &&
|
2014-04-27 18:15:51 +00:00
|
|
|
git commit --amend -m same-msg &&
|
2020-11-18 23:44:27 +00:00
|
|
|
git checkout -b notsame main &&
|
2014-04-27 18:15:51 +00:00
|
|
|
echo c >foo &&
|
|
|
|
echo c >bar &&
|
|
|
|
git commit --amend -a -m notsame-msg &&
|
|
|
|
test_write_lines bar foo >bar-then-foo &&
|
|
|
|
test_write_lines foo bar >foo-then-bar
|
2009-02-19 11:13:42 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'patch-id output is well-formed' '
|
2021-12-16 23:11:12 +00:00
|
|
|
git log -p -1 >log.output &&
|
|
|
|
git patch-id <log.output >output &&
|
2019-12-21 19:49:22 +00:00
|
|
|
grep "^$OID_REGEX $(git rev-parse HEAD)$" output
|
2009-02-19 11:13:42 +00:00
|
|
|
'
|
|
|
|
|
2014-04-27 18:15:51 +00:00
|
|
|
#calculate patch id. Make sure output is not empty.
|
2010-04-19 08:46:14 +00:00
|
|
|
calc_patch_id () {
|
2016-05-23 22:23:56 +00:00
|
|
|
patch_name="$1"
|
2014-04-27 18:15:51 +00:00
|
|
|
shift
|
2021-12-16 23:11:12 +00:00
|
|
|
git patch-id "$@" >patch-id.output &&
|
|
|
|
sed "s/ .*//" patch-id.output >patch-id_"$patch_name" &&
|
2022-02-02 04:19:45 +00:00
|
|
|
test_line_count -eq 1 patch-id_"$patch_name"
|
2014-04-27 18:15:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
get_top_diff () {
|
|
|
|
git log -p -1 "$@" -O bar-then-foo --
|
2010-04-19 08:46:14 +00:00
|
|
|
}
|
|
|
|
|
2009-02-19 11:13:42 +00:00
|
|
|
get_patch_id () {
|
2021-12-16 23:11:12 +00:00
|
|
|
get_top_diff "$1" >top-diff.output &&
|
|
|
|
calc_patch_id <top-diff.output "$@"
|
2009-02-19 11:13:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success 'patch-id detects equality' '
|
2020-11-18 23:44:27 +00:00
|
|
|
get_patch_id main &&
|
2009-02-19 11:13:42 +00:00
|
|
|
get_patch_id same &&
|
2020-11-18 23:44:27 +00:00
|
|
|
test_cmp patch-id_main patch-id_same
|
2009-02-19 11:13:42 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'patch-id detects inequality' '
|
2020-11-18 23:44:27 +00:00
|
|
|
get_patch_id main &&
|
2009-02-19 11:13:42 +00:00
|
|
|
get_patch_id notsame &&
|
2020-11-18 23:44:27 +00:00
|
|
|
! test_cmp patch-id_main patch-id_notsame
|
2009-02-19 11:13:42 +00:00
|
|
|
'
|
|
|
|
|
2010-04-19 08:46:14 +00:00
|
|
|
test_expect_success 'patch-id supports git-format-patch output' '
|
2020-11-18 23:44:27 +00:00
|
|
|
get_patch_id main &&
|
2010-04-19 08:46:14 +00:00
|
|
|
git checkout same &&
|
2021-12-16 23:11:12 +00:00
|
|
|
git format-patch -1 --stdout >format-patch.output &&
|
|
|
|
calc_patch_id same <format-patch.output &&
|
2020-11-18 23:44:27 +00:00
|
|
|
test_cmp patch-id_main patch-id_same &&
|
2021-12-16 23:11:12 +00:00
|
|
|
set $(git patch-id <format-patch.output) &&
|
2014-04-30 16:23:06 +00:00
|
|
|
test "$2" = $(git rev-parse HEAD)
|
2010-04-19 08:46:14 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'whitespace is irrelevant in footer' '
|
2020-11-18 23:44:27 +00:00
|
|
|
get_patch_id main &&
|
2010-04-19 08:46:14 +00:00
|
|
|
git checkout same &&
|
2021-12-16 23:11:12 +00:00
|
|
|
git format-patch -1 --stdout >format-patch.output &&
|
|
|
|
sed "s/ \$//" format-patch.output | calc_patch_id same &&
|
2020-11-18 23:44:27 +00:00
|
|
|
test_cmp patch-id_main patch-id_same
|
2010-04-19 08:46:14 +00:00
|
|
|
'
|
|
|
|
|
2014-04-27 18:15:51 +00:00
|
|
|
cmp_patch_id () {
|
|
|
|
if
|
|
|
|
test "$1" = "relevant"
|
|
|
|
then
|
|
|
|
! test_cmp patch-id_"$2" patch-id_"$3"
|
|
|
|
else
|
|
|
|
test_cmp patch-id_"$2" patch-id_"$3"
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
test_patch_id_file_order () {
|
|
|
|
relevant="$1"
|
|
|
|
shift
|
|
|
|
name="order-${1}-$relevant"
|
|
|
|
shift
|
2021-12-16 23:11:12 +00:00
|
|
|
get_top_diff "main" >top-diff.output &&
|
|
|
|
calc_patch_id <top-diff.output "$name" "$@" &&
|
2014-04-27 18:15:51 +00:00
|
|
|
git checkout same &&
|
2021-12-16 23:11:12 +00:00
|
|
|
git format-patch -1 --stdout -O foo-then-bar >format-patch.output &&
|
|
|
|
calc_patch_id <format-patch.output "ordered-$name" "$@" &&
|
2014-04-27 18:15:51 +00:00
|
|
|
cmp_patch_id $relevant "$name" "ordered-$name"
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
# combined test for options: add more tests here to make them
|
|
|
|
# run with all options
|
|
|
|
test_patch_id () {
|
|
|
|
test_patch_id_file_order "$@"
|
|
|
|
}
|
|
|
|
|
|
|
|
# small tests with detailed diagnostic for basic options.
|
|
|
|
test_expect_success 'file order is irrelevant with --stable' '
|
|
|
|
test_patch_id_file_order irrelevant --stable --stable
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'file order is relevant with --unstable' '
|
|
|
|
test_patch_id_file_order relevant --unstable --unstable
|
|
|
|
'
|
|
|
|
|
|
|
|
#Now test various option combinations.
|
|
|
|
test_expect_success 'default is unstable' '
|
|
|
|
test_patch_id relevant default
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'patchid.stable = true is stable' '
|
|
|
|
test_config patchid.stable true &&
|
|
|
|
test_patch_id irrelevant patchid.stable=true
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'patchid.stable = false is unstable' '
|
|
|
|
test_config patchid.stable false &&
|
|
|
|
test_patch_id relevant patchid.stable=false
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--unstable overrides patchid.stable = true' '
|
|
|
|
test_config patchid.stable true &&
|
|
|
|
test_patch_id relevant patchid.stable=true--unstable --unstable
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success '--stable overrides patchid.stable = false' '
|
|
|
|
test_config patchid.stable false &&
|
|
|
|
test_patch_id irrelevant patchid.stable=false--stable --stable
|
|
|
|
'
|
|
|
|
|
2010-04-19 08:46:14 +00:00
|
|
|
test_expect_success 'patch-id supports git-format-patch MIME output' '
|
2020-11-18 23:44:27 +00:00
|
|
|
get_patch_id main &&
|
2010-04-19 08:46:14 +00:00
|
|
|
git checkout same &&
|
2021-12-16 23:11:12 +00:00
|
|
|
git format-patch -1 --attach --stdout >format-patch.output &&
|
|
|
|
calc_patch_id <format-patch.output same &&
|
2020-11-18 23:44:27 +00:00
|
|
|
test_cmp patch-id_main patch-id_same
|
2010-04-19 08:46:14 +00:00
|
|
|
'
|
|
|
|
|
2016-09-13 03:23:22 +00:00
|
|
|
test_expect_success 'patch-id respects config from subdir' '
|
|
|
|
test_config patchid.stable true &&
|
|
|
|
mkdir subdir &&
|
|
|
|
|
|
|
|
# copy these because test_patch_id() looks for them in
|
|
|
|
# the current directory
|
|
|
|
cp bar-then-foo foo-then-bar subdir &&
|
|
|
|
|
|
|
|
(
|
|
|
|
cd subdir &&
|
|
|
|
test_patch_id irrelevant patchid.stable=true
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2011-02-17 07:44:42 +00:00
|
|
|
test_expect_success 'patch-id handles no-nl-at-eof markers' '
|
2022-02-02 04:20:15 +00:00
|
|
|
cat >nonl <<-\EOF &&
|
|
|
|
diff --git i/a w/a
|
|
|
|
index e69de29..2e65efe 100644
|
|
|
|
--- i/a
|
|
|
|
+++ w/a
|
|
|
|
@@ -0,0 +1 @@
|
|
|
|
+a
|
|
|
|
\ No newline at end of file
|
|
|
|
diff --git i/b w/b
|
|
|
|
index e69de29..6178079 100644
|
|
|
|
--- i/b
|
|
|
|
+++ w/b
|
|
|
|
@@ -0,0 +1 @@
|
|
|
|
+b
|
|
|
|
EOF
|
|
|
|
cat >withnl <<-\EOF &&
|
|
|
|
diff --git i/a w/a
|
|
|
|
index e69de29..7898192 100644
|
|
|
|
--- i/a
|
|
|
|
+++ w/a
|
|
|
|
@@ -0,0 +1 @@
|
|
|
|
+a
|
|
|
|
diff --git i/b w/b
|
|
|
|
index e69de29..6178079 100644
|
|
|
|
--- i/b
|
|
|
|
+++ w/b
|
|
|
|
@@ -0,0 +1 @@
|
|
|
|
+b
|
|
|
|
EOF
|
|
|
|
calc_patch_id nonl <nonl &&
|
|
|
|
calc_patch_id withnl <withnl &&
|
2011-02-16 16:55:37 +00:00
|
|
|
test_cmp patch-id_nonl patch-id_withnl
|
|
|
|
'
|
2022-02-02 04:19:45 +00:00
|
|
|
|
|
|
|
test_expect_success 'patch-id handles diffs with one line of before/after' '
|
|
|
|
cat >diffu1 <<-\EOF &&
|
|
|
|
diff --git a/bar b/bar
|
|
|
|
index bdaf90f..31051f6 100644
|
|
|
|
--- a/bar
|
|
|
|
+++ b/bar
|
|
|
|
@@ -2 +2,2 @@
|
|
|
|
b
|
|
|
|
+c
|
|
|
|
diff --git a/car b/car
|
|
|
|
index 00750ed..2ae5e34 100644
|
|
|
|
--- a/car
|
|
|
|
+++ b/car
|
|
|
|
@@ -1 +1,2 @@
|
|
|
|
3
|
|
|
|
+d
|
|
|
|
diff --git a/foo b/foo
|
|
|
|
index e439850..7146eb8 100644
|
|
|
|
--- a/foo
|
|
|
|
+++ b/foo
|
|
|
|
@@ -2 +2,2 @@
|
|
|
|
a
|
|
|
|
+e
|
|
|
|
EOF
|
|
|
|
calc_patch_id diffu1 <diffu1 &&
|
|
|
|
test_config patchid.stable true &&
|
|
|
|
calc_patch_id diffu1stable <diffu1
|
|
|
|
'
|
2009-02-19 11:13:42 +00:00
|
|
|
test_done
|