Re: [PATCH] add support for specifying an SSL cipher list

2015-05-07 Thread Lars Kellogg-Stedman
On Thu, May 07, 2015 at 09:33:01AM -0700, Junio C Hamano wrote: > If you are changing the behaviour in your reroll, I suspect you > wouldn't be doing the common "override". If you are going to do the > 'reset on empty', then 'You can set the environment variable to an > empty string to reset to th

[PATCH v2 01/12] t5520: implement tests for no merge candidates cases

2015-05-07 Thread Paul Tan
Commit a8c9bef4 fully established the current advices given by git-pull for the different cases where git-fetch will not have anything marked for merge: 1. We fetched from a specific remote, and a refspec was given, but it ended up not fetching anything. This is usually because the user prov

[PATCH v2 07/12] t4013: call git-merge instead of git-pull

2015-05-07 Thread Paul Tan
Since "git fetch ." does not update any refs, "git pull . side" is equivalent to calling "git merge side". As such, replace the call to git-pull with a call to git-merge to reduce the dependence on git-pull's functionality to reduce irrelevant test breakage when git-pull is rewritten to C. Signed