diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/checkout.c | 16 | ||||
| -rw-r--r-- | builtin/clone.c | 5 |
2 files changed, 5 insertions, 16 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index f1984d9..5bf96ba 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -514,20 +514,6 @@ static void report_tracking(struct branch_info *new) strbuf_release(&sb); } -static void detach_advice(const char *old_path, const char *new_name) -{ - const char fmt[] = - "Note: checking out '%s'.\n\n" - "You are in 'detached HEAD' state. You can look around, make experimental\n" - "changes and commit them, and you can discard any commits you make in this\n" - "state without impacting any branches by performing another checkout.\n\n" - "If you want to create a new branch to retain commits you create, you may\n" - "do so (now or later) by using -b with the checkout command again. Example:\n\n" - " git checkout -b new_branch_name\n\n"; - - fprintf(stderr, fmt, new_name); -} - static void update_refs_for_switch(struct checkout_opts *opts, struct branch_info *old, struct branch_info *new) @@ -575,7 +561,7 @@ static void update_refs_for_switch(struct checkout_opts *opts, REF_NODEREF, DIE_ON_ERR); if (!opts->quiet) { if (old->path && advice_detached_head) - detach_advice(old->path, new->name); + detach_advice(new->name); describe_detached_head(_("HEAD is now at"), new->commit); } } else if (new->path) { /* Switch branches. */ diff --git a/builtin/clone.c b/builtin/clone.c index 651b4cc..72eebca 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -563,7 +563,10 @@ static int checkout(void) "unable to checkout.\n")); return 0; } - if (strcmp(head, "HEAD")) { + if (!strcmp(head, "HEAD")) { + if (advice_detached_head) + detach_advice(sha1_to_hex(sha1)); + } else { if (prefixcmp(head, "refs/heads/")) die(_("HEAD not found below refs/heads!")); } |