diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-11-09 01:19:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-09 09:34:46 -0800 |
| commit | 45bf473a7bc2c40c8aea3d34a0eab7a41e77a8ff (patch) | |
| tree | 6095f8390834dc1244f86bbdf1313d3a3abc2203 /t/t9105-git-svn-commit-diff.sh | |
| parent | a35a045874379467395e0909958827ad89afc03d (diff) | |
| download | git-45bf473a7bc2c40c8aea3d34a0eab7a41e77a8ff.tar.gz git-45bf473a7bc2c40c8aea3d34a0eab7a41e77a8ff.tar.xz | |
git-svn: fix dcommit losing changes when out-of-date from svn
There was a bug in dcommit (and commit-diff) which caused deltas
to be generated against the latest version of the changed file
in a repository, and not the revision we are diffing (the tree)
against locally.
This bug can cause recent changes to the svn repository to be
silently clobbered by git-svn if our repository is out-of-date.
Thanks to Steven Grimm for noticing the bug.
The (few) people using the commit-diff command are now required
to use the -r/--revision argument. dcommit usage is unchanged.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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 f994b72f8..746c8277d 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 " |