diff options
author | 2009-12-30 06:54:44 +0100 | |
---|---|---|
committer | 2009-12-30 01:09:43 -0800 | |
commit | 2b06b0a02f8d0aa01c8ff19b72c9292afd7a84fe (patch) | |
tree | 063e6ade320dd09677790b9d12824b5876dec08f /abspath.c | |
parent | Git 1.6.6 (diff) | |
download | tgif-2b06b0a02f8d0aa01c8ff19b72c9292afd7a84fe.tar.xz |
reset: improve mixed reset error message when in a bare repo
When running a "git reset --mixed" in a bare repository, the
message displayed is something like:
fatal: This operation must be run in a work tree
fatal: Could not reset index file to revision 'HEAD^'.
This message is a little bit misleading because a mixed reset is
ok in a git directory, so it is not absolutely needed to run it in
a work tree.
So this patch improves upon the above by changing the message to:
fatal: mixed reset is not allowed in a bare repository
And if "git reset" is ever sped up by using unpack_tree() directly
(instead of execing "git read-tree"), this patch will also make
sure that a mixed reset is still disallowed in a bare repository.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'abspath.c')
0 files changed, 0 insertions, 0 deletions