mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-12-13 11:54:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nd/reset-setup-worktree' into maint

Browse Source 
"git reset" needs to refresh the index when working in a working
tree (it can also be used to match the index to the HEAD in an
otherwise bare repository), but it failed to set up the working
tree properly, causing GIT_WORK_TREE to be ignored.

* nd/reset-setup-worktree:
  reset: optionally setup worktree and refresh index on --mixed
This commit is contained in:
Junio C Hamano 2014-03-18 14:03:24 -07:00
commit 1f56977581
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/reset.c
View File

@ -320,7 +320,7 @@ 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 != SOFT && reset_type != MIXED) if (reset_type != SOFT && (reset_type != MIXED || get_git_work_tree()))
setup_work_tree(); setup_work_tree();
if (reset_type == MIXED && is_bare_repository()) if (reset_type == MIXED && is_bare_repository())
@ -340,8 +340,9 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
int flags = quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN; int flags = quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN;
if (read_from_tree(&pathspec, sha1)) if (read_from_tree(&pathspec, sha1))
return 1; return 1;
refresh_index(&the_index, flags, NULL, NULL, if (get_git_work_tree())
_("Unstaged changes after reset:")); refresh_index(&the_index, flags, NULL, NULL,
_("Unstaged changes after reset:"));
} else { } else {
int err = reset_index(sha1, reset_type, quiet); int err = reset_index(sha1, reset_type, quiet);
if (reset_type == KEEP && !err) if (reset_type == KEEP && !err)

11
t/t7102-reset.sh
View File

@ -535,4 +535,15 @@ test_expect_success 'reset with paths accepts tree' '
git diff HEAD --exit-code git diff HEAD --exit-code
' '
test_expect_success 'reset --mixed sets up work tree' '
git init mixed_worktree &&
(
cd mixed_worktree &&
test_commit dummy
) &&
: >expect &&
git --git-dir=mixed_worktree/.git --work-tree=mixed_worktree reset >actual &&
test_cmp expect actual
'
test_done test_done