Rob Hoelz <rob@xxxxxxxx> writes:
> On 3/19/13 7:08 PM, Junio C Hamano wrote:
>> Jonathan Nieder <jrnieder@xxxxxxxxx> writes:
>>
>>> Junio C Hamano wrote:
>>>> Jonathan Nieder <jrnieder@xxxxxxxxx> writes:
>>>>> Test nits:
>>>>> ...
>>>>> Hope that helps,
>>>>>
>>>>> Jonathan Nieder (3):
>>>>> push test: use test_config where appropriate
>>>>> push test: simplify check of push result
>>>>> push test: rely on &&-chaining instead of 'if bad; then echo Oops; fi'
>>>> Are these supposed to be follow-up patches? Preparatory steps that
>>>> Rob can reroll on top? Something else?
>>> Preparatory steps.
>> OK, thanks. I'll queue these first then.
>>
> Should I apply these to my patch to move things along? What's the next
> step for me?
You would fetch from nearby git.git mirror, find the tip of
Janathan's series and redo your patch on top. Perhaps the session
would go like this:
$ git fetch git://git.kernel.org/pub/scm/git/git.git/ pu
$ git log --oneline --first-parent ..FETCH_HEAD | grep jn/push-tests
83a072a Merge branch 'jn/push-tests' into pu
$ git checkout -b rh/push-pushurl-pushinsteadof 83a072a
... redo the work, perhaps with combinations of:
$ git cherry-pick -n $your_original_branch
$ edit t/t5516-fetch-push.sh
... and then
$ make test
$ git commit
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html