Fix github-merge with git version 2.1.0 #4731

pull gavinandresen wants to merge 1 commits into bitcoin:master from gavinandresen:github_merge changing 1 files +2 −2

gavinandresen commented at 5:49 PM on August 19, 2014: 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?

Fix github-merge with git version 2.1.0

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?

c53b1ece1b

BitcoinPullTester commented at 6:13 PM on August 19, 2014: none

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 commented at 11:09 PM on August 19, 2014: member

Heh, I can't even find a -q in the documentation for git log.
laanwj commented at 3:48 AM on August 21, 2014: member

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 merged this on Aug 21, 2014
laanwj closed this on Aug 21, 2014
laanwj referenced this in commit 2fb886bffb on Aug 21, 2014
MarcoFalke locked this on Sep 8, 2021

Contributors