commit 1a3a193e01b5bb5d31702f55934b298b8b89a3b6 from: Omar Polo via: Thomas Adam date: Wed Jul 26 19:15:43 2023 UTC rename a few pop_id to pop_idx leftover from 79c49d8454. commit - eb6fb9cdfb8f52fcb6baf65ca864b8e506f64901 commit + 1a3a193e01b5bb5d31702f55934b298b8b89a3b6 blob - 5ded37bff3fc54893ebb5730937274ffb904a1e1 blob + 32ca2931e3071c10d03c698a6c1fbac3f2513eeb --- regress/cmdline/branch.sh +++ regress/cmdline/branch.sh @@ -617,8 +617,8 @@ test_branch_list_worktree_state() { # check up-to-date marker is shown with fresh checkout (cd "$wt" && got br -l > "$testroot/stdout") - echo "* master: $(pop_id 1 $@)" > $testroot/stdout.expected - echo " newbranch: $(pop_id 1 $@)" >> $testroot/stdout.expected + echo "* master: $(pop_idx 1 $@)" > $testroot/stdout.expected + echo " newbranch: $(pop_idx 1 $@)" >> $testroot/stdout.expected cmp -s $testroot/stdout $testroot/stdout.expected ret=$? if [ $ret -ne 0 ]; then @@ -633,8 +633,8 @@ test_branch_list_worktree_state() { set -- "$@" "$(git_show_head "$testroot/repo")" (cd "$wt" && got br -l > "$testroot/stdout") - echo "~ master: $(pop_id 2 $@)" > $testroot/stdout.expected - echo " newbranch: $(pop_id 1 $@)" >> $testroot/stdout.expected + echo "~ master: $(pop_idx 2 $@)" > $testroot/stdout.expected + echo " newbranch: $(pop_idx 1 $@)" >> $testroot/stdout.expected cmp -s $testroot/stdout $testroot/stdout.expected ret=$? if [ $ret -ne 0 ]; then @@ -646,8 +646,8 @@ test_branch_list_worktree_state() { # check up-to-date marker is shown after 'got update' (cd "$wt" && got up > /dev/null) (cd "$wt" && got br -l > "$testroot/stdout") - echo "* master: $(pop_id 2 $@)" > $testroot/stdout.expected - echo " newbranch: $(pop_id 1 $@)" >> $testroot/stdout.expected + echo "* master: $(pop_idx 2 $@)" > $testroot/stdout.expected + echo " newbranch: $(pop_idx 1 $@)" >> $testroot/stdout.expected cmp -s $testroot/stdout $testroot/stdout.expected ret=$? if [ $ret -ne 0 ]; then @@ -659,8 +659,8 @@ test_branch_list_worktree_state() { # check out-of-date marker is shown with out-of-date base commit (cd "$wt" && got up -c:head:- > /dev/null) (cd "$wt" && got br -l > "$testroot/stdout") - echo "~ master: $(pop_id 2 $@)" > $testroot/stdout.expected - echo " newbranch: $(pop_id 1 $@)" >> $testroot/stdout.expected + echo "~ master: $(pop_idx 2 $@)" > $testroot/stdout.expected + echo " newbranch: $(pop_idx 1 $@)" >> $testroot/stdout.expected cmp -s $testroot/stdout $testroot/stdout.expected ret=$? if [ $ret -ne 0 ]; then