Re: [PATCHv3 1/2] t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
- From
Elijah Newren <newren@gmail.com>
- Date
- Aug 9, 2010, 00:43 UTC
- Message-ID
- <AANLkTikNEF=TaJmgTpuoJ=vKhM+r51m0FzwExcQDL=JG@mail.gmail.com>
- In-Reply-To
- <1281300917-5610-2-git-send-email-newren@gmail.com>
On Sun, Aug 8, 2010 at 2:55 PM, Elijah Newren <newren@gmail.com> wrote:
Show 86 quoted lines
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
> t/t5520-pull.sh | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 63 insertions(+), 0 deletions(-)
>
> diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
> index 319e389..9099e55 100755
> --- a/t/t5520-pull.sh
> +++ b/t/t5520-pull.sh
> @@ -4,6 +4,11 @@ test_description='pulling into void'
>
> . ./test-lib.sh
>
> +modify () {
> + sed -e "$1" < "$2" > "$2".x &&
> + mv "$2".x "$2"
> +}
> +
> D=`pwd`
>
> test_expect_success setup '
> @@ -160,4 +165,62 @@ test_expect_success 'pull --rebase works on branch yet to be born' '
> test_cmp expect actual
> '
>
> +test_expect_success 'setup for detecting upstreamed changes' '
> + mkdir src &&
> + (cd src &&
> + git init &&
> + for i in $(seq 1 10); do echo $i; done > stuff &&
> + git add stuff &&
> + git commit -m "Initial revision"
> + ) &&
> + git clone src dst &&
> + (cd src &&
> + modify s/5/43/ stuff &&
> + git commit -a -m "5->43" &&
> + modify s/6/42/ stuff &&
> + git commit -a -m "Make it bigger" &&
> + correct=$(git rev-parse HEAD)
> + ) &&
> + (cd dst &&
> + modify s/5/43/ stuff &&
> + git commit -a -m "Independent discovery of 5->43"
> + )
> +'
> +
> +test_expect_failure 'git pull --rebase detects upstreamed changes' '
> + (cd dst &&
> + git pull --rebase &&
> + test -z "$(git ls-files -u)"
> + )
> +'
> +
> +test_expect_success 'setup for avoiding reapplying old patches' '
> + (cd dst &&
> + git rebase --abort;
> + git reset --hard origin/master
> + ) &&
> + git clone --bare src src-replace.git &&
> + rm -rf src &&
> + mv src-replace.git src &&
> + (cd dst &&
> + modify s/2/22/ stuff &&
> + git commit -a -m "Change 2" &&
> + modify s/3/33/ stuff &&
> + git commit -a -m "Change 3" &&
> + modify s/4/44/ stuff &&
> + git commit -a -m "Change 4" &&
> + git push &&
> +
> + modify s/44/55/ stuff &&
> + git commit --amend -a -m "Modified Change 4"
> + )
> +'
> +
> +test_expect_failure 'git pull --rebase does not reapply old patches' '
> + (cd dst &&
> + git pull --rebase;
> + test 1 = $(find .git/rebase-apply -name "000*" | wc -l)
> + )
> +'
> +
> test_done
> --Interdiff addressing Hannes' comments (given on previous series):
diff -u b/t/t5520-pull.sh b/t/t5520-pull.sh --- b/t/t5520-pull.sh
+++ b/t/t5520-pull.sh @@ -169,7 +169,7 @@ mkdir src && (cd src && git init && - for i in $(seq 1 10); do echo $i; done > stuff && + printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" > stuff && git add stuff && git commit -m "Initial revision" ) && @@ -178,8 +178,7 @@ modify s/5/43/ stuff && git commit -a -m "5->43" && modify s/6/42/ stuff && - git commit -a -m "Make it bigger" && - correct=$(git rev-parse HEAD) + git commit -a -m "Make it bigger" ) && (cd dst && modify s/5/43/ stuff && @@ -196,7 +195,7 @@ test_expect_success 'setup for avoiding reapplying old patches' ' (cd dst && - git rebase --abort; + test_might_fail git rebase --abort && git reset --hard origin/master ) && git clone --bare src src-replace.git && @@ -218,7 +217,7 @@ test_expect_failure 'git pull --rebase does not reapply old patches' ' (cd dst && - git pull --rebase; + test_must_fail git pull --rebase && test 1 = $(find .git/rebase-apply -name "000*" | wc -l) ) '