kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

* jk/maint-1.6.5-reset-hard:
  reset: unbreak hard resets with GIT_WORK_TREE
maint
Junio C Hamano 2010-01-10 08:52:53 -08:00
parent 84d52cabe7 cd0f0f68e1
commit 0b4ae29f03
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-reset.c
View File

@ -285,10 +285,8 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
if (reset_type == NONE) if (reset_type == NONE)
reset_type = MIXED; /* by default */ reset_type = MIXED; /* by default */


if ((reset_type == HARD || reset_type == MERGE) if (reset_type == HARD || reset_type == MERGE)
&& !is_inside_work_tree()) setup_work_tree();
die("%s reset requires a work tree",
reset_type_names[reset_type]);


/* Soft reset does not touch the index file nor the working 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 * at all, but requires them in a good order. Other resets reset

6
t/t7103-reset-bare.sh
View File

@ -29,6 +29,12 @@ test_expect_success 'soft reset is ok' '
(cd .git && git reset --soft) (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' ' test_expect_success 'setup bare' '
git clone --bare . bare.git && git clone --bare . bare.git &&
cd bare.git cd bare.git