diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-09 15:08:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-09 15:08:19 -0800 |
| commit | 368c2ac249ac2261784e1b9b9bc7c98c5e859052 (patch) | |
| tree | 6576c6616785ebad6d6dc4a296f4baaf691254f8 /t/t9105-git-svn-commit-diff.sh | |
| parent | 18d5453ed36331b3f4123afae6c1c6bb4ef4d0a5 (diff) | |
| parent | a6ec3c1599f990b4f2f3dab2606688639f74d844 (diff) | |
| download | git-368c2ac249ac2261784e1b9b9bc7c98c5e859052.tar.gz | |
Merge branch 'maint'
* maint:
git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
git-svn: fix dcommit losing changes when out-of-date from svn
git-svn: don't die on rebuild when --upgrade is specified
git-svn: avoid printing filenames of files we're not tracking
Diffstat (limited to 't/t9105-git-svn-commit-diff.sh')
| -rwxr-xr-x | t/t9105-git-svn-commit-diff.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9105-git-svn-commit-diff.sh b/t/t9105-git-svn-commit-diff.sh index f994b72f80..746c8277d0 100755 --- a/t/t9105-git-svn-commit-diff.sh +++ b/t/t9105-git-svn-commit-diff.sh @@ -33,7 +33,7 @@ prev=`git rev-parse --verify HEAD^1` test_expect_success 'test the commit-diff command' " test -n '$prev' && test -n '$head' && - git-svn commit-diff '$prev' '$head' '$svnrepo' && + git-svn commit-diff -r1 '$prev' '$head' '$svnrepo' && svn co $svnrepo wc && cmp readme wc/readme " |