mbox series

[v3,0/7] Finish converting git bisect to C part 3

Message ID 20210123154056.48234-1-mirucam@gmail.com (mailing list archive)
Headers show
Series Finish converting git bisect to C part 3 | expand

Message

Miriam R. Jan. 23, 2021, 3:40 p.m. UTC
These patches correspond to a third part of patch series 
of Outreachy project "Finish converting `git bisect` from shell to C" 
started by Pranit Bauva and Tanushree Tumane
(https://public-inbox.org/git/pull.117.git.gitgitgadget@gmail.com) and
continued by me.

This third part is formed by reimplementations of some `git bisect` 
subcommands and removal of some temporary subcommands.

These patch series emails were generated from:
https://gitlab.com/mirucam/git/commits/git-bisect-work-part3_v2.

I would like to thank Rafael Silva and Johannes Schindelin for their
reviews and suggestions.

Specific changes
----------------

[1/7] bisect--helper: reimplement `bisect_log` shell function in C
* Change command description message.
---

[2/7] bisect--helper: reimplement `bisect_replay` shell function in C
* Remove get_next_word().
* Change process_replay_line()'s while loop implementation.
* Change error message.
---

[6/7] bisect--helper: reimplement `bisect_skip` shell function in C
* Use strstr() instead of wildmatch.
* Remove strvec use.
---

Pranit Bauva (7):
  bisect--helper: reimplement `bisect_log` shell function in C
  bisect--helper: reimplement `bisect_replay` shell function in C
  bisect--helper: retire `--bisect-write` subcommand
  bisect--helper: use `res` instead of return in BISECT_RESET case
    option
  bisect--helper: retire `--bisect-auto-next` subcommand
  bisect--helper: reimplement `bisect_skip` shell function in C
  bisect--helper: retire `--check-and-set-terms` subcommand

 builtin/bisect--helper.c | 178 ++++++++++++++++++++++++++++++++-------
 git-bisect.sh            |  58 +------------
 2 files changed, 150 insertions(+), 86 deletions(-)

Comments

Junio C Hamano Jan. 26, 2021, 1:58 a.m. UTC | #1
Miriam Rubio <mirucam@gmail.com> writes:

> These patches correspond to a third part of patch series 
> of Outreachy project "Finish converting `git bisect` from shell to C" 
> started by Pranit Bauva and Tanushree Tumane
> (https://public-inbox.org/git/pull.117.git.gitgitgadget@gmail.com) and
> continued by me.
>
> This third part is formed by reimplementations of some `git bisect` 
> subcommands and removal of some temporary subcommands.
>
> These patch series emails were generated from:
> https://gitlab.com/mirucam/git/commits/git-bisect-work-part3_v2.

Unfortunately, with this series in the 'seen' branch, the CI jobs
seem to fail.

cf.
https://github.com/git/git/runs/1766239699?check_suite_focus=true#step:5:814
Miriam R. Jan. 26, 2021, 2:18 p.m. UTC | #2
Hi Junio,

El mar, 26 ene 2021 a las 2:58, Junio C Hamano (<gitster@pobox.com>) escribió:
>
> Miriam Rubio <mirucam@gmail.com> writes:
>
> > These patches correspond to a third part of patch series
> > of Outreachy project "Finish converting `git bisect` from shell to C"
> > started by Pranit Bauva and Tanushree Tumane
> > (https://public-inbox.org/git/pull.117.git.gitgitgadget@gmail.com) and
> > continued by me.
> >
> > This third part is formed by reimplementations of some `git bisect`
> > subcommands and removal of some temporary subcommands.
> >
> > These patch series emails were generated from:
> > https://gitlab.com/mirucam/git/commits/git-bisect-work-part3_v2.
>
> Unfortunately, with this series in the 'seen' branch, the CI jobs
> seem to fail.

With the last patch series sent:

https://public-inbox.org/git/20210125191710.45161-1-mirucam@gmail.com/
(branch: https://gitlab.com/mirucam/git/commits/git-bisect-work-part3_v3)

all tests pass (executed with: prove -j5 --shuffle t[0-9]*.sh):
--------
All tests successful.
Files=916, Tests=22661, 1628 wallclock secs ( 7.93 usr  3.16 sys +
1106.15 cusr 1387.58 csys = 2504.82 CPU)
Result: PASS
----------
>
> cf.
> https://github.com/git/git/runs/1766239699?check_suite_focus=true#step:5:814

I have seen that is "t3415-rebase-autosquash.sh" the test that fails in CI jobs.

I have also executed it independently with no errors:
./t3415-rebase-autosquash.sh
ok 1 - setup
ok 2 - auto fixup (option)
ok 3 - auto fixup (config)
ok 4 - auto squash (option)
ok 5 - auto squash (config)
ok 6 - misspelled auto squash
ok 7 - auto squash that matches 2 commits
ok 8 - auto squash that matches a commit after the squash
ok 9 - auto squash that matches a sha1
ok 10 - auto squash that matches longer sha1
ok 11 - use commit --fixup
ok 12 - use commit --squash
ok 13 - fixup! fixup!
ok 14 - fixup! squash!
ok 15 - squash! squash!
ok 16 - squash! fixup!
ok 17 - autosquash with custom inst format
ok 18 - autosquash with empty custom instructionFormat
ok 19 - autosquash with multiple empty patches
ok 20 - extra spaces after fixup!
ok 21 - wrapped original subject
ok 22 - abort last squash
ok 23 - fixup a fixup
# passed all 23 test(s)
1..23

If I am missing something or I should do any other test please tell me,
thank you,
Miriam.
Junio C Hamano Jan. 26, 2021, 7:12 p.m. UTC | #3
"Miriam R." <mirucam@gmail.com> writes:

>> cf.
>> https://github.com/git/git/runs/1766239699?check_suite_focus=true#step:5:814
>
> I have seen that is "t3415-rebase-autosquash.sh" the test that fails in CI jobs.

Sorry, a false alarm.  This I think was caused by another topic,
cm/rebase-i, and not the bisect topic.
Miriam R. Jan. 27, 2021, 2:11 p.m. UTC | #4
El mar, 26 ene 2021 a las 20:12, Junio C Hamano (<gitster@pobox.com>) escribió:
>
> "Miriam R." <mirucam@gmail.com> writes:
>
> >> cf.
> >> https://github.com/git/git/runs/1766239699?check_suite_focus=true#step:5:814
> >
> > I have seen that is "t3415-rebase-autosquash.sh" the test that fails in CI jobs.
>
> Sorry, a false alarm.  This I think was caused by another topic,
> cm/rebase-i, and not the bisect topic.
>
Ok.
Best,
Miriam.