It indeed reveals a problem in "push": appended lines are appended again, as the already-applied patch is not detected. Signed-off-by: Yann Dirson <ydirson@xxxxxxxxxx> --- t/t1201-pull-trailing.sh | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/t/t1201-pull-trailing.sh b/t/t1201-pull-trailing.sh new file mode 100755 index 0000000..142f894 --- /dev/null +++ b/t/t1201-pull-trailing.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# +# Copyright (c) 2006 Yann Dirson +# + +test_description='test + +' + +. ./test-lib.sh + +# don't need this repo, but better not drop it, see t1100 +#rm -rf .git + +# Need a repo to clone +test_create_repo foo + +test_expect_success \ + 'Setup and clone tree, and setup changes' \ + "(cd foo && + printf 'a\nb\n' > file && git add file && git commit -m . + ) && + stg clone foo bar && + (cd bar && stg new p1 -m p1 + printf 'c\n' >> file && stg refresh + ) +" + +test_expect_success \ + 'Port those patches to orig tree' \ + "(cd foo && + GIT_DIR=../bar/.git git-format-patch --stdout bases/master..HEAD | + git-am -3 -k + ) +" + +test_expect_success \ + 'Pull those patches applied upstream' \ + "(cd bar && stg pull + ) +" + +test_expect_success \ + 'Check that all went well' \ + "diff -u foo/file bar/file +" + +test_done - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html