Fix upstream.sh presubmit test for git 1.8.3+

Fix upstream.sh presubmit test for git 1.8.3+

Previously this relied on being able to track branches which didn't have a
remote refspec. Now we add a fake origin for the git-svn test repo, and use
--prefix so that git has a remote to track and the refs are correctly
namespaced.

Should also be backwards compatible with older versions of git.

R=maruel@chromium.org
BUG=

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=233649

[M-A Ruel, 2013-11-07 12:11:27]

lgtm
Le 7 nov. 2013 04:32, <iannucci@chromium.org> a écrit :

> Reviewers: M-A Ruel,
>
> Description:
> Fix upstream.sh presubmit test for git 1.8.3+
>
> Previously this relied on being able to track branches which didn't have a
> remote refspec. Now we add a fake origin for the git-svn test repo, and use
> --prefix so that git has a remote to track and the refs are correctly
> namespaced.
>
> Should also be backwards compatible with older versions of git.
>
> R=maruel@chromium.org
> BUG=
>
> Please review this at https://codereview.chromium.org/61893006/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
>
> Affected files (+3, -2 lines):
>   M tests/test-lib.sh
>   M tests/upstream.sh
>
>
> Index: tests/test-lib.sh
> diff --git a/tests/test-lib.sh b/tests/test-lib.sh
> index ad078180437b8b16700bd79fb66abab331ebc412..
> 92ec3bbdd4c1457564d83c00d720b3743fc9ea94 100755
> --- a/tests/test-lib.sh
> +++ b/tests/test-lib.sh
> @@ -49,9 +49,10 @@ setup_gitsvn() {
>    rm -rf git-svn
>    # There appears to be no way to make git-svn completely shut up, so we
>    # redirect its output.
> -  git svn -q clone -s $REPO_URL git-svn >/dev/null 2>&1
> +  git svn --prefix origin/ -q clone -s $REPO_URL git-svn >/dev/null 2>&1
>    (
>      cd git-svn
> +    git remote add origin https://example.com/fake_refspec
>      git config user.name 'TestDood'
>      git config user.email 'TestDood@example.com'
>    )
> Index: tests/upstream.sh
> diff --git a/tests/upstream.sh b/tests/upstream.sh
> index 0e2ce80b065fc1acd2a2110ae95b012d3160c6f8..
> b264b3e9436fa82227aa96c246f9396479905202 100755
> --- a/tests/upstream.sh
> +++ b/tests/upstream.sh
> @@ -19,7 +19,7 @@ setup_gitsvn
>
>    git config rietveld.server localhost:8080
>
> -  for ref in refs/remotes/trunk refs/remotes/some_branch; do
> +  for ref in refs/remotes/origin/trunk refs/remotes/origin/some_branch;
> do
>      git branch -f --set-upstream feature_branch $ref
>      git checkout -q feature_branch
>      test_expect_success "Guessing upstream branch for $ref" \
>
>
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[commit-bot: I haz the power, 2013-11-07 19:01:33]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/iannucci@chromium.org/61893006/1

[commit-bot: I haz the power, 2013-11-07 19:03:14]

Change committed as 233649