Steven Walter <stevenrwal...@gmail.com> wrote:
> This fixes a bug where git finds the incorrect merge parent. Consider a
> repository with trunk, branch1 of trunk, and branch2 of branch1.
> Without this change, git interprets a merge of branch2 into trunk as a
> merge of branch1 into trunk.
Sam: your eyes would be much appreciated for this series, thanks :)
> ---
> git-svn.perl | 1 -
> t/t9164-git-svn-fetch-merge-branch-of-branch2.sh | 53
> ++++++++++++++++++++++
> 2 files changed, 53 insertions(+), 1 deletion(-)
> create mode 100755 t/t9164-git-svn-fetch-merge-branch-of-branch2.sh
>
> diff --git a/git-svn.perl b/git-svn.perl
> index abcec11..c4678c1 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -3623,7 +3623,6 @@ sub parents_exclude {
> if ( $commit eq $excluded ) {
> push @excluded, $commit;
> $found++;
> - last;
> }
> else {
> push @new, $commit;
> diff --git a/t/t9164-git-svn-fetch-merge-branch-of-branch2.sh
> b/t/t9164-git-svn-fetch-merge-branch-of-branch2.sh
> new file mode 100755
> index 0000000..3493de1
> --- /dev/null
> +++ b/t/t9164-git-svn-fetch-merge-branch-of-branch2.sh
> @@ -0,0 +1,53 @@
> +#!/bin/sh
> +#
> +# Copyright (c) 2012 Steven Walter
> +#
> +
> +test_description='git svn merge detection'
> +. ./lib-git-svn.sh
> +
> +svn_ver="$(svn --version --quiet)"
> +case $svn_ver in
> +0.* | 1.[0-4].*)
> + skip_all="skipping git-svn test - SVN too old ($svn_ver)"
> + test_done
> + ;;
> +esac
> +
> +test_expect_success 'initialize source svn repo' '
> + svn_cmd mkdir -m x "$svnrepo"/trunk &&
> + svn_cmd mkdir -m x "$svnrepo"/branches &&
> + svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
> + (
> + cd "$SVN_TREE" &&
> + touch foo &&
> + svn add foo &&
svn_cmd here, too
> + svn commit -m "initial commit" &&
> + svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
> + svn switch "$svnrepo"/branches/branch1 &&
> + touch bar &&
> + svn add bar &&
> + svn commit -m branch1 &&
> + svn cp -m branch "$svnrepo"/branches/branch1
> "$svnrepo"/branches/branch2 &&
> + svn switch "$svnrepo"/branches/branch2 &&
> + touch baz &&
> + svn add baz &&
> + svn commit -m branch2 &&
> + svn switch "$svnrepo"/trunk &&
> + svn merge --reintegrate "$svnrepo"/branches/branch2 &&
> + svn commit -m "merge branch2"
> + ) &&
> + rm -rf "$SVN_TREE"
> +'
> +
> +test_expect_success 'clone svn repo' '
> + git svn init -s "$svnrepo" &&
> + git svn fetch
> +'
> +
> +test_expect_success 'verify merge commit' 'x=$(git rev-parse HEAD^2) &&
> + y=$(git rev-parse branch2) &&
> + test "x$x" = "x$y"
> +'
> +
> +test_done
> --
> 1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
