Merge branch 'jk/maint-1.6.5-reset-hard'

* jk/maint-1.6.5-reset-hard: reset: unbreak hard resets with GIT_WORK_TREE
git-mirror · Jan 10, 2010 · 0b4ae29 · 0b4ae29
2 parents 84d52ca + cd0f0f6
commit 0b4ae29
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/builtin-reset.c b/builtin-reset.c
@@ -285,10 +285,8 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
 	if (reset_type == NONE)
 		reset_type = MIXED; /* by default */
 
-	if ((reset_type == HARD || reset_type == MERGE)
-	    && !is_inside_work_tree())
-		die("%s reset requires a work tree",
-		    reset_type_names[reset_type]);
+	if (reset_type == HARD || reset_type == MERGE)
+		setup_work_tree();
 
 	/* Soft reset does not touch the index file nor the working tree
 	 * at all, but requires them in a good order.  Other resets reset

diff --git a/t/t7103-reset-bare.sh b/t/t7103-reset-bare.sh
@@ -29,6 +29,12 @@ test_expect_success 'soft reset is ok' '
 	(cd .git && git reset --soft)
 '
 
+test_expect_success 'hard reset works with GIT_WORK_TREE' '
+	mkdir worktree &&
+	GIT_WORK_TREE=$PWD/worktree GIT_DIR=$PWD/.git git reset --hard &&
+	test_cmp file worktree/file
+'
+
 test_expect_success 'setup bare' '
 	git clone --bare . bare.git &&
 	cd bare.git