git-svn: preserve uncommitted changes after dcommit

Eric Wong · Junio C Hamano · commit 4769489a412f · 2006-11-23T15:17:46.000-08:00
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 &lt;normalperson@yhbt.net&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git 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);
 }

Original file line number	Diff line number	Diff line change
`@@ -623,7 +623,7 @@ sub dcommit {`
`623`	`623`	`} else {`
`624`	`624`	`print "No changes between current HEAD and $gs\n",`
`625`	`625`	`"Hard resetting to the latest $gs\n";`
`626`		`- @finish = qw/reset --hard/;`
	`626`	`+ @finish = qw/reset --mixed/;`
`627`	`627`	`}`
`628`	`628`	`sys('git', @finish, $gs);`
`629`	`629`	`}`