2006-11-09 09:19:37 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2006 Eric Wong
|
2008-09-08 10:02:08 +00:00
|
|
|
test_description='git svn commit-diff clobber'
|
revisions API: have release_revisions() release "cmdline"
Extend the the release_revisions() function so that it frees the
"cmdline" in the "struct rev_info". This in combination with a
preceding change to free "commits" and "mailmap" means that we can
whitelist another test under "TEST_PASSES_SANITIZE_LEAK=true".
There was a proposal in [1] to do away with xstrdup()-ing this
add_rev_cmdline(), perhaps that would be worthwhile, but for now let's
just free() it.
We could also make that a "char *" in "struct rev_cmdline_entry"
itself, but since we own it let's expose it as a constant to outside
callers. I proposed that in [2] but have since changed my mind. See
14d30cdfc04 (ref-filter: fix memory leak in `free_array_item()`,
2019-07-10), c514c62a4fd (checkout: fix leak of non-existent branch
names, 2020-08-14) and other log history hits for "free((char *)" for
prior art.
This includes the tests we had false-positive passes on before my
6798b08e848 (perl Git.pm: don't ignore signalled failure in
_cmd_close(), 2022-02-01), now they pass for real.
Since there are 66 tests matching t/t[0-9]*git-svn*.sh it's easier to
list those that don't pass than to touch most of those 66. So let's
introduce a "TEST_FAILS_SANITIZE_LEAK=true", which if set in the tests
won't cause lib-git-svn.sh to set "TEST_PASSES_SANITIZE_LEAK=true.
This change also marks all the tests that we removed
"TEST_FAILS_SANITIZE_LEAK=true" from in an earlier commit due to
removing the UNLEAK() from cmd_format_patch(), we can now assert that
its API use doesn't leak any "struct rev_info" memory.
This change also made commit "t5503-tagfollow.sh" pass on current
master, but that would regress when combined with
ps/fetch-atomic-fixup's de004e848a9 (t5503: simplify setup of test
which exercises failure of backfill, 2022-03-03) (through no fault of
that topic, that change started using "git clone" in the test, which
has an outstanding leak). Let's leave that test out for now to avoid
in-flight semantic conflicts.
1. https://lore.kernel.org/git/YUj%2FgFRh6pwrZalY@carlos-mbp.lan/
2. https://lore.kernel.org/git/87o88obkb1.fsf@evledraar.gmail.com/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13 20:01:47 +00:00
|
|
|
|
2006-11-09 09:19:37 +00:00
|
|
|
. ./lib-git-svn.sh
|
|
|
|
|
2008-05-04 05:37:59 +00:00
|
|
|
test_expect_success 'initialize repo' '
|
2006-11-09 09:19:37 +00:00
|
|
|
mkdir import &&
|
2010-09-07 01:42:54 +00:00
|
|
|
(
|
|
|
|
cd import &&
|
|
|
|
echo initial >file &&
|
|
|
|
svn_cmd import -m "initial" . "$svnrepo"
|
2010-09-06 18:39:54 +00:00
|
|
|
) &&
|
2006-11-09 09:19:37 +00:00
|
|
|
echo initial > file &&
|
|
|
|
git update-index --add file &&
|
2008-05-04 05:37:59 +00:00
|
|
|
git commit -a -m "initial"
|
|
|
|
'
|
|
|
|
test_expect_success 'commit change from svn side' '
|
2009-05-08 08:06:16 +00:00
|
|
|
svn_cmd co "$svnrepo" t.svn &&
|
2010-09-07 01:42:54 +00:00
|
|
|
(
|
|
|
|
cd t.svn &&
|
|
|
|
echo second line from svn >>file &&
|
|
|
|
poke file &&
|
|
|
|
svn_cmd commit -m "second line from svn"
|
2010-09-06 18:39:54 +00:00
|
|
|
) &&
|
2006-11-09 09:19:37 +00:00
|
|
|
rm -rf t.svn
|
2008-05-04 05:37:59 +00:00
|
|
|
'
|
2006-11-09 09:19:37 +00:00
|
|
|
|
2008-05-04 05:37:59 +00:00
|
|
|
test_expect_success 'commit conflicting change from git' '
|
2006-11-09 09:19:37 +00:00
|
|
|
echo second line from git >> file &&
|
2008-05-04 05:37:59 +00:00
|
|
|
git commit -a -m "second line from git" &&
|
2008-09-08 10:02:08 +00:00
|
|
|
test_must_fail git svn commit-diff -r1 HEAD~1 HEAD "$svnrepo"
|
2008-05-04 05:37:59 +00:00
|
|
|
'
|
2006-11-09 09:19:37 +00:00
|
|
|
|
2008-05-04 05:37:59 +00:00
|
|
|
test_expect_success 'commit complementing change from git' '
|
2006-11-09 09:19:37 +00:00
|
|
|
git reset --hard HEAD~1 &&
|
|
|
|
echo second line from svn >> file &&
|
2008-05-04 05:37:59 +00:00
|
|
|
git commit -a -m "second line from svn" &&
|
2006-11-09 09:19:37 +00:00
|
|
|
echo third line from git >> file &&
|
2008-05-04 05:37:59 +00:00
|
|
|
git commit -a -m "third line from git" &&
|
2008-09-08 10:02:08 +00:00
|
|
|
git svn commit-diff -r2 HEAD~1 HEAD "$svnrepo"
|
2008-05-04 05:37:59 +00:00
|
|
|
'
|
2006-11-09 09:19:37 +00:00
|
|
|
|
2008-05-04 05:37:59 +00:00
|
|
|
test_expect_success 'dcommit fails to commit because of conflict' '
|
2008-09-08 10:02:08 +00:00
|
|
|
git svn init "$svnrepo" &&
|
|
|
|
git svn fetch &&
|
2016-05-13 20:47:14 +00:00
|
|
|
git reset --hard refs/remotes/git-svn &&
|
2009-05-08 08:06:16 +00:00
|
|
|
svn_cmd co "$svnrepo" t.svn &&
|
2010-09-07 01:42:54 +00:00
|
|
|
(
|
|
|
|
cd t.svn &&
|
|
|
|
echo fourth line from svn >>file &&
|
|
|
|
poke file &&
|
|
|
|
svn_cmd commit -m "fourth line from svn"
|
2010-09-06 18:39:54 +00:00
|
|
|
) &&
|
2006-11-09 09:19:37 +00:00
|
|
|
rm -rf t.svn &&
|
2008-05-04 05:37:59 +00:00
|
|
|
echo "fourth line from git" >> file &&
|
|
|
|
git commit -a -m "fourth line from git" &&
|
2008-09-08 10:02:08 +00:00
|
|
|
test_must_fail git svn dcommit
|
2008-05-04 05:37:59 +00:00
|
|
|
'
|
2006-11-09 09:19:37 +00:00
|
|
|
|
|
|
|
test_expect_success 'dcommit does the svn equivalent of an index merge' "
|
2016-05-13 20:47:14 +00:00
|
|
|
git reset --hard refs/remotes/git-svn &&
|
2006-11-09 09:19:37 +00:00
|
|
|
echo 'index merge' > file2 &&
|
|
|
|
git update-index --add file2 &&
|
|
|
|
git commit -a -m 'index merge' &&
|
|
|
|
echo 'more changes' >> file2 &&
|
|
|
|
git update-index file2 &&
|
|
|
|
git commit -a -m 'more changes' &&
|
2008-09-08 10:02:08 +00:00
|
|
|
git svn dcommit
|
2006-11-09 09:19:37 +00:00
|
|
|
"
|
|
|
|
|
2008-05-04 05:37:59 +00:00
|
|
|
test_expect_success 'commit another change from svn side' '
|
2009-05-08 08:06:16 +00:00
|
|
|
svn_cmd co "$svnrepo" t.svn &&
|
2010-09-07 01:42:54 +00:00
|
|
|
(
|
|
|
|
cd t.svn &&
|
|
|
|
echo third line from svn >>file &&
|
2007-09-01 01:16:12 +00:00
|
|
|
poke file &&
|
2010-09-06 18:39:54 +00:00
|
|
|
svn_cmd commit -m "third line from svn"
|
|
|
|
) &&
|
2007-09-01 01:16:12 +00:00
|
|
|
rm -rf t.svn
|
2008-05-04 05:37:59 +00:00
|
|
|
'
|
2007-09-01 01:16:12 +00:00
|
|
|
|
2008-09-08 10:02:08 +00:00
|
|
|
test_expect_success 'multiple dcommit from git svn will not clobber svn' "
|
2016-05-13 20:47:14 +00:00
|
|
|
git reset --hard refs/remotes/git-svn &&
|
2007-09-01 01:16:12 +00:00
|
|
|
echo new file >> new-file &&
|
|
|
|
git update-index --add new-file &&
|
|
|
|
git commit -a -m 'new file' &&
|
|
|
|
echo clobber > file &&
|
|
|
|
git commit -a -m 'clobber' &&
|
2008-07-12 15:47:52 +00:00
|
|
|
test_must_fail git svn dcommit
|
2008-02-01 09:50:53 +00:00
|
|
|
"
|
2007-09-01 01:16:12 +00:00
|
|
|
|
|
|
|
|
2008-07-21 10:51:02 +00:00
|
|
|
test_expect_success 'check that rebase really failed' '
|
2020-02-15 21:36:40 +00:00
|
|
|
git status >output &&
|
|
|
|
grep currently.rebasing output
|
2008-07-21 10:51:02 +00:00
|
|
|
'
|
2007-09-01 01:16:12 +00:00
|
|
|
|
|
|
|
test_expect_success 'resolve, continue the rebase and dcommit' "
|
|
|
|
echo clobber and I really mean it > file &&
|
|
|
|
git update-index file &&
|
|
|
|
git rebase --continue &&
|
|
|
|
git svn dcommit
|
|
|
|
"
|
|
|
|
|
2006-11-09 09:19:37 +00:00
|
|
|
test_done
|