On Tue, Feb 27, 2018 at 10:17 PM, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
>> + git read-tree -i -m $c3 2>actual-err &&
>> + test_must_be_empty expected-err &&
>> + git update-index --ignore-missing --refresh 2>>actual-err &&
>> + test_must_be
On Tue, Feb 27, 2018 at 10:10 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> SZEDER Gábor writes:
>>
>>> The two test checking 'git mmerge-recursive' in an empty worktree in
>>> ...
>>> GIT_INDEX_FILE="$PWD/ours-has-rename-index" &&
>>> export GIT_INDEX_FILE &&
SZEDER Gábor writes:
> + git read-tree -i -m $c3 2>actual-err &&
> + test_must_be_empty expected-err &&
> + git update-index --ignore-missing --refresh 2>>actual-err &&
> + test_must_be_empty expected-err &&
> + git merge-recursive $c0 -
Junio C Hamano writes:
> SZEDER Gábor writes:
>
>> The two test checking 'git mmerge-recursive' in an empty worktree in
>> ...
>> GIT_INDEX_FILE="$PWD/ours-has-rename-index" &&
>> export GIT_INDEX_FILE &&
>> mkdir "$GIT_WORK_TREE" &&
>> -git rea
SZEDER Gábor writes:
> The two test checking 'git mmerge-recursive' in an empty worktree in
> ...
> GIT_INDEX_FILE="$PWD/ours-has-rename-index" &&
> export GIT_INDEX_FILE &&
> mkdir "$GIT_WORK_TREE" &&
> - git read-tree -i -m $c7 &&
> -
On Fri, Feb 23, 2018 at 6:39 PM, SZEDER Gábor wrote:
> The two test checking 'git mmerge-recursive' in an empty worktree in
s/mmerge/merge/, I guess.
> 't3030-merge-recursive.sh' fail when the test script is run with '-x'
> tracing (and using a shell other than a Bash version supporting
> BASH_X
The two test checking 'git mmerge-recursive' in an empty worktree in
't3030-merge-recursive.sh' fail when the test script is run with '-x'
tracing (and using a shell other than a Bash version supporting
BASH_XTRACEFD). The reason for those failures is that the tests check
the emptiness of a subshe
7 matches
Mail list logo