Fix Jenkins set up for git relationship tests

[GoogleCodeExporter]

We want to add git tests the same way we have hg tests for checking the basic 
relationships.  

Original issue reported on code.google.com by yuriy.b...@gmail.com on 2 Nov 2011 at 11:21

[GoogleCodeExporter]

I looked at this to see what was going on with the jenkins tests and it seems 
that there are a couple of problems. I'm going to update the logging 
environment so jenkins can give us more information about the problem.

Original comment by rthol...@gmail.com on 15 Nov 2011 at 2:02

[GoogleCodeExporter]

The Jenkins error for these failing tests is very similar to what I see on OS 
X; ultimately these both seem to relate to confusion over the merge candidate 
ref.

JENKINS:

  [junit]  INFO 2011-11-15 09:47:17,493 (AbstractStateChecker.java:145) - run command: /usr/bin/git pull -u /var/lib/jenkins/jobs/crystalvc/workspace/gittestproject/me
    [junit]  INFO 2011-11-15 09:47:17,494 (AbstractStateChecker.java:146) - output: 
    [junit] 
    [junit]  INFO 2011-11-15 09:47:17,494 (AbstractStateChecker.java:148) - error: There are no candidates for merging among the refs that you just fetched.
    [junit] Generally this means that you provided a wildcard refspec which had no
    [junit] matches on the remote end.
    [junit] 
    [junit]  INFO 2011-11-15 09:47:17,494 (AbstractStateChecker.java:198) - operation exception in running update local repository
    [junit]  INFO 2011-11-15 09:47:17,495 (AbstractStateChecker.java:199) - command: /usr/bin/git pull -u /var/lib/jenkins/jobs/crystalvc/workspace/gittestproject/me
    [junit]  path: /var/lib/jenkins/jobs/crystalvc/workspace/git-test-temp/me_me
    [junit]  repo name: your own
    [junit]  output: Exit status: 0
    [junit] *****-START-ERROR-*****
    [junit] There are no candidates for merging among the refs that you just fetched.
    [junit] Generally this means that you provided a wildcard refspec which had no
    [junit] matches on the remote end.
    [junit] *****-END-ERROR-*****
    [junit] *****-START-OUTPUT-*****
    [junit] *****-END-OUTPUT-*****

OS X:

 INFO 2011-11-15 09:45:02,714 (AbstractStateChecker.java:144) - update local repository
 INFO 2011-11-15 09:45:02,715 (AbstractStateChecker.java:145) - run command: /usr/local/git/bin/git pull -u /Users/rtholmes/Workspaces/speculation-inconsistency/crystalvc/gittestproject/me
 INFO 2011-11-15 09:45:02,715 (AbstractStateChecker.java:146) - output: 

 INFO 2011-11-15 09:45:02,715 (AbstractStateChecker.java:148) - error: You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me either.    Please
specify which branch you want to merge on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.

If you often merge with the same branch, you may want to
configure the following variables in your configuration
file:

    branch.master.remote = <nickname>
    branch.master.merge = <remote-ref>
    remote.<nickname>.url = <url>
    remote.<nickname>.fetch = <refspec>

See git-config(1) for details.

Original comment by rthol...@gmail.com on 15 Nov 2011 at 2:51

[GoogleCodeExporter]

Original comment by yuriy.b...@gmail.com on 7 Feb 2012 at 7:14

• Changed title: Fix Jenkins set up for git relationship tests