@matheusbsbs / matheus-bagliano / commits / f10d31cf2d

subtree: process 'git-subtree-split' trailer in separate function

Both functions 'find_latest_squash' (called by 'git subtree merge --squash' and 'git subtree split --rejoin') and 'find_existing_splits' (called by git 'subtree split') loop through commits that have a 'git-subtree-dir' trailer, and then process the 'git-subtree-mainline' and 'git-subtree-split' trailers for those commits. The processing done for the 'git-subtree-split' trailer is simple: we check if the object exists with 'rev-parse' and set the variable 'sub' to the object name, or we die if the object does not exist. In a future commit we will add more steps to the processing of this trailer in order to make the code more robust. To reduce code duplication, move the processing of the 'git-subtree-split' trailer to a dedicated function, 'process_subtree_split_trailer'. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Philippe Blain committed Oct 21, 2022 at 15:13 UTC f10d31cf2d41fb892fbda1fb2b77dd518418c1a1

1 file changed +11 -4

contrib/subtree/git-subtree.sh

+11 -4

@@ -371,6 +371,15 @@ try_remove_previous () {

371 fi

372 }

373

374 +# Usage: process_subtree_split_trailer SPLIT_HASH MAIN_HASH

375 +process_subtree_split_trailer () {

376 + assert test $# = 2

377 + b="$1"

378 + sq="$2"

379 + sub="$(git rev-parse --verify --quiet "$b^{commit}")" ||

380 + die "fatal: could not rev-parse split hash $b from commit $sq"

381 +}

382 +

383 # Usage: find_latest_squash DIR

384 find_latest_squash () {

385 assert test $# = 1

@@ -395,8 +404,7 @@ find_latest_squash () {

404 main="$b"

405 ;;

406 git-subtree-split:)

398 - sub="$(git rev-parse --verify --quiet "$b^{commit}")" ||

399 - die "fatal: could not rev-parse split hash $b from commit $sq"

407 + process_subtree_split_trailer "$b" "$sq"

408 ;;

409 END)

410 if test -n "$sub"

@@ -447,8 +455,7 @@ find_existing_splits () {

455 main="$b"

456 ;;

457 git-subtree-split:)

450 - sub="$(git rev-parse --verify --quiet "$b^{commit}")" ||

451 - die "fatal: could not rev-parse split hash $b from commit $sq"

458 + process_subtree_split_trailer "$b" "$sq"

459 ;;

460 END)

461 debug "Main is: '$main'"