On Wed, Sep 03, 2008 at 09:15:07AM -0400, Jeff King wrote:
> Hrm. I thought we decided on a message like:
>
> Previous HEAD position was 1234abcd
>
> when leaving the detached HEAD state, but it seems to have disappeared.
> Maybe with the move to builtin-checkout (sorry, I don't have time to
> bisect right at this second). Was that intentional?
OK, I lied. I did have time to bisect it.
It never worked in builtin-checkout, and I am a bit suspicious of the
code (and comment) below. Why would we not want to show such a message
if moving to a branch (as long as it is not a _new_ branch)? The patch
below makes more sense to me.
---
diff --git a/builtin-checkout.c b/builtin-checkout.c
index b380ad6..b2c7d3c 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -386,12 +386,12 @@ static int switch_branches(struct checkout_opts *opts, struct branch_info *new)
}
/*
- * If the new thing isn't a branch and isn't HEAD and we're
+ * If the new thing isn't isn't HEAD and we're
* not starting a new branch, and we want messages, and we
* weren't on a branch, and we're moving to a new commit,
* describe the old commit.
*/
- if (!new->path && strcmp(new->name, "HEAD") && !opts->new_branch &&
+ if (strcmp(new->name, "HEAD") && !opts->new_branch &&
!opts->quiet && !old.path && new->commit != old.commit)
describe_detached_head("Previous HEAD position was", old.commit);
--
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
