@matheusbsbs / matheus-bagliano / commits / 1d1f689bef

checkout: count and print -m paths separately

Since 0f086e6dca (checkout: print something when checking out paths - 2018-11-13), this command reports how many paths have been updated from what source (either from a tree, or from the index). I forget that there's a third source: when -m is used, the merge conflict is re-created (granted, also from the index, but it's not a straight copy from the index). Count and report unmerged paths separately. There's a bit more update to avoid reporting: Recreated X merge conflicts Updated 0 paths from the index The second line is unnecessary. Though if there's no conflict recreation, we still report Updated 0 paths from the index to make it clear we're not really doing anything. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Nguyễn Thái Ngọc Duy committed Feb 6, 2019 at 09:51 UTC 1d1f689bef77b1bd0cb0f0bc0e0bd766283c5df8

1 file changed +8 -3

builtin/checkout.c

+8 -3

@@ -259,7 +259,7 @@ static int checkout_paths(const struct checkout_opts *opts,

259 struct commit *head;

260 int errs = 0;

261 struct lock_file lock_file = LOCK_INIT;

262 - int nr_checkouts = 0;

262 + int nr_checkouts = 0, nr_unmerged = 0;

263

264 if (opts->track != BRANCH_TRACK_UNSPECIFIED)

265 die(_("'%s' cannot be used with updating paths"), "--track");

@@ -384,13 +384,18 @@ static int checkout_paths(const struct checkout_opts *opts,

384 &state, &nr_checkouts);

385 else if (opts->merge)

386 errs |= checkout_merged(pos, &state,

387 - &nr_checkouts);

387 + &nr_unmerged);

388 pos = skip_same_name(ce, pos) - 1;

389 }

390 }

391 errs |= finish_delayed_checkout(&state, &nr_checkouts);

392

393 if (opts->count_checkout_paths) {

394 + if (nr_unmerged)

395 + fprintf_ln(stderr, Q_("Recreated %d merge conflict",

396 + "Recreated %d merge conflicts",

397 + nr_unmerged),

398 + nr_unmerged);

399 if (opts->source_tree)

400 fprintf_ln(stderr, Q_("Updated %d path from %s",

401 "Updated %d paths from %s",

@@ -398,7 +403,7 @@ static int checkout_paths(const struct checkout_opts *opts,

403 nr_checkouts,

404 find_unique_abbrev(&opts->source_tree->object.oid,

405 DEFAULT_ABBREV));

401 - else

406 + else if (!nr_unmerged || nr_checkouts)

407 fprintf_ln(stderr, Q_("Updated %d path from the index",

408 "Updated %d paths from the index",

409 nr_checkouts),