Merge branch 'jk/external-diff-use-argv-array'

diff --git a/t/t9116-git-svn-log.sh b/t/t9116-git-svn-log.sh
index cf4c05261b42ddd0711f78951adfc4a49ffdcc1e..45773ee560dab10a6dbec4bf19a82bbdae3fe7c4 100755 (executable)
--- a/t/t9116-git-svn-log.sh
+++ b/t/t9116-git-svn-log.sh
@@ -20,20 +20,20 @@ test_expect_success 'setup repository and import' '
        ) &&
        git svn init "$svnrepo" -T trunk -b branches -t tags &&
        git svn fetch &&
-       git reset --hard trunk &&
+       git reset --hard origin/trunk &&
        echo bye >> README &&
        git commit -a -m bye &&
        git svn dcommit &&
-       git reset --hard a &&
+       git reset --hard origin/a &&
        echo why >> FEEDME &&
        git update-index --add FEEDME &&
        git commit -m feedme &&
        git svn dcommit &&
-       git reset --hard trunk &&
+       git reset --hard origin/trunk &&
        echo aye >> README &&
        git commit -a -m aye &&
        git svn dcommit &&
-       git reset --hard b &&
+       git reset --hard origin/b &&
        echo spy >> README &&
        git commit -a -m spy &&
        echo try >> README &&
@@ -42,26 +42,26 @@ test_expect_success 'setup repository and import' '
        '
 
 test_expect_success 'run log' "
-       git reset --hard a &&
-       git svn log -r2 trunk | grep ^r2 &&
-       git svn log -r4 trunk | grep ^r4 &&
+       git reset --hard origin/a &&
+       git svn log -r2 origin/trunk | grep ^r2 &&
+       git svn log -r4 origin/trunk | grep ^r4 &&
        git svn log -r3 | grep ^r3
        "
 
 test_expect_success 'run log against a from trunk' "
-       git reset --hard trunk &&
-       git svn log -r3 a | grep ^r3
+       git reset --hard origin/trunk &&
+       git svn log -r3 origin/a | grep ^r3
        "
 
 printf 'r1 \nr2 \nr4 \n' > expected-range-r1-r2-r4
 
 test_expect_success 'test ascending revision range' "
-       git reset --hard trunk &&
+       git reset --hard origin/trunk &&
        git svn log -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 -
        "
 
 test_expect_success 'test ascending revision range with --show-commit' "
-       git reset --hard trunk &&
+       git reset --hard origin/trunk &&
        git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 -
        "
 
@@ -69,7 +69,7 @@ test_expect_success 'test ascending revision range with --show-commit (sha1)' "
        git svn find-rev r1 >expected-range-r1-r2-r4-sha1 &&
        git svn find-rev r2 >>expected-range-r1-r2-r4-sha1 &&
        git svn find-rev r4 >>expected-range-r1-r2-r4-sha1 &&
-       git reset --hard trunk &&
+       git reset --hard origin/trunk &&
        git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f2 >out &&
        git rev-parse \$(cat out) >actual &&
        test_cmp expected-range-r1-r2-r4-sha1 actual
@@ -78,67 +78,67 @@ test_expect_success 'test ascending revision range with --show-commit (sha1)' "
 printf 'r4 \nr2 \nr1 \n' > expected-range-r4-r2-r1
 
 test_expect_success 'test descending revision range' "
-       git reset --hard trunk &&
+       git reset --hard origin/trunk &&
        git svn log -r 4:1 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4-r2-r1 -
        "
 
 printf 'r1 \nr2 \n' > expected-range-r1-r2
 
 test_expect_success 'test ascending revision range with unreachable revision' "
-       git reset --hard trunk &&
+       git reset --hard origin/trunk &&
        git svn log -r 1:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2 -
        "
 
 printf 'r2 \nr1 \n' > expected-range-r2-r1
 
 test_expect_success 'test descending revision range with unreachable revision' "
-       git reset --hard trunk &&
+       git reset --hard origin/trunk &&
        git svn log -r 3:1 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2-r1 -
        "
 
 printf 'r2 \n' > expected-range-r2
 
 test_expect_success 'test ascending revision range with unreachable upper boundary revision and 1 commit' "
-       git reset --hard trunk &&
+       git reset --hard origin/trunk &&
        git svn log -r 2:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2 -
        "
 
 test_expect_success 'test descending revision range with unreachable upper boundary revision and 1 commit' "
-       git reset --hard trunk &&
+       git reset --hard origin/trunk &&
        git svn log -r 3:2 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2 -
        "
 
 printf 'r4 \n' > expected-range-r4
 
 test_expect_success 'test ascending revision range with unreachable lower boundary revision and 1 commit' "
-       git reset --hard trunk &&
+       git reset --hard origin/trunk &&
        git svn log -r 3:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
        "
 
 test_expect_success 'test descending revision range with unreachable lower boundary revision and 1 commit' "
-       git reset --hard trunk &&
+       git reset --hard origin/trunk &&
        git svn log -r 4:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
        "
 
 printf -- '------------------------------------------------------------------------\n' > expected-separator
 
 test_expect_success 'test ascending revision range with unreachable boundary revisions and no commits' "
-       git reset --hard trunk &&
+       git reset --hard origin/trunk &&
        git svn log -r 5:6 | test_cmp expected-separator -
        "
 
 test_expect_success 'test descending revision range with unreachable boundary revisions and no commits' "
-       git reset --hard trunk &&
+       git reset --hard origin/trunk &&
        git svn log -r 6:5 | test_cmp expected-separator -
        "
 
 test_expect_success 'test ascending revision range with unreachable boundary revisions and 1 commit' "
-       git reset --hard trunk &&
+       git reset --hard origin/trunk &&
        git svn log -r 3:5 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
        "
 
 test_expect_success 'test descending revision range with unreachable boundary revisions and 1 commit' "
-       git reset --hard trunk &&
+       git reset --hard origin/trunk &&
        git svn log -r 5:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 -
        "