kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'nd/checkout-noisy-unmerge' 

"git checkout [<tree-ish>] <pathspec>" started reporting the number
of paths that have got updated recently, but the same messages were
given when "git checkout -m <pathspec>" to unresolve conflicts that
have just been resolved.  The message now reports these unresolved
paths separately from the paths that are checked out from the index.

* nd/checkout-noisy-unmerge:
  checkout: count and print -m paths separately
  checkout: update count-checkouts messages
maint
Junio C Hamano 2019-02-08 20:44:51 -08:00
parent fd357c4270 1d1f689bef
commit 87c9831df0
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
builtin/checkout.c
View File

@ -261,7 +261,7 @@ static int checkout_paths(const struct checkout_opts *opts,
struct commit *head; struct commit *head;
int errs = 0; int errs = 0;
struct lock_file lock_file = LOCK_INIT; struct lock_file lock_file = LOCK_INIT;
int nr_checkouts = 0; int nr_checkouts = 0, nr_unmerged = 0;


if (opts->track != BRANCH_TRACK_UNSPECIFIED) if (opts->track != BRANCH_TRACK_UNSPECIFIED)
die(_("'%s' cannot be used with updating paths"), "--track"); die(_("'%s' cannot be used with updating paths"), "--track");
@ -386,23 +386,28 @@ static int checkout_paths(const struct checkout_opts *opts,
&state, &nr_checkouts); &state, &nr_checkouts);
else if (opts->merge) else if (opts->merge)
errs |= checkout_merged(pos, &state, errs |= checkout_merged(pos, &state,
&nr_checkouts); &nr_unmerged);
pos = skip_same_name(ce, pos) - 1; pos = skip_same_name(ce, pos) - 1;
} }
} }
errs |= finish_delayed_checkout(&state, &nr_checkouts); errs |= finish_delayed_checkout(&state, &nr_checkouts);


if (opts->count_checkout_paths) { if (opts->count_checkout_paths) {
if (nr_unmerged)
fprintf_ln(stderr, Q_("Recreated %d merge conflict",
"Recreated %d merge conflicts",
nr_unmerged),
nr_unmerged);
if (opts->source_tree) if (opts->source_tree)
fprintf_ln(stderr, Q_("Checked out %d path out of %s", fprintf_ln(stderr, Q_("Updated %d path from %s",
"Checked out %d paths out of %s", "Updated %d paths from %s",
nr_checkouts), nr_checkouts),
nr_checkouts, nr_checkouts,
find_unique_abbrev(&opts->source_tree->object.oid, find_unique_abbrev(&opts->source_tree->object.oid,
DEFAULT_ABBREV)); DEFAULT_ABBREV));
else else if (!nr_unmerged || nr_checkouts)
fprintf_ln(stderr, Q_("Checked out %d path out of the index", fprintf_ln(stderr, Q_("Updated %d path from the index",
"Checked out %d paths out of the index", "Updated %d paths from the index",
nr_checkouts), nr_checkouts),
nr_checkouts); nr_checkouts);
} }