Re: [RFC/PATCH v2] pull: add --set-upstream
- From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
- Date
- Jun 7, 2016, 07:06 UTC
- Message-ID
- <vpqeg89bhqt.fsf@anie.imag.fr>
- In-Reply-To
- <xmqqoa7ew319.fsf@gitster.mtv.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 13 quoted lines
> Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
>
>>> +test_config_unchanged () {
>>> + git config --list --local >original
>>> + "$@"
>>> + git config --list --local >modified
>>> + test_cmp original modified
>>> +}
>>
>> The test passes if "$@" fails. You should &&-chain the lines here to
>> catch things like crashes or unexpected "exit 1" in git.
>
> That is true, but allowing "$@" failure may be deliberate. I don't think so:
+test_expect_success 'pull -u should not work when merging unrelated histories' ' + git checkout master && + test_config_unchanged test_must_fail git pull -u step_parent master +'
;-)
-- Matthieu Moy http://www-verimag.imag.fr/~moy/