Skip to content

Commit 3c5883b

Browse files
pcloudsgitster
authored andcommitted
checkout: update count-checkouts messages
Commit 0f086e6 [1] counts the number of files updated by "git checkout -- <paths>" command and prints it. Later on 536ec18 [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] 0f086e6 (checkout: print something when checking out paths - 2018-11-13) [2] 536ec18 (entry: support CE_WT_REMOVE flag in checkout_entry - 2018-12-20) Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 774d44c commit 3c5883b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

builtin/checkout.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,15 +392,15 @@ static int checkout_paths(const struct checkout_opts *opts,
392392

393393
if (opts->count_checkout_paths) {
394394
if (opts->source_tree)
395-
fprintf_ln(stderr, Q_("Checked out %d path out of %s",
396-
"Checked out %d paths out of %s",
395+
fprintf_ln(stderr, Q_("Updated %d path from %s",
396+
"Updated %d paths from %s",
397397
nr_checkouts),
398398
nr_checkouts,
399399
find_unique_abbrev(&opts->source_tree->object.oid,
400400
DEFAULT_ABBREV));
401401
else
402-
fprintf_ln(stderr, Q_("Checked out %d path out of the index",
403-
"Checked out %d paths out of the index",
402+
fprintf_ln(stderr, Q_("Updated %d path from the index",
403+
"Updated %d paths from the index",
404404
nr_checkouts),
405405
nr_checkouts);
406406
}

0 commit comments

Comments
 (0)