Elijah Newren writes:
> Seems reasonable. Since these tests were essentially copies of other
> tests within the same file, just for rebase -i instead of -m, should I
> also add another patch to the series fixing up the rebase -m testcase
> to also replace the subshell with a single-shot
Johannes Sixt writes:
> Pitfalls ahead!
Thanks. I said "at least the latter" for this exact reason ;-).
> PATH=... git rebase ...
>
> is OK, but
>
> PATH=... test_must_fail git rebase ...
>
> is not; the latter requires the subshell, otherwise the modified PATH
> variable survives
On Wed, Jun 27, 2018 at 2:17 PM Johannes Sixt wrote:
> Pitfalls ahead!
>
> PATH=... git rebase ...
>
> is OK, but
>
> PATH=... test_must_fail git rebase ...
>
> is not; the latter requires the subshell, otherwise the modified PATH
> variable survives the command because
Am 27.06.2018 um 19:27 schrieb Elijah Newren:
On Wed, Jun 27, 2018 at 9:54 AM, Junio C Hamano wrote:
Having said that, it would be simpler for at least the latter to
write it using a single-shot environment assignment, perhaps? I.e.
PATH=./test-bin:$PATH git rebase --continue &&
On Wed, Jun 27, 2018 at 9:54 AM, Junio C Hamano wrote:
> + (
> + PATH=./test-bin:$PATH
> + test_must_fail git rebase -i -s funny -Xopt -Xfoo master topic
> + ) &&
>
> + (
> + PATH=./test-bin:$PATH
> + git rebase --continue
Elijah Newren writes:
>>> + chmod +x test-bin/git-merge-funny &&
>>> + (
>>> + PATH=./test-bin:$PATH
>>
>> Broken &&-chain (in subshell).
>>
>>> + test_must_fail git rebase -i -s funny -Xopt -Xfoo master
>>> topic
>>> + ) &&
>>> + test -f
On Wed, Jun 27, 2018 at 12:45 AM, Eric Sunshine wrote:
> On Wed, Jun 27, 2018 at 3:36 AM Elijah Newren wrote:
>> We are not passing the same args to merge strategies when we are doing an
>> --interactive rebase as we do with a --merge rebase. The merge strategy
>> should not need to be aware of
On Wed, Jun 27, 2018 at 3:36 AM Elijah Newren wrote:
> We are not passing the same args to merge strategies when we are doing an
> --interactive rebase as we do with a --merge rebase. The merge strategy
> should not need to be aware of which type of rebase is in effect. Add a
> testcase which
We are not passing the same args to merge strategies when we are doing an
--interactive rebase as we do with a --merge rebase. The merge strategy
should not need to be aware of which type of rebase is in effect. Add a
testcase which checks for the appropriate args.
Signed-off-by: Elijah Newren
9 matches
Mail list logo
