Skip to content

Fix github-merge with git version 2.1.0#4731

Merged
laanwj merged 1 commit intobitcoin:masterfrom
gavinandresen:github_merge
Aug 21, 2014
Merged

Fix github-merge with git version 2.1.0#4731
laanwj merged 1 commit intobitcoin:masterfrom
gavinandresen:github_merge

Conversation

@gavinandresen
Copy link
Copy Markdown
Contributor

Running git version 2.1.0 on OSX (homebrew), I get
fatal: '1q': not a non-negative integer

I'm guessing git command-line parsing got more strict recently?

Running git version 2.1.0 on OSX (homebrew), I get
  fatal: '1q': not a non-negative integer

I'm guessing git command-line parsing got more strict recently?
@BitcoinPullTester
Copy link
Copy Markdown

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4731_c53b1ece1b0644bd9620773eea3757bf939a678f/ for binaries and test log.
This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/
Contact BlueMatt on freenode if something looks broken.

@sipa
Copy link
Copy Markdown
Member

sipa commented Aug 19, 2014

Heh, I can't even find a -q in the documentation for git log.

@laanwj
Copy link
Copy Markdown
Member

laanwj commented Aug 21, 2014

Looks like for git -q in general means 'quiet mode' mode, but I cannot find it documented for git log anywhere either.
Anyhow - I'm going to use the new version of the script to merge this, and if that works, ACK.

@laanwj laanwj merged commit c53b1ec into bitcoin:master Aug 21, 2014
laanwj added a commit that referenced this pull request Aug 21, 2014
c53b1ec Fix github-merge with git version 2.1.0 (Gavin Andresen)
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants