[PATCH 3/3] git-svn: preserve uncommitted changes after dcommit

From: Eric Wong <normalperson@yhbt.net>
Date: Nov 23, 2006, 22:54 UTC
Message-ID: <11643224483832-git-send-email-normalperson@yhbt.net>
In-Reply-To: <1164322445180-git-send-email-normalperson@yhbt.net>

Using dcommit could cause the user to lose uncommitted changes during the reset --hard operation, so change it to reset --mixed.

If dcommit chooses the rebase path, then git-rebase will already error out when local changes are made.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---
 git-svn.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-svn.perl b/git-svn.perl
index 6feae56..bb8935a 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -623,7 +623,7 @@ sub dcommit {
 	} else {
 		print "No changes between current HEAD and $gs\n",
 		      "Hard resetting to the latest $gs\n";
-		@finish = qw/reset --hard/;
+		@finish = qw/reset --mixed/;
 	}
 	sys('git', @finish, $gs);
 }

-- 
1.4.4.1.g22a08