On Mon, Dec 31, 2007 at 02:13:52AM -0500, Jeff King wrote:
> git-reset: refuse to do hard reset in a bare repository
>
> It makes no sense since there is no working tree. A soft
> reset should be fine, though.
And then on top of this (plus one-liner fix I posted), as Ping Yin
suggested, we can do:
-- >8 --
git-reset: default to --soft in a bare repo
--mixed doesn't make sense, since we don't generally have an
index.
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
This is a bit more contentious. There's no reason you can't have an
index in a bare repo, and this is changing the behavior of those who do.
They can always explicitly specify --mixed (since we haven't disallowed
that), but it might break some scripts.
builtin-reset.c | 2 +-
t/t7103-reset-bare.sh | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/builtin-reset.c b/builtin-reset.c
index 10dba60..44e4eb4 100644
--- a/builtin-reset.c
+++ b/builtin-reset.c
@@ -242,7 +242,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
return read_from_tree(prefix, argv + i, sha1);
}
if (reset_type == NONE)
- reset_type = MIXED; /* by default */
+ reset_type = is_bare_repository() ? SOFT : MIXED;
if (reset_type == HARD && is_bare_repository())
die("hard reset makes no sense in a bare repository");
diff --git a/t/t7103-reset-bare.sh b/t/t7103-reset-bare.sh
index b25a77f..c2cdba4 100755
--- a/t/t7103-reset-bare.sh
+++ b/t/t7103-reset-bare.sh
@@ -7,8 +7,10 @@ test_expect_success 'setup non-bare' '
echo one >file &&
git add file &&
git commit -m one &&
+ git tag one &&
echo two >file &&
- git commit -a -m two
+ git commit -a -m two &&
+ git tag two
'
test_expect_success 'setup bare' '
@@ -25,4 +27,9 @@ test_expect_success 'soft reset is allowed' '
test "`git show --pretty=format:%s | head -n 1`" = "one"
'
+test_expect_success 'default to soft reset' '
+ git reset two &&
+ test "`git show --pretty=format:%s | head -n 1`" = "two"
+'
+
test_done
--
1.5.4.rc2.1102.g4735f-dirty
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
