mbox series

[v6,0/2,Outreachy,v2] t3404: avoid losing exit status to pipes

Message ID pull.1805.v6.git.git.1728299466.gitgitgadget@gmail.com (mailing list archive)
Headers show
Series t3404: avoid losing exit status to pipes | expand

Message

Usman Akinyemi via GitGitGadget Oct. 7, 2024, 11:11 a.m. UTC
Changes since v5:

 * Remove spaces between redirect to conform with git style.

Usman Akinyemi (2):
  t3404: avoid losing exit status with focus on `git show` and `git
    cat-file`
  t3404: employing test_line_count() to replace test

 t/t3404-rebase-interactive.sh | 75 +++++++++++++++++++++++------------
 1 file changed, 50 insertions(+), 25 deletions(-)


base-commit: 90fe3800b92a49173530828c0a17951abd30f0e1
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1805%2FUnique-Usman%2Favoid_git_pipes-v6
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1805/Unique-Usman/avoid_git_pipes-v6
Pull-Request: https://github.com/git/git/pull/1805

Range-diff vs v5:

 1:  bfff7937cd2 = 1:  bfff7937cd2 t3404: avoid losing exit status with focus on `git show` and `git cat-file`
 2:  0ce40300fa3 ! 2:  b3d3deced25 t3404: employing test_line_count() to replace test
     @@ t/t3404-rebase-interactive.sh: test_expect_success 'stop on conflicting pick' '
       	test "$(git diff --name-status |
       		sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
      -	test 4 = $(grep -v "^#" < .git/rebase-merge/done | wc -l) &&
     -+	grep -v "^#" < .git/rebase-merge/done >actual &&
     +-	test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)
     ++	grep -v "^#" <.git/rebase-merge/done >actual &&
      +	test_line_count = 4 actual &&
     - 	test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)
     ++	test 0 = $(grep -c "^[^#]" <.git/rebase-merge/git-rebase-todo)
       '
       
     + test_expect_success 'show conflicted patch' '
      @@ t/t3404-rebase-interactive.sh: test_expect_success 'multi-squash only fires up editor once' '
       	) &&
       	test $base = $(git rev-parse HEAD^) &&

Comments

Patrick Steinhardt Oct. 7, 2024, 11:12 a.m. UTC | #1
On Mon, Oct 07, 2024 at 11:11:04AM +0000, Usman Akinyemi via GitGitGadget wrote:
> Changes since v5:
> 
>  * Remove spaces between redirect to conform with git style.

Thanks, this version looks good to me now.

Patrick
Usman Akinyemi Oct. 7, 2024, 11:16 a.m. UTC | #2
On Mon, Oct 7, 2024 at 11:12 AM Patrick Steinhardt <ps@pks.im> wrote:
>
> On Mon, Oct 07, 2024 at 11:11:04AM +0000, Usman Akinyemi via GitGitGadget wrote:
> > Changes since v5:
> >
> >  * Remove spaces between redirect to conform with git style.
>
> Thanks, this version looks good to me now.
>
> Patrick

Thank you very much and I appreciate all the guidance from all
reviewers. I Learned a great lot of new things.
Going forward, what should be my next step? Can I work on other tasks
now or wait for this to be merged? Are there any other things also
expected from my side as an outreachy applicant ? Thank you  very
much.
Patrick Steinhardt Oct. 7, 2024, 11:32 a.m. UTC | #3
On Mon, Oct 07, 2024 at 11:16:49AM +0000, Usman Akinyemi wrote:
> On Mon, Oct 7, 2024 at 11:12 AM Patrick Steinhardt <ps@pks.im> wrote:
> >
> > On Mon, Oct 07, 2024 at 11:11:04AM +0000, Usman Akinyemi via GitGitGadget wrote:
> > > Changes since v5:
> > >
> > >  * Remove spaces between redirect to conform with git style.
> >
> > Thanks, this version looks good to me now.
> >
> > Patrick
> 
> Thank you very much and I appreciate all the guidance from all
> reviewers. I Learned a great lot of new things.
> Going forward, what should be my next step? Can I work on other tasks
> now or wait for this to be merged? Are there any other things also
> expected from my side as an outreachy applicant ? Thank you  very
> much.

For now I'd recommend to wait a couple of days until the patch series
you have sent gets picked up by Junio and merged to `next`. You should
watch out for the "What's cooking?" reports that he sends out every
couple days and observe how your topic progresses in it. Note that
things may go a bit slower right now due to the pending Git v2.47
release, so it may take a while before he picks your topic.

When things go smoothly: congrats, you have checked the first box and
have successfully completed your microproject :) I'd recommend to keep
on reading the mailing list to get familiar with how things work over
here and get some familiarity with the code in question.

You are of course free to send additional patches, but this is not a
requirement. If you still want to do so I'd recommend to not pick up a
microproject, but try to find a work item on your own, e.g. by searching
for "#leftoverbits" in our mailing list. The reason for why I don't
recommend to pick up another microproject is so that other applicants
have items to work on, and it decreases the likelihood that your changes
collide with the work of another intern.

Patrick
Usman Akinyemi Oct. 7, 2024, 11:44 a.m. UTC | #4
On Mon, Oct 7, 2024 at 11:33 AM Patrick Steinhardt <ps@pks.im> wrote:
>
> On Mon, Oct 07, 2024 at 11:16:49AM +0000, Usman Akinyemi wrote:
> > On Mon, Oct 7, 2024 at 11:12 AM Patrick Steinhardt <ps@pks.im> wrote:
> > >
> > > On Mon, Oct 07, 2024 at 11:11:04AM +0000, Usman Akinyemi via GitGitGadget wrote:
> > > > Changes since v5:
> > > >
> > > >  * Remove spaces between redirect to conform with git style.
> > >
> > > Thanks, this version looks good to me now.
> > >
> > > Patrick
> >
> > Thank you very much and I appreciate all the guidance from all
> > reviewers. I Learned a great lot of new things.
> > Going forward, what should be my next step? Can I work on other tasks
> > now or wait for this to be merged? Are there any other things also
> > expected from my side as an outreachy applicant ? Thank you  very
> > much.
>
> For now I'd recommend to wait a couple of days until the patch series
> you have sent gets picked up by Junio and merged to `next`. You should
> watch out for the "What's cooking?" reports that he sends out every
> couple days and observe how your topic progresses in it. Note that
> things may go a bit slower right now due to the pending Git v2.47
> release, so it may take a while before he picks your topic.
>
> When things go smoothly: congrats, you have checked the first box and
> have successfully completed your microproject :) I'd recommend to keep
> on reading the mailing list to get familiar with how things work over
> here and get some familiarity with the code in question.
>
> You are of course free to send additional patches, but this is not a
> requirement. If you still want to do so I'd recommend to not pick up a
> microproject, but try to find a work item on your own, e.g. by searching
> for "#leftoverbits" in our mailing list. The reason for why I don't
> recommend to pick up another microproject is so that other applicants
> have items to work on, and it decreases the likelihood that your changes
> collide with the work of another intern.
>
> Patrick

Thanks a lot, I really appreciate it.