Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-20 Thread Scott Schmit
On Mon, Mar 16, 2015 at 11:53:08AM -0700, Junio C Hamano wrote: Because the history is not linear in Git, bisection works by shrinking a subgraph of the history DAG that contains yet to be tested, suspected to have introduced a badness commits. The subgraph is defined as anything reachable

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-19 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Tuesday, March 17, 2015 6:33 PM Christian Couder christian.cou...@gmail.com writes: On Mon, Mar 16, 2015 at 10:05 PM, Junio C Hamano gits...@pobox.com wrote: However, you can say git bisect bad rev (and git bisect good rev for that matter) on a

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-18 Thread Christian Couder
On Tue, Mar 17, 2015 at 9:46 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder christian.cou...@gmail.com writes: On Tue, Mar 17, 2015 at 7:33 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder christian.cou...@gmail.com writes: Yes, but the user is supposed to not

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-17 Thread Christian Couder
On Tue, Mar 17, 2015 at 7:33 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder christian.cou...@gmail.com writes: On Mon, Mar 16, 2015 at 10:05 PM, Junio C Hamano gits...@pobox.com wrote: However, you can say git bisect bad rev (and git bisect good rev for that matter) on a rev

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-17 Thread Junio C Hamano
Christian Couder christian.cou...@gmail.com writes: On Tue, Mar 17, 2015 at 7:33 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder christian.cou...@gmail.com writes: Yes, but the user is supposed to not change the bad pointer for no good reason. That is irrelevant, no? Nobody

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-17 Thread Christian Couder
On Mon, Mar 16, 2015 at 10:05 PM, Junio C Hamano gits...@pobox.com wrote: Philip Oakley philipoak...@iee.org writes: From: Junio C Hamano gits...@pobox.com Hence, if you have a history that looks like this: G...1---2---3---4---6---8---B \

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-16 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Kevin Daudt m...@ikke.info writes: So this ref changes to the bad commit. For refs/bisect/good-*, I could only find an example snippet: GOOD=$(git for-each-ref --format=%(objectname) refs/bisect/good-*) But it's not really clear what * might be

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-16 Thread Kevin Daudt
On Wed, Mar 11, 2015 at 01:13:48PM -0700, Junio C Hamano wrote: Kevin Daudt m...@ikke.info writes: On Tue, Mar 10, 2015 at 04:12:18PM -0700, Junio C Hamano wrote: Step back and think why git bisect --first-parent is sometimes desired in the first place. It is because in the regular

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-16 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: From: Junio C Hamano gits...@pobox.com Hence, if you have a history that looks like this: G...1---2---3---4---6---8---B \ 5---7---B it follows that 4 must also be bad. It used to be good long time ago

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-16 Thread Junio C Hamano
Kevin Daudt m...@ikke.info writes: So this ref changes to the bad commit. For refs/bisect/good-*, I could only find an example snippet: GOOD=$(git for-each-ref --format=%(objectname) refs/bisect/good-*) But it's not really clear what * might be expanded to, nor what they mean. I guess

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-11 Thread Junio C Hamano
Kevin Daudt m...@ikke.info writes: On Tue, Mar 10, 2015 at 04:12:18PM -0700, Junio C Hamano wrote: What does such a command line _mean_? It tells us this: Define a set by having the bad ref as a positive end, and having all the good refs as negative (uninteresting) boundary.

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-11 Thread Kevin Daudt
On Tue, Mar 10, 2015 at 04:12:18PM -0700, Junio C Hamano wrote: Kevin Daudt m...@ikke.info writes: git log --bisect seems to do something different then git rev-list --bisect From git-log(1): Pretend as if the bad bisection ref refs/bisect/bad was listed and as if it was

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-10 Thread Junio C Hamano
Kevin Daudt m...@ikke.info writes: rev-list --bisect is used by git bisect, but never together with --first-parent. Because rev-list --bisect together with --first-parent is not handled currently, and even leads to segfaults, refuse to use both options together. Suggested-by: Junio C.

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-10 Thread Kevin Daudt
On Tue, Mar 10, 2015 at 03:09:54PM -0700, Junio C Hamano wrote: Kevin Daudt m...@ikke.info writes: rev-list --bisect is used by git bisect, but never together with --first-parent. Because rev-list --bisect together with --first-parent is not handled currently, and even leads to segfaults,

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-10 Thread Junio C Hamano
Kevin Daudt m...@ikke.info writes: git log --bisect seems to do something different then git rev-list --bisect From git-log(1): Pretend as if the bad bisection ref refs/bisect/bad was listed and as if it was followed by --not and the good bisection refs refs/bisect/good-* on

[PATCH v4] rev-list: refuse --first-parent combined with --bisect

2015-03-09 Thread Kevin Daudt
rev-list --bisect is used by git bisect, but never together with --first-parent. Because rev-list --bisect together with --first-parent is not handled currently, and even leads to segfaults, refuse to use both options together. Suggested-by: Junio C. Hamano gits...@pobox.com Helped-by: Eric