2006-12-21 09:21:28 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2006 Johannes E. Schindelin
|
|
|
|
#
|
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
test_description='git rerere
|
2010-08-05 11:25:34 +00:00
|
|
|
|
|
|
|
! [fifth] version1
|
|
|
|
! [first] first
|
|
|
|
! [fourth] version1
|
2020-11-18 23:44:27 +00:00
|
|
|
! [main] initial
|
2010-08-05 11:25:34 +00:00
|
|
|
! [second] prefer first over second
|
|
|
|
! [third] version2
|
|
|
|
------
|
|
|
|
+ [third] version2
|
|
|
|
+ [fifth] version1
|
|
|
|
+ [fourth] version1
|
|
|
|
+ + + [third^] third
|
|
|
|
- [second] prefer first over second
|
|
|
|
+ + [first] first
|
|
|
|
+ [second^] second
|
2020-11-18 23:44:27 +00:00
|
|
|
++++++ [main] initial
|
2006-12-21 09:21:28 +00:00
|
|
|
'
|
|
|
|
|
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
|
|
|
|
|
2006-12-21 09:21:28 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
2010-08-05 11:25:34 +00:00
|
|
|
test_expect_success 'setup' '
|
|
|
|
cat >a1 <<-\EOF &&
|
2010-03-20 08:29:11 +00:00
|
|
|
Some title
|
|
|
|
==========
|
2010-08-05 11:25:34 +00:00
|
|
|
Whether '\''tis nobler in the mind to suffer
|
2010-03-20 08:29:11 +00:00
|
|
|
The slings and arrows of outrageous fortune,
|
|
|
|
Or to take arms against a sea of troubles,
|
|
|
|
And by opposing end them? To die: to sleep;
|
|
|
|
No more; and by a sleep to say we end
|
|
|
|
The heart-ache and the thousand natural shocks
|
2010-08-05 11:25:34 +00:00
|
|
|
That flesh is heir to, '\''tis a consummation
|
|
|
|
Devoutly to be wish'\''d.
|
2010-03-20 08:29:11 +00:00
|
|
|
EOF
|
2006-12-21 09:21:28 +00:00
|
|
|
|
2010-03-20 08:29:11 +00:00
|
|
|
git add a1 &&
|
2010-08-05 11:25:34 +00:00
|
|
|
test_tick &&
|
2010-03-20 08:29:11 +00:00
|
|
|
git commit -q -a -m initial &&
|
2006-12-21 09:21:28 +00:00
|
|
|
|
2010-08-05 11:25:34 +00:00
|
|
|
cat >>a1 <<-\EOF &&
|
2010-03-20 08:29:11 +00:00
|
|
|
Some title
|
|
|
|
==========
|
|
|
|
To die, to sleep;
|
2010-08-05 11:25:34 +00:00
|
|
|
To sleep: perchance to dream: ay, there'\''s the rub;
|
2010-03-20 08:29:11 +00:00
|
|
|
For in that sleep of death what dreams may come
|
|
|
|
When we have shuffled off this mortal coil,
|
2010-08-05 11:25:34 +00:00
|
|
|
Must give us pause: there'\''s the respect
|
2010-03-20 08:29:11 +00:00
|
|
|
That makes calamity of so long life;
|
|
|
|
EOF
|
2010-08-05 11:25:34 +00:00
|
|
|
|
|
|
|
git checkout -b first &&
|
|
|
|
test_tick &&
|
2010-03-20 08:29:11 +00:00
|
|
|
git commit -q -a -m first &&
|
2006-12-21 09:21:28 +00:00
|
|
|
|
2020-11-18 23:44:27 +00:00
|
|
|
git checkout -b second main &&
|
2010-03-20 08:29:11 +00:00
|
|
|
git show first:a1 |
|
2010-08-05 11:25:34 +00:00
|
|
|
sed -e "s/To die, t/To die! T/" -e "s/Some title/Some Title/" >a1 &&
|
|
|
|
echo "* END *" >>a1 &&
|
|
|
|
test_tick &&
|
2010-03-20 08:29:11 +00:00
|
|
|
git commit -q -a -m second
|
2010-08-05 11:25:34 +00:00
|
|
|
'
|
2006-12-21 09:21:28 +00:00
|
|
|
|
2007-07-06 12:05:59 +00:00
|
|
|
test_expect_success 'nothing recorded without rerere' '
|
2010-08-05 11:25:34 +00:00
|
|
|
rm -rf .git/rr-cache &&
|
|
|
|
git config rerere.enabled false &&
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git merge first &&
|
2007-07-06 12:05:59 +00:00
|
|
|
! test -d .git/rr-cache
|
|
|
|
'
|
2006-12-21 09:21:28 +00:00
|
|
|
|
2010-08-05 11:25:34 +00:00
|
|
|
test_expect_success 'activate rerere, old style (conflicting merge)' '
|
2007-07-06 12:05:59 +00:00
|
|
|
git reset --hard &&
|
|
|
|
mkdir .git/rr-cache &&
|
2010-08-05 11:25:34 +00:00
|
|
|
test_might_fail git config --unset rerere.enabled &&
|
|
|
|
test_must_fail git merge first &&
|
2006-12-21 09:21:28 +00:00
|
|
|
|
2013-10-29 01:23:03 +00:00
|
|
|
sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) &&
|
2010-08-05 11:25:34 +00:00
|
|
|
rr=.git/rr-cache/$sha1 &&
|
|
|
|
grep "^=======\$" $rr/preimage &&
|
|
|
|
! test -f $rr/postimage &&
|
|
|
|
! test -f $rr/thisimage
|
|
|
|
'
|
2006-12-21 09:21:28 +00:00
|
|
|
|
2007-07-06 12:05:59 +00:00
|
|
|
test_expect_success 'rerere.enabled works, too' '
|
|
|
|
rm -rf .git/rr-cache &&
|
|
|
|
git config rerere.enabled true &&
|
|
|
|
git reset --hard &&
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git merge first &&
|
2010-08-05 11:25:34 +00:00
|
|
|
|
2013-10-29 01:23:03 +00:00
|
|
|
sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) &&
|
2010-08-05 11:25:34 +00:00
|
|
|
rr=.git/rr-cache/$sha1 &&
|
2008-07-07 12:42:48 +00:00
|
|
|
grep ^=======$ $rr/preimage
|
2007-07-06 12:05:59 +00:00
|
|
|
'
|
|
|
|
|
2010-08-05 11:25:34 +00:00
|
|
|
test_expect_success 'set up rr-cache' '
|
|
|
|
rm -rf .git/rr-cache &&
|
|
|
|
git config rerere.enabled true &&
|
|
|
|
git reset --hard &&
|
|
|
|
test_must_fail git merge first &&
|
2013-10-29 01:23:03 +00:00
|
|
|
sha1=$(perl -pe "s/ .*//" .git/MERGE_RR) &&
|
2010-08-05 11:25:34 +00:00
|
|
|
rr=.git/rr-cache/$sha1
|
|
|
|
'
|
2006-12-21 09:21:28 +00:00
|
|
|
|
2010-08-05 11:25:34 +00:00
|
|
|
test_expect_success 'rr-cache looks sane' '
|
|
|
|
# no postimage or thisimage yet
|
|
|
|
! test -f $rr/postimage &&
|
|
|
|
! test -f $rr/thisimage &&
|
2007-04-03 23:28:46 +00:00
|
|
|
|
2010-08-05 11:25:34 +00:00
|
|
|
# preimage has right number of lines
|
2007-04-03 23:28:46 +00:00
|
|
|
cnt=$(sed -ne "/^<<<<<<</,/^>>>>>>>/p" $rr/preimage | wc -l) &&
|
2010-08-05 11:25:34 +00:00
|
|
|
echo $cnt &&
|
2008-07-07 12:42:48 +00:00
|
|
|
test $cnt = 13
|
2007-04-03 23:28:46 +00:00
|
|
|
'
|
|
|
|
|
2010-08-05 11:25:34 +00:00
|
|
|
test_expect_success 'rerere diff' '
|
|
|
|
git show first:a1 >a1 &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
--- a/a1
|
|
|
|
+++ b/a1
|
|
|
|
@@ -1,4 +1,4 @@
|
|
|
|
-Some Title
|
|
|
|
+Some title
|
|
|
|
==========
|
|
|
|
Whether '\''tis nobler in the mind to suffer
|
|
|
|
The slings and arrows of outrageous fortune,
|
|
|
|
@@ -8,21 +8,11 @@
|
|
|
|
The heart-ache and the thousand natural shocks
|
|
|
|
That flesh is heir to, '\''tis a consummation
|
|
|
|
Devoutly to be wish'\''d.
|
|
|
|
-<<<<<<<
|
|
|
|
-Some Title
|
|
|
|
-==========
|
|
|
|
-To die! To sleep;
|
|
|
|
-=======
|
|
|
|
Some title
|
|
|
|
==========
|
|
|
|
To die, to sleep;
|
|
|
|
->>>>>>>
|
|
|
|
To sleep: perchance to dream: ay, there'\''s the rub;
|
|
|
|
For in that sleep of death what dreams may come
|
|
|
|
When we have shuffled off this mortal coil,
|
|
|
|
Must give us pause: there'\''s the respect
|
|
|
|
That makes calamity of so long life;
|
|
|
|
-<<<<<<<
|
|
|
|
-=======
|
|
|
|
-* END *
|
|
|
|
->>>>>>>
|
|
|
|
EOF
|
|
|
|
git rerere diff >out &&
|
|
|
|
test_cmp expect out
|
2007-07-09 13:47:24 +00:00
|
|
|
'
|
2006-12-21 09:21:28 +00:00
|
|
|
|
2010-08-05 11:25:34 +00:00
|
|
|
test_expect_success 'rerere status' '
|
|
|
|
echo a1 >expect &&
|
|
|
|
git rerere status >out &&
|
|
|
|
test_cmp expect out
|
2010-07-12 23:42:04 +00:00
|
|
|
'
|
|
|
|
|
2010-08-05 11:25:34 +00:00
|
|
|
test_expect_success 'first postimage wins' '
|
|
|
|
git show first:a1 | sed "s/To die: t/To die! T/" >expect &&
|
2006-12-21 09:21:28 +00:00
|
|
|
|
2010-08-05 11:25:34 +00:00
|
|
|
git commit -q -a -m "prefer first over second" &&
|
|
|
|
test -f $rr/postimage &&
|
2006-12-21 09:21:28 +00:00
|
|
|
|
2018-04-25 04:29:00 +00:00
|
|
|
oldmtimepost=$(test-tool chmtime --get -60 $rr/postimage) &&
|
2006-12-21 09:21:28 +00:00
|
|
|
|
2020-11-18 23:44:27 +00:00
|
|
|
git checkout -b third main &&
|
2010-08-05 11:25:34 +00:00
|
|
|
git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
|
|
|
|
git commit -q -a -m third &&
|
2006-12-21 09:21:28 +00:00
|
|
|
|
2013-10-31 09:25:33 +00:00
|
|
|
test_must_fail git merge first &&
|
2010-08-05 11:25:34 +00:00
|
|
|
# rerere kicked in
|
|
|
|
! grep "^=======\$" a1 &&
|
|
|
|
test_cmp expect a1
|
|
|
|
'
|
2006-12-21 09:21:28 +00:00
|
|
|
|
2010-09-03 16:43:41 +00:00
|
|
|
test_expect_success 'rerere updates postimage timestamp' '
|
2018-04-25 04:29:00 +00:00
|
|
|
newmtimepost=$(test-tool chmtime --get $rr/postimage) &&
|
2010-09-03 16:43:41 +00:00
|
|
|
test $oldmtimepost -lt $newmtimepost
|
|
|
|
'
|
2007-02-25 00:59:52 +00:00
|
|
|
|
2010-08-05 11:25:34 +00:00
|
|
|
test_expect_success 'rerere clear' '
|
2015-07-17 20:28:31 +00:00
|
|
|
mv $rr/postimage .git/post-saved &&
|
2013-10-29 01:23:03 +00:00
|
|
|
echo "$sha1 a1" | perl -pe "y/\012/\000/" >.git/MERGE_RR &&
|
2010-08-05 11:25:34 +00:00
|
|
|
git rerere clear &&
|
|
|
|
! test -d $rr
|
|
|
|
'
|
2007-02-25 00:59:52 +00:00
|
|
|
|
2015-07-17 20:28:31 +00:00
|
|
|
test_expect_success 'leftover directory' '
|
|
|
|
git reset --hard &&
|
|
|
|
mkdir -p $rr &&
|
|
|
|
test_must_fail git merge first &&
|
|
|
|
test -f $rr/preimage
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'missing preimage' '
|
|
|
|
git reset --hard &&
|
|
|
|
mkdir -p $rr &&
|
|
|
|
cp .git/post-saved $rr/postimage &&
|
|
|
|
test_must_fail git merge first &&
|
|
|
|
test -f $rr/preimage
|
|
|
|
'
|
|
|
|
|
2010-08-05 11:25:34 +00:00
|
|
|
test_expect_success 'set up for garbage collection tests' '
|
|
|
|
mkdir -p $rr &&
|
|
|
|
echo Hello >$rr/preimage &&
|
|
|
|
echo World >$rr/postimage &&
|
2007-02-25 00:59:52 +00:00
|
|
|
|
2019-12-21 19:49:20 +00:00
|
|
|
sha2=$(test_oid deadbeef) &&
|
2010-08-05 11:25:34 +00:00
|
|
|
rr2=.git/rr-cache/$sha2 &&
|
|
|
|
mkdir $rr2 &&
|
|
|
|
echo Hello >$rr2/preimage &&
|
2007-02-25 00:59:52 +00:00
|
|
|
|
2010-08-05 11:25:34 +00:00
|
|
|
almost_15_days_ago=$((60-15*86400)) &&
|
|
|
|
just_over_15_days_ago=$((-1-15*86400)) &&
|
|
|
|
almost_60_days_ago=$((60-60*86400)) &&
|
|
|
|
just_over_60_days_ago=$((-1-60*86400)) &&
|
2007-02-25 00:59:52 +00:00
|
|
|
|
2018-03-24 07:44:31 +00:00
|
|
|
test-tool chmtime =$just_over_60_days_ago $rr/preimage &&
|
|
|
|
test-tool chmtime =$almost_60_days_ago $rr/postimage &&
|
|
|
|
test-tool chmtime =$almost_15_days_ago $rr2/preimage
|
2010-08-05 11:25:34 +00:00
|
|
|
'
|
2007-02-25 00:59:52 +00:00
|
|
|
|
2010-09-03 16:43:41 +00:00
|
|
|
test_expect_success 'gc preserves young or recently used records' '
|
2010-08-05 11:25:34 +00:00
|
|
|
git rerere gc &&
|
|
|
|
test -f $rr/preimage &&
|
|
|
|
test -f $rr2/preimage
|
|
|
|
'
|
2006-12-21 09:21:28 +00:00
|
|
|
|
2010-08-05 11:25:34 +00:00
|
|
|
test_expect_success 'old records rest in peace' '
|
2018-03-24 07:44:31 +00:00
|
|
|
test-tool chmtime =$just_over_60_days_ago $rr/postimage &&
|
|
|
|
test-tool chmtime =$just_over_15_days_ago $rr2/preimage &&
|
2010-08-05 11:25:34 +00:00
|
|
|
git rerere gc &&
|
|
|
|
! test -f $rr/preimage &&
|
|
|
|
! test -f $rr2/preimage
|
|
|
|
'
|
2006-12-21 09:21:28 +00:00
|
|
|
|
2017-08-22 21:25:09 +00:00
|
|
|
rerere_gc_custom_expiry_test () {
|
|
|
|
five_days="$1" right_now="$2"
|
|
|
|
test_expect_success "rerere gc with custom expiry ($five_days, $right_now)" '
|
|
|
|
rm -fr .git/rr-cache &&
|
2018-05-13 02:24:13 +00:00
|
|
|
rr=.git/rr-cache/$ZERO_OID &&
|
2017-08-22 21:25:09 +00:00
|
|
|
mkdir -p "$rr" &&
|
|
|
|
>"$rr/preimage" &&
|
|
|
|
>"$rr/postimage" &&
|
|
|
|
|
|
|
|
two_days_ago=$((-2*86400)) &&
|
2018-03-24 07:44:31 +00:00
|
|
|
test-tool chmtime =$two_days_ago "$rr/preimage" &&
|
|
|
|
test-tool chmtime =$two_days_ago "$rr/postimage" &&
|
2017-08-22 21:25:09 +00:00
|
|
|
|
|
|
|
find .git/rr-cache -type f | sort >original &&
|
|
|
|
|
|
|
|
git -c "gc.rerereresolved=$five_days" \
|
|
|
|
-c "gc.rerereunresolved=$five_days" rerere gc &&
|
|
|
|
find .git/rr-cache -type f | sort >actual &&
|
|
|
|
test_cmp original actual &&
|
|
|
|
|
|
|
|
git -c "gc.rerereresolved=$five_days" \
|
|
|
|
-c "gc.rerereunresolved=$right_now" rerere gc &&
|
|
|
|
find .git/rr-cache -type f | sort >actual &&
|
|
|
|
test_cmp original actual &&
|
|
|
|
|
|
|
|
git -c "gc.rerereresolved=$right_now" \
|
|
|
|
-c "gc.rerereunresolved=$right_now" rerere gc &&
|
|
|
|
find .git/rr-cache -type f | sort >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual
|
2017-08-22 21:25:09 +00:00
|
|
|
'
|
|
|
|
}
|
|
|
|
|
|
|
|
rerere_gc_custom_expiry_test 5 0
|
2017-08-22 21:20:24 +00:00
|
|
|
|
2017-08-19 18:43:39 +00:00
|
|
|
rerere_gc_custom_expiry_test 5.days.ago now
|
|
|
|
|
2010-08-05 11:25:34 +00:00
|
|
|
test_expect_success 'setup: file2 added differently in two branches' '
|
2007-07-09 13:47:24 +00:00
|
|
|
git reset --hard &&
|
2010-08-05 11:25:34 +00:00
|
|
|
|
2007-07-09 13:47:24 +00:00
|
|
|
git checkout -b fourth &&
|
2010-08-05 11:25:34 +00:00
|
|
|
echo Hallo >file2 &&
|
2007-07-09 13:47:24 +00:00
|
|
|
git add file2 &&
|
2010-08-05 11:25:34 +00:00
|
|
|
test_tick &&
|
2007-07-09 13:47:24 +00:00
|
|
|
git commit -m version1 &&
|
2010-08-05 11:25:34 +00:00
|
|
|
|
2007-07-09 13:47:24 +00:00
|
|
|
git checkout third &&
|
2010-08-05 11:25:34 +00:00
|
|
|
echo Bello >file2 &&
|
2007-07-09 13:47:24 +00:00
|
|
|
git add file2 &&
|
2010-08-05 11:25:34 +00:00
|
|
|
test_tick &&
|
2007-07-09 13:47:24 +00:00
|
|
|
git commit -m version2 &&
|
2010-08-05 11:25:34 +00:00
|
|
|
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git merge fourth &&
|
2010-08-05 11:25:34 +00:00
|
|
|
echo Cello >file2 &&
|
2007-07-09 13:47:24 +00:00
|
|
|
git add file2 &&
|
|
|
|
git commit -m resolution
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'resolution was recorded properly' '
|
2010-08-05 11:25:34 +00:00
|
|
|
echo Cello >expected &&
|
|
|
|
|
2007-07-09 13:47:24 +00:00
|
|
|
git reset --hard HEAD~2 &&
|
|
|
|
git checkout -b fifth &&
|
2010-08-05 11:25:34 +00:00
|
|
|
|
|
|
|
echo Hallo >file3 &&
|
2007-07-09 13:47:24 +00:00
|
|
|
git add file3 &&
|
2010-08-05 11:25:34 +00:00
|
|
|
test_tick &&
|
2007-07-09 13:47:24 +00:00
|
|
|
git commit -m version1 &&
|
2010-08-05 11:25:34 +00:00
|
|
|
|
2007-07-09 13:47:24 +00:00
|
|
|
git checkout third &&
|
2010-08-05 11:25:34 +00:00
|
|
|
echo Bello >file3 &&
|
2007-07-09 13:47:24 +00:00
|
|
|
git add file3 &&
|
2010-08-05 11:25:34 +00:00
|
|
|
test_tick &&
|
2007-07-09 13:47:24 +00:00
|
|
|
git commit -m version2 &&
|
2008-06-22 09:04:31 +00:00
|
|
|
git tag version2 &&
|
2010-08-05 11:25:34 +00:00
|
|
|
|
2008-06-22 09:03:26 +00:00
|
|
|
test_must_fail git merge fifth &&
|
2010-08-05 11:25:34 +00:00
|
|
|
test_cmp expected file3 &&
|
|
|
|
test_must_fail git update-index --refresh
|
2007-07-09 13:47:24 +00:00
|
|
|
'
|
|
|
|
|
2008-06-22 09:04:31 +00:00
|
|
|
test_expect_success 'rerere.autoupdate' '
|
2010-08-05 11:25:34 +00:00
|
|
|
git config rerere.autoupdate true &&
|
2008-06-22 09:04:31 +00:00
|
|
|
git reset --hard &&
|
|
|
|
git checkout version2 &&
|
|
|
|
test_must_fail git merge fifth &&
|
2010-08-05 11:25:34 +00:00
|
|
|
git update-index --refresh
|
2009-12-04 08:20:48 +00:00
|
|
|
'
|
2008-06-22 09:04:31 +00:00
|
|
|
|
2009-12-04 08:20:48 +00:00
|
|
|
test_expect_success 'merge --rerere-autoupdate' '
|
2010-08-05 11:25:34 +00:00
|
|
|
test_might_fail git config --unset rerere.autoupdate &&
|
2009-12-04 08:20:48 +00:00
|
|
|
git reset --hard &&
|
|
|
|
git checkout version2 &&
|
|
|
|
test_must_fail git merge --rerere-autoupdate fifth &&
|
2010-08-05 11:25:34 +00:00
|
|
|
git update-index --refresh
|
2009-12-04 08:20:48 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'merge --no-rerere-autoupdate' '
|
2010-08-05 11:25:34 +00:00
|
|
|
headblob=$(git rev-parse version2:file3) &&
|
|
|
|
mergeblob=$(git rev-parse fifth:file3) &&
|
|
|
|
cat >expected <<-EOF &&
|
|
|
|
100644 $headblob 2 file3
|
|
|
|
100644 $mergeblob 3 file3
|
|
|
|
EOF
|
|
|
|
|
|
|
|
git config rerere.autoupdate true &&
|
2009-12-04 08:20:48 +00:00
|
|
|
git reset --hard &&
|
|
|
|
git checkout version2 &&
|
|
|
|
test_must_fail git merge --no-rerere-autoupdate fifth &&
|
2010-08-05 11:25:34 +00:00
|
|
|
git ls-files -u >actual &&
|
|
|
|
test_cmp expected actual
|
2008-06-22 09:04:31 +00:00
|
|
|
'
|
|
|
|
|
2010-08-05 11:28:37 +00:00
|
|
|
test_expect_success 'set up an unresolved merge' '
|
|
|
|
headblob=$(git rev-parse version2:file3) &&
|
|
|
|
mergeblob=$(git rev-parse fifth:file3) &&
|
|
|
|
cat >expected.unresolved <<-EOF &&
|
|
|
|
100644 $headblob 2 file3
|
|
|
|
100644 $mergeblob 3 file3
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_might_fail git config --unset rerere.autoupdate &&
|
|
|
|
git reset --hard &&
|
|
|
|
git checkout version2 &&
|
|
|
|
ancestor=$(git merge-base version2 fifth) &&
|
|
|
|
test_must_fail git merge-recursive "$ancestor" -- HEAD fifth &&
|
|
|
|
|
|
|
|
git ls-files --stage >failedmerge &&
|
|
|
|
cp file3 file3.conflict &&
|
|
|
|
|
|
|
|
git ls-files -u >actual &&
|
|
|
|
test_cmp expected.unresolved actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'explicit rerere' '
|
|
|
|
test_might_fail git config --unset rerere.autoupdate &&
|
|
|
|
git rm -fr --cached . &&
|
|
|
|
git update-index --index-info <failedmerge &&
|
|
|
|
cp file3.conflict file3 &&
|
|
|
|
test_must_fail git update-index --refresh -q &&
|
|
|
|
|
|
|
|
git rerere &&
|
|
|
|
git ls-files -u >actual &&
|
|
|
|
test_cmp expected.unresolved actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'explicit rerere with autoupdate' '
|
|
|
|
git config rerere.autoupdate true &&
|
|
|
|
git rm -fr --cached . &&
|
|
|
|
git update-index --index-info <failedmerge &&
|
|
|
|
cp file3.conflict file3 &&
|
|
|
|
test_must_fail git update-index --refresh -q &&
|
|
|
|
|
|
|
|
git rerere &&
|
|
|
|
git update-index --refresh
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'explicit rerere --rerere-autoupdate overrides' '
|
|
|
|
git config rerere.autoupdate false &&
|
|
|
|
git rm -fr --cached . &&
|
|
|
|
git update-index --index-info <failedmerge &&
|
|
|
|
cp file3.conflict file3 &&
|
|
|
|
git rerere &&
|
|
|
|
git ls-files -u >actual1 &&
|
|
|
|
|
|
|
|
git rm -fr --cached . &&
|
|
|
|
git update-index --index-info <failedmerge &&
|
|
|
|
cp file3.conflict file3 &&
|
|
|
|
git rerere --rerere-autoupdate &&
|
|
|
|
git update-index --refresh &&
|
|
|
|
|
|
|
|
git rm -fr --cached . &&
|
|
|
|
git update-index --index-info <failedmerge &&
|
|
|
|
cp file3.conflict file3 &&
|
|
|
|
git rerere --rerere-autoupdate --no-rerere-autoupdate &&
|
|
|
|
git ls-files -u >actual2 &&
|
|
|
|
|
|
|
|
git rm -fr --cached . &&
|
|
|
|
git update-index --index-info <failedmerge &&
|
|
|
|
cp file3.conflict file3 &&
|
|
|
|
git rerere --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate &&
|
|
|
|
git update-index --refresh &&
|
|
|
|
|
|
|
|
test_cmp expected.unresolved actual1 &&
|
|
|
|
test_cmp expected.unresolved actual2
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rerere --no-no-rerere-autoupdate' '
|
|
|
|
git rm -fr --cached . &&
|
|
|
|
git update-index --index-info <failedmerge &&
|
|
|
|
cp file3.conflict file3 &&
|
|
|
|
test_must_fail git rerere --no-no-rerere-autoupdate 2>err &&
|
2023-10-31 05:23:30 +00:00
|
|
|
test_grep [Uu]sage err &&
|
2010-08-05 11:28:37 +00:00
|
|
|
test_must_fail git update-index --refresh
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rerere -h' '
|
|
|
|
test_must_fail git rerere -h >help &&
|
2023-10-31 05:23:30 +00:00
|
|
|
test_grep [Uu]sage help
|
2008-06-22 09:04:31 +00:00
|
|
|
'
|
|
|
|
|
2015-06-24 21:58:25 +00:00
|
|
|
concat_insert () {
|
|
|
|
last=$1
|
|
|
|
shift
|
|
|
|
cat early && printf "%s\n" "$@" && cat late "$last"
|
|
|
|
}
|
|
|
|
|
2016-03-08 20:11:00 +00:00
|
|
|
count_pre_post () {
|
|
|
|
find .git/rr-cache/ -type f -name "preimage*" >actual &&
|
|
|
|
test_line_count = "$1" actual &&
|
|
|
|
find .git/rr-cache/ -type f -name "postimage*" >actual &&
|
|
|
|
test_line_count = "$2" actual
|
|
|
|
}
|
|
|
|
|
|
|
|
merge_conflict_resolve () {
|
|
|
|
git reset --hard &&
|
|
|
|
test_must_fail git merge six.1 &&
|
|
|
|
# Resolution is to replace 7 with 6.1 and 6.2 (i.e. take both)
|
|
|
|
concat_insert short 6.1 6.2 >file1 &&
|
|
|
|
concat_insert long 6.1 6.2 >file2
|
|
|
|
}
|
|
|
|
|
2015-07-30 22:49:18 +00:00
|
|
|
test_expect_success 'multiple identical conflicts' '
|
2017-08-22 20:49:02 +00:00
|
|
|
rm -fr .git/rr-cache &&
|
|
|
|
mkdir .git/rr-cache &&
|
2015-06-24 21:58:25 +00:00
|
|
|
git reset --hard &&
|
|
|
|
|
|
|
|
test_seq 1 6 >early &&
|
|
|
|
>late &&
|
|
|
|
test_seq 11 15 >short &&
|
|
|
|
test_seq 111 120 >long &&
|
|
|
|
concat_insert short >file1 &&
|
|
|
|
concat_insert long >file2 &&
|
|
|
|
git add file1 file2 &&
|
|
|
|
git commit -m base &&
|
|
|
|
git tag base &&
|
|
|
|
git checkout -b six.1 &&
|
|
|
|
concat_insert short 6.1 >file1 &&
|
|
|
|
concat_insert long 6.1 >file2 &&
|
|
|
|
git add file1 file2 &&
|
|
|
|
git commit -m 6.1 &&
|
|
|
|
git checkout -b six.2 HEAD^ &&
|
|
|
|
concat_insert short 6.2 >file1 &&
|
|
|
|
concat_insert long 6.2 >file2 &&
|
|
|
|
git add file1 file2 &&
|
|
|
|
git commit -m 6.2 &&
|
|
|
|
|
|
|
|
# At this point, six.1 and six.2
|
|
|
|
# - derive from common ancestor that has two files
|
|
|
|
# 1...6 7 11..15 (file1) and 1...6 7 111..120 (file2)
|
|
|
|
# - six.1 replaces these 7s with 6.1
|
|
|
|
# - six.2 replaces these 7s with 6.2
|
|
|
|
|
2016-03-08 20:11:00 +00:00
|
|
|
merge_conflict_resolve &&
|
2015-06-24 21:58:25 +00:00
|
|
|
|
|
|
|
# Check that rerere knows that file1 and file2 have conflicts
|
|
|
|
|
|
|
|
printf "%s\n" file1 file2 >expect &&
|
|
|
|
git ls-files -u | sed -e "s/^.* //" | sort -u >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
|
|
|
git rerere status | sort >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
|
|
|
git rerere remaining >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
2016-03-08 20:11:00 +00:00
|
|
|
count_pre_post 2 0 &&
|
|
|
|
|
|
|
|
# Pretend that the conflicts were made quite some time ago
|
2018-04-25 04:29:00 +00:00
|
|
|
test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
|
2016-03-08 20:11:00 +00:00
|
|
|
|
|
|
|
# Unresolved entries have not expired yet
|
|
|
|
git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
|
|
|
|
count_pre_post 2 0 &&
|
|
|
|
|
|
|
|
# Unresolved entries have expired
|
|
|
|
git -c gc.rerereresolved=5 -c gc.rerereunresolved=1 rerere gc &&
|
|
|
|
count_pre_post 0 0 &&
|
|
|
|
|
|
|
|
# Recreate the conflicted state
|
|
|
|
merge_conflict_resolve &&
|
|
|
|
count_pre_post 2 0 &&
|
|
|
|
|
|
|
|
# Clear it
|
|
|
|
git rerere clear &&
|
|
|
|
count_pre_post 0 0 &&
|
|
|
|
|
|
|
|
# Recreate the conflicted state
|
|
|
|
merge_conflict_resolve &&
|
|
|
|
count_pre_post 2 0 &&
|
|
|
|
|
2015-06-24 21:58:25 +00:00
|
|
|
# We resolved file1 and file2
|
|
|
|
git rerere &&
|
|
|
|
git rerere remaining >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual &&
|
2015-06-24 21:58:25 +00:00
|
|
|
|
2016-03-08 20:11:00 +00:00
|
|
|
# We must have recorded both of them
|
|
|
|
count_pre_post 2 2 &&
|
|
|
|
|
2015-06-24 21:58:25 +00:00
|
|
|
# Now we should be able to resolve them both
|
|
|
|
git reset --hard &&
|
|
|
|
test_must_fail git merge six.1 &&
|
|
|
|
git rerere &&
|
|
|
|
|
|
|
|
git rerere remaining >actual &&
|
2018-07-27 17:48:11 +00:00
|
|
|
test_must_be_empty actual &&
|
2015-06-24 21:58:25 +00:00
|
|
|
|
|
|
|
concat_insert short 6.1 6.2 >file1.expect &&
|
|
|
|
concat_insert long 6.1 6.2 >file2.expect &&
|
|
|
|
test_cmp file1.expect file1 &&
|
2016-03-08 20:11:00 +00:00
|
|
|
test_cmp file2.expect file2 &&
|
|
|
|
|
2016-03-28 21:48:13 +00:00
|
|
|
# Forget resolution for file2
|
|
|
|
git rerere forget file2 &&
|
|
|
|
echo file2 >expect &&
|
|
|
|
git rerere status >actual &&
|
|
|
|
test_cmp expect actual &&
|
|
|
|
count_pre_post 2 1 &&
|
|
|
|
|
|
|
|
# file2 already has correct resolution, so record it again
|
|
|
|
git rerere &&
|
|
|
|
|
2016-03-08 20:11:00 +00:00
|
|
|
# Pretend that the resolutions are old again
|
2018-04-25 04:29:00 +00:00
|
|
|
test-tool chmtime -172800 $(find .git/rr-cache/ -type f) &&
|
2016-03-08 20:11:00 +00:00
|
|
|
|
|
|
|
# Resolved entries have not expired yet
|
|
|
|
git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
|
|
|
|
|
|
|
|
count_pre_post 2 2 &&
|
|
|
|
|
|
|
|
# Resolved entries have expired
|
|
|
|
git -c gc.rerereresolved=1 -c gc.rerereunresolved=5 rerere gc &&
|
|
|
|
count_pre_post 0 0
|
2015-06-24 21:58:25 +00:00
|
|
|
'
|
|
|
|
|
rerere: fix crash with files rerere can't handle
Currently when a user does a conflict resolution and ends it (in any
way that calls 'git rerere' again) with a file 'rerere' can't handle,
subsequent rerere operations that are interested in that path, such as
'rerere clear' or 'rerere forget <path>' will fail, or even worse in
the case of 'rerere clear' segfault.
Such states include nested conflicts, or a conflict marker that
doesn't have any match.
This is because 'git rerere' calculates a conflict file and writes it
to the MERGE_RR file. When the user then changes the file in any way
rerere can't handle, and then calls 'git rerere' on it again to record
the conflict resolution, the handle_file function fails, and removes
the 'preimage' file in the rr-cache in the process, while leaving the
ID in the MERGE_RR file.
Now when 'rerere clear' is run, it reads the ID from the MERGE_RR
file, however the 'fit_variant' function for the ID is never called as
the 'preimage' file does not exist anymore. This means
'collection->status' in 'has_rerere_resolution' is NULL, and the
command will crash.
To fix this, remove the rerere ID from the MERGE_RR file in the case
when we can't handle it, just after the 'preimage' file was removed
and remove the corresponding variant from .git/rr-cache/. Removing it
unconditionally is fine here, because if the user would have resolved
the conflict and ran rerere, the entry would no longer be in the
MERGE_RR file, so we wouldn't have this problem in the first place,
while if the conflict was not resolved.
Currently there is nothing left in this folder, as the 'preimage'
was already deleted by the 'handle_file' function, so 'remove_variant'
is a no-op. Still call the function, to make sure we clean everything
up, in case we add some other files corresponding to a variant in the
future.
Note that other variants that have the same conflict ID will not be
touched.
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-05 17:20:32 +00:00
|
|
|
test_expect_success 'rerere with unexpected conflict markers does not crash' '
|
|
|
|
git reset --hard &&
|
|
|
|
|
2020-11-18 23:44:27 +00:00
|
|
|
git checkout -b branch-1 main &&
|
rerere: fix crash with files rerere can't handle
Currently when a user does a conflict resolution and ends it (in any
way that calls 'git rerere' again) with a file 'rerere' can't handle,
subsequent rerere operations that are interested in that path, such as
'rerere clear' or 'rerere forget <path>' will fail, or even worse in
the case of 'rerere clear' segfault.
Such states include nested conflicts, or a conflict marker that
doesn't have any match.
This is because 'git rerere' calculates a conflict file and writes it
to the MERGE_RR file. When the user then changes the file in any way
rerere can't handle, and then calls 'git rerere' on it again to record
the conflict resolution, the handle_file function fails, and removes
the 'preimage' file in the rr-cache in the process, while leaving the
ID in the MERGE_RR file.
Now when 'rerere clear' is run, it reads the ID from the MERGE_RR
file, however the 'fit_variant' function for the ID is never called as
the 'preimage' file does not exist anymore. This means
'collection->status' in 'has_rerere_resolution' is NULL, and the
command will crash.
To fix this, remove the rerere ID from the MERGE_RR file in the case
when we can't handle it, just after the 'preimage' file was removed
and remove the corresponding variant from .git/rr-cache/. Removing it
unconditionally is fine here, because if the user would have resolved
the conflict and ran rerere, the entry would no longer be in the
MERGE_RR file, so we wouldn't have this problem in the first place,
while if the conflict was not resolved.
Currently there is nothing left in this folder, as the 'preimage'
was already deleted by the 'handle_file' function, so 'remove_variant'
is a no-op. Still call the function, to make sure we clean everything
up, in case we add some other files corresponding to a variant in the
future.
Note that other variants that have the same conflict ID will not be
touched.
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-05 17:20:32 +00:00
|
|
|
echo "bar" >test &&
|
|
|
|
git add test &&
|
|
|
|
git commit -q -m two &&
|
|
|
|
|
|
|
|
git reset --hard &&
|
2020-11-18 23:44:27 +00:00
|
|
|
git checkout -b branch-2 main &&
|
rerere: fix crash with files rerere can't handle
Currently when a user does a conflict resolution and ends it (in any
way that calls 'git rerere' again) with a file 'rerere' can't handle,
subsequent rerere operations that are interested in that path, such as
'rerere clear' or 'rerere forget <path>' will fail, or even worse in
the case of 'rerere clear' segfault.
Such states include nested conflicts, or a conflict marker that
doesn't have any match.
This is because 'git rerere' calculates a conflict file and writes it
to the MERGE_RR file. When the user then changes the file in any way
rerere can't handle, and then calls 'git rerere' on it again to record
the conflict resolution, the handle_file function fails, and removes
the 'preimage' file in the rr-cache in the process, while leaving the
ID in the MERGE_RR file.
Now when 'rerere clear' is run, it reads the ID from the MERGE_RR
file, however the 'fit_variant' function for the ID is never called as
the 'preimage' file does not exist anymore. This means
'collection->status' in 'has_rerere_resolution' is NULL, and the
command will crash.
To fix this, remove the rerere ID from the MERGE_RR file in the case
when we can't handle it, just after the 'preimage' file was removed
and remove the corresponding variant from .git/rr-cache/. Removing it
unconditionally is fine here, because if the user would have resolved
the conflict and ran rerere, the entry would no longer be in the
MERGE_RR file, so we wouldn't have this problem in the first place,
while if the conflict was not resolved.
Currently there is nothing left in this folder, as the 'preimage'
was already deleted by the 'handle_file' function, so 'remove_variant'
is a no-op. Still call the function, to make sure we clean everything
up, in case we add some other files corresponding to a variant in the
future.
Note that other variants that have the same conflict ID will not be
touched.
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-05 17:20:32 +00:00
|
|
|
echo "foo" >test &&
|
|
|
|
git add test &&
|
|
|
|
git commit -q -a -m one &&
|
|
|
|
|
|
|
|
test_must_fail git merge branch-1 &&
|
|
|
|
echo "<<<<<<< a" >test &&
|
|
|
|
git rerere &&
|
|
|
|
|
|
|
|
git rerere clear
|
|
|
|
'
|
|
|
|
|
2018-08-05 17:20:36 +00:00
|
|
|
test_expect_success 'rerere with inner conflict markers' '
|
|
|
|
git reset --hard &&
|
|
|
|
|
2020-11-18 23:44:27 +00:00
|
|
|
git checkout -b A main &&
|
2018-08-05 17:20:36 +00:00
|
|
|
echo "bar" >test &&
|
|
|
|
git add test &&
|
|
|
|
git commit -q -m two &&
|
|
|
|
echo "baz" >test &&
|
|
|
|
git add test &&
|
|
|
|
git commit -q -m three &&
|
|
|
|
|
|
|
|
git reset --hard &&
|
2020-11-18 23:44:27 +00:00
|
|
|
git checkout -b B main &&
|
2018-08-05 17:20:36 +00:00
|
|
|
echo "foo" >test &&
|
|
|
|
git add test &&
|
|
|
|
git commit -q -a -m one &&
|
|
|
|
|
|
|
|
test_must_fail git merge A~ &&
|
|
|
|
git add test &&
|
|
|
|
git commit -q -m "will solve conflicts later" &&
|
|
|
|
test_must_fail git merge A &&
|
|
|
|
|
|
|
|
echo "resolved" >test &&
|
|
|
|
git add test &&
|
|
|
|
git commit -q -m "solved conflict" &&
|
|
|
|
|
|
|
|
echo "resolved" >expect &&
|
|
|
|
|
|
|
|
git reset --hard HEAD~~ &&
|
|
|
|
test_must_fail git merge A~ &&
|
|
|
|
git add test &&
|
|
|
|
git commit -q -m "will solve conflicts later" &&
|
|
|
|
test_must_fail git merge A &&
|
|
|
|
cat test >actual &&
|
rerere: recalculate conflict ID when unresolved conflict is committed
Currently when a user doesn't resolve a conflict, commits the results,
and does an operation which creates another conflict, rerere will use
the ID of the previously unresolved conflict for the new conflict.
This is because the conflict is kept in the MERGE_RR file, which
'rerere' reads every time it is invoked.
After the new conflict is solved, rerere will record the resolution
with the ID of the old conflict. So in order to replay the conflict,
both merges would have to be re-done, instead of just the last one, in
order for rerere to be able to automatically resolve the conflict.
Instead of that, assign a new conflict ID if there are still conflicts
in a file and the file had conflicts at a previous step. This ID
matches the conflict we actually resolved at the corresponding step.
Note that there are no backwards compatibility worries here, as rerere
would have failed to even normalize the conflict before this patch
series.
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-05 17:20:37 +00:00
|
|
|
test_cmp expect actual &&
|
|
|
|
|
|
|
|
git add test &&
|
|
|
|
git commit -m "rerere solved conflict" &&
|
|
|
|
git reset --hard HEAD~ &&
|
|
|
|
test_must_fail git merge A &&
|
|
|
|
cat test >actual &&
|
2018-08-05 17:20:36 +00:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2018-09-11 18:55:45 +00:00
|
|
|
test_expect_success 'setup simple stage 1 handling' '
|
|
|
|
test_create_repo stage_1_handling &&
|
|
|
|
(
|
|
|
|
cd stage_1_handling &&
|
|
|
|
|
|
|
|
test_seq 1 10 >original &&
|
|
|
|
git add original &&
|
|
|
|
git commit -m original &&
|
|
|
|
|
2020-11-18 23:44:27 +00:00
|
|
|
git checkout -b A main &&
|
2018-09-11 18:55:45 +00:00
|
|
|
git mv original A &&
|
|
|
|
git commit -m "rename to A" &&
|
|
|
|
|
2020-11-18 23:44:27 +00:00
|
|
|
git checkout -b B main &&
|
2018-09-11 18:55:45 +00:00
|
|
|
git mv original B &&
|
|
|
|
git commit -m "rename to B"
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2018-09-11 18:55:46 +00:00
|
|
|
test_expect_success 'test simple stage 1 handling' '
|
2018-09-11 18:55:45 +00:00
|
|
|
(
|
|
|
|
cd stage_1_handling &&
|
|
|
|
|
|
|
|
git config rerere.enabled true &&
|
|
|
|
git checkout A^0 &&
|
|
|
|
test_must_fail git merge B^0
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2024-04-16 10:52:48 +00:00
|
|
|
test_expect_success 'rerere does not crash with missing preimage' '
|
|
|
|
git config rerere.enabled true &&
|
|
|
|
|
|
|
|
echo bar >test &&
|
|
|
|
git add test &&
|
|
|
|
git commit -m "one" &&
|
|
|
|
git branch rerere_no_crash &&
|
|
|
|
|
|
|
|
echo foo >>test &&
|
|
|
|
git add test &&
|
|
|
|
git commit -m "two" &&
|
|
|
|
|
|
|
|
git checkout rerere_no_crash &&
|
|
|
|
echo "bar" >>test &&
|
|
|
|
git add test &&
|
|
|
|
git commit -m "three" &&
|
|
|
|
|
|
|
|
test_must_fail git rebase main &&
|
|
|
|
rm .git/rr-cache/*/preimage &&
|
|
|
|
git rebase --abort
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rerere does not crash with unmatched conflict marker' '
|
|
|
|
git config rerere.enabled true &&
|
|
|
|
|
|
|
|
echo bar >test &&
|
|
|
|
git add test &&
|
|
|
|
git commit -m "one" &&
|
|
|
|
git branch rerere_no_preimage &&
|
|
|
|
|
|
|
|
cat >test <<-EOF &&
|
|
|
|
test
|
|
|
|
bar
|
|
|
|
foobar
|
|
|
|
EOF
|
|
|
|
git add test &&
|
|
|
|
git commit -m "two" &&
|
|
|
|
|
|
|
|
git checkout rerere_no_preimage &&
|
|
|
|
echo "bar" >>test &&
|
|
|
|
git add test &&
|
|
|
|
git commit -m "three" &&
|
|
|
|
|
|
|
|
cat >test <<-EOF &&
|
|
|
|
foobar
|
|
|
|
bar
|
|
|
|
bar
|
|
|
|
EOF
|
|
|
|
git add test &&
|
|
|
|
git commit -m "four" &&
|
|
|
|
|
|
|
|
test_must_fail git rebase main &&
|
|
|
|
cat >test <<-EOF &&
|
|
|
|
test
|
|
|
|
bar
|
|
|
|
<<<<<<< HEAD
|
|
|
|
foobar
|
|
|
|
bar
|
|
|
|
EOF
|
|
|
|
git add test &&
|
|
|
|
test_must_fail git rebase --continue
|
|
|
|
'
|
|
|
|
|
2006-12-21 09:21:28 +00:00
|
|
|
test_done
|