path: root/apply.c
diff options
authorNguyễn Thái Ngọc Duy <>2018-11-13 18:28:00 (GMT)
committerJunio C Hamano <>2018-11-14 06:10:35 (GMT)
commit0f086e6dcabfbf059e7483ebd7d41080faec3d77 (patch)
tree7f59ed7fad94e288c2006c0ff1cbbf4c3932b6d8 /apply.c
parentd166e6afe5f257217836ef24a73764eba390c58d (diff)
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'apply.c')
1 files changed, 2 insertions, 1 deletions
diff --git a/apply.c b/apply.c
index 073d5f0..5876b02 100644
--- a/apply.c
+++ b/apply.c
@@ -3352,7 +3352,8 @@ static int checkout_target(struct index_state *istate,
costate.refresh_cache = 1;
costate.istate = istate;
- if (checkout_entry(ce, &costate, NULL) || lstat(ce->name, st))
+ if (checkout_entry(ce, &costate, NULL, NULL) ||
+ lstat(ce->name, st))
return error(_("cannot checkout %s"), ce->name);
return 0;