diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-11-13 19:28:00 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-14 15:10:35 +0900 |
commit | 0f086e6dcabfbf059e7483ebd7d41080faec3d77 (patch) | |
tree | 7f59ed7fad94e288c2006c0ff1cbbf4c3932b6d8 /builtin/checkout-index.c | |
parent | Tenth batch for 2.20 (diff) | |
download | tgif-0f086e6dcabfbf059e7483ebd7d41080faec3d77.tar.xz |
checkout: print something when checking out paths
One of the problems with "git checkout" is that it does so many
different things and could confuse people specially when we fail to
handle ambiguation correctly.
One way to help with that is tell the user what sort of operation is
actually carried out. When switching branches, we always print
something unless --quiet, either
- "HEAD is now at ..."
- "Reset branch ..."
- "Already on ..."
- "Switched to and reset ..."
- "Switched to a new branch ..."
- "Switched to branch ..."
Checking out paths however is silent. Print something so that if we
got the user intention wrong, they won't waste too much time to find
that out. For the remaining cases of checkout we now print either
- "Checked out ... paths out of the index"
- "Checked out ... paths out of <abbrev hash>"
Since the purpose of printing this is to help disambiguate. Only do it
when "--" is missing.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout-index.c')
-rw-r--r-- | builtin/checkout-index.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c index 88b86c8d9f..bada491f58 100644 --- a/builtin/checkout-index.c +++ b/builtin/checkout-index.c @@ -67,7 +67,8 @@ static int checkout_file(const char *name, const char *prefix) continue; did_checkout = 1; if (checkout_entry(ce, &state, - to_tempfile ? topath[ce_stage(ce)] : NULL) < 0) + to_tempfile ? topath[ce_stage(ce)] : NULL, + NULL) < 0) errs++; } @@ -111,7 +112,8 @@ static void checkout_all(const char *prefix, int prefix_length) write_tempfile_record(last_ce->name, prefix); } if (checkout_entry(ce, &state, - to_tempfile ? topath[ce_stage(ce)] : NULL) < 0) + to_tempfile ? topath[ce_stage(ce)] : NULL, + NULL) < 0) errs++; last_ce = ce; } |