Git bisect does not accept revisions

[dryeo]

Attempting to use git bisect always fails when trying to enter the good revision. For example, a session,

[C:\work\cc45esr\mozilla]sh
# git bisect start
# git bisect bad
# git bisect good 69cd3cf7204047ed79c3a5d6d35fe75b09e0e94e
 revision is needed
# git bisect good FIREFOX_45_5_0esr_RELEASE_OS2_Beta_8
 revision is needed
# git bisect good 7674a41
 revision is needed
#

[Silvan Scherrer]

you need to debug git-bisect in /@unixroot/libexec/git-core and see where it starts to give up.

[dryeo]

Output with tracing on

[dryeo]

Not sure how to debug. Running git bisect bad 69cd3cf7204047ed79c3a5d6d35fe75b09e0e94e results in the attached. Running sh -x -c git-bisect.sh bad 69cd3cf7204047ed79c3a5d6d35fe75b09e0e94e results in

+ k:/usr/libexec/git-core/git-bisect
22:59:08.415000 git.c:371               trace: built-in: git 'rev-parse' '--git-dir'
22:59:08.585000 git.c:371               trace: built-in: git 'rev-parse' '--show-cdup'
22:59:08.658000 git.c:371               trace: built-in: git 'rev-parse' '--git-path' 'objects'
usage: git bisect [help|start|bad|good|new|old|terms|skip|next|reset|visualize|replay|log|run]

[Silvan Scherrer]

I more thought of adding some printf to the shell script and see what it does and if it makes sense at all.

[Silvan Scherrer]

did you try to add some printf in the shell to see it it makes any sense?

[dryeo]

I couldn't make heads or tails of the shell script enough to get anywhere with printf or echo.

[dryeo]

Testing with an older version of the script (pre-RPM) does work,

C:\work\cc45esr\mozilla>git bisect start

C:\work\cc45esr\mozilla>git bisect bad

C:\work\cc45esr\mozilla>git bisect good 69cd3cf7204047ed79c3a5d6d35fe75b09e0e94e
Bisecting: 84 revisions left to test after this (roughly 6 steps)
[d1b5622450e335c0bf41bb84dafe6146019bf466] #402: M1365602

The script is about 6kb smaller.

[Silvan Scherrer]

just using the older script? or also with a older (pre-rpm) git? I wonder if the script got broken or what. If only using a older script works, please do a diff and see what it might be.
We are not actively working on git atm, so every hint you have might speed it up.

[dryeo]

Diff between current git-bisect script and one from the bauxite git release.

[dryeo]

Just using the older script. The diff is bigger then the scripts, so hard to see what might have changed. I should try downgrading git and compare the scripts, perhaps can get a smaller diff. It's bedtime here so will have to wait.
I'll attach the diff.

[Silvan Scherrer]

in write_terms () around line 570 is the following:

printf '%s\n%s\n' "$TERM_BAD" "$TERM_GOOD" >"$GIT_DIR/BISECT_TERMS"

change to:

printf '%s\n%s\n' "$TERM_BAD" "$TERM_GOOD" | tr -d '\r' >"$GIT_DIR/BISECT_TERMS"

means add

 | tr -d '\r'

This should fix it. please try.

[Silvan Scherrer]

fixed in ​https://github.com/bitwiseworks/git-os2/commit/6db2f25470dd1ac093a0030b38d9670da5990d88

[dryeo]

Yes, that fixes. Thanks