diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-02-06 05:51:14 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 23:46:07 +0300 |
| commit | 3c5883b3c96e0435cca2e952754d76c4e45f72e4 (patch) | |
| tree | 519f1157b5f3d9c933cd611d5f6a97a3f7145334 /builtin/checkout.c | |
| parent | 774d44cc18fe23e384b14535df00f4ef2995f8dd (diff) | |
checkout: update count-checkouts messages
Commit 0f086e6dca [1] counts the number of files updated by "git
checkout -- <paths>" command and prints it. Later on 536ec1839d [2]
adds the ability to remove files in "git checkout -- <paths>". This is
still an update on worktree and should be reported to the user.
To prepare for such an update since that commit is on track to
'master' now, the messages are rephrased to avoid "checked out" which
does not imply file deletion.
[1] 0f086e6dca (checkout: print something when checking out paths -
2018-11-13)
[2] 536ec1839d (entry: support CE_WT_REMOVE flag in checkout_entry -
2018-12-20)
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.c')
| -rw-r--r-- | builtin/checkout.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 3a0b86ec1c..41aac55223 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -392,15 +392,15 @@ static int checkout_paths(const struct checkout_opts *opts, if (opts->count_checkout_paths) { if (opts->source_tree) - fprintf_ln(stderr, Q_("Checked out %d path out of %s", - "Checked out %d paths out of %s", + fprintf_ln(stderr, Q_("Updated %d path from %s", + "Updated %d paths from %s", nr_checkouts), nr_checkouts, find_unique_abbrev(&opts->source_tree->object.oid, DEFAULT_ABBREV)); else - fprintf_ln(stderr, Q_("Checked out %d path out of the index", - "Checked out %d paths out of the index", + fprintf_ln(stderr, Q_("Updated %d path from the index", + "Updated %d paths from the index", nr_checkouts), nr_checkouts); } |