From: Eric Wong <normalperson@yhbt.net>
Date: Thu, 23 Nov 2006 22:54:05 +0000 (-0800)
Subject: git-svn: preserve uncommitted changes after dcommit
X-Git-Tag: v1.4.4.2~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4769489a412fb0decbd73ce59a6756985d0d6bc4;p=git.git

git-svn: preserve uncommitted changes after dcommit

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>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-svn.perl b/git-svn.perl
index 6feae56c0..bb8935afe 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);
 }