| commit | 4f4ad3d938beafd785c319664348268bbef11a00 | |
| author | Martin von Zweigbergk <martinvonz@gmail.com> | |
| Tue, 15 Jan 2013 05:47:36 +0000 (14 21:47 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Jan 2013 17:38:07 +0000 (15 09:38 -0800) | ||
| tree | cd7da1f9a0a6e5db72eb1cbfaca122d0cd4c2f76 | treesnapshot (tar.gz zip) |
| parent | 18648e89e78662e3a6a9a38adfca3e6001cfaf85 | commitdiff |
reset: don't allow "git reset -- $pathspec" in bare repo
Running e.g. "git reset ." in a bare repo results in an index file
being created from the HEAD commit. The differences compared to the
index are then printed as usual, but since there is no worktree, it
will appear as if all files are deleted. For example, in a bare clone
of git.git:
Unstaged changes after reset:
D .gitattributes
D .gitignore
D .mailmap
...
This happens because the check for is_bare_repository() happens after
we branch off into read_from_tree() to reset with paths. Fix by moving
the branching point after the check.
Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Running e.g. "git reset ." in a bare repo results in an index file
being created from the HEAD commit. The differences compared to the
index are then printed as usual, but since there is no worktree, it
will appear as if all files are deleted. For example, in a bare clone
of git.git:
Unstaged changes after reset:
D .gitattributes
D .gitignore
D .mailmap
...
This happens because the check for is_bare_repository() happens after
we branch off into read_from_tree() to reset with paths. Fix by moving
the branching point after the check.
Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/reset.c | diffblobblamehistory |