@matheusbsbs / matheus-bagliano / commits / 9397f3cf7e

merge: remove always-the-same "verbose" arguments

Simplify the code that builds the arguments for the "read-tree" invocation in reset_hard() and read_empty() to remove the "verbose" parameter. Before 172b6428d06 (do not overwrite untracked during merge from unborn branch, 2010-11-14) there was a "reset_hard()" function that would be called in two places, one of those passed a "verbose=1", the other a "verbose=0". After 172b6428d06 when read_empty() was split off from reset_hard() both of these functions only had one caller. The "verbose" in read_empty() would always be false, and the one in reset_hard() would always be true. There was never a good reason for the code to act this way, it happened because the read_empty() function was a copy/pasted and adjusted version of reset_hard(). Since we're no longer conditionally adding the "-v" parameter here (and we'd only add it for "reset_hard()" we'll be able to move to a simpler and safer run-command API in the subsequent commit. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Taylor Blau <me@ttaylorr.com>

Ævar Arnfjörð Bjarmason committed Oct 30, 2022 at 12:42 UTC 9397f3cf7e4005096e1c03bff52618ddd47b0fe5

1 file changed +5 -8

builtin/merge.c

+5 -8

@@ -345,14 +345,12 @@ out:

345 return rc;

346 }

347

348 -static void read_empty(const struct object_id *oid, int verbose)

348 +static void read_empty(const struct object_id *oid)

349 {

350 int i = 0;

351 const char *args[7];

352

353 args[i++] = "read-tree";

354 - if (verbose)

355 - args[i++] = "-v";

354 args[i++] = "-m";

355 args[i++] = "-u";

356 args[i++] = empty_tree_oid_hex();

@@ -363,14 +361,13 @@ static void read_empty(const struct object_id *oid, int verbose)

361 die(_("read-tree failed"));

362 }

363

366 -static void reset_hard(const struct object_id *oid, int verbose)

364 +static void reset_hard(const struct object_id *oid)

365 {

366 int i = 0;

367 const char *args[6];

368

369 args[i++] = "read-tree";

372 - if (verbose)

373 - args[i++] = "-v";

370 + args[i++] = "-v";

371 args[i++] = "--reset";

372 args[i++] = "-u";

373 args[i++] = oid_to_hex(oid);

@@ -385,7 +382,7 @@ static void restore_state(const struct object_id *head,

382 {

383 struct strvec args = STRVEC_INIT;

384

388 - reset_hard(head, 1);

385 + reset_hard(head);

386

387 if (is_null_oid(stash))

388 goto refresh_cache;

@@ -1470,7 +1467,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)

1467 check_trust_level);

1468

1469 remote_head_oid = &remoteheads->item->object.oid;

1473 - read_empty(remote_head_oid, 0);

1470 + read_empty(remote_head_oid);

1471 update_ref("initial pull", "HEAD", remote_head_oid, NULL, 0,

1472 UPDATE_REFS_DIE_ON_ERR);

1473 goto done;