kvazar
/
kevacoin
mirror of https://github.com/kvazar-network/kevacoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #4731 

c53b1ec Fix github-merge with git version 2.1.0 (Gavin Andresen)
0.10
Wladimir J. van der Laan 10 years ago
parent
27bc786641 c53b1ece1b
commit
2fb886bffb
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      contrib/devtools/github-merge.sh

4
contrib/devtools/github-merge.sh
Unescape View File

@ -49,11 +49,11 @@ fi
# Initialize source branches. # Initialize source branches.
git checkout -q "$BRANCH" git checkout -q "$BRANCH"
if git fetch -q "$HOST":"$REPO" "+refs/pull/$PULL/*:refs/heads/pull/$PULL/*"; then if git fetch -q "$HOST":"$REPO" "+refs/pull/$PULL/*:refs/heads/pull/$PULL/*"; then
if ! git log -1q "refs/heads/pull/$PULL/head" >/dev/null 2>&1; then if ! git log -q -1 "refs/heads/pull/$PULL/head" >/dev/null 2>&1; then
echo "ERROR: Cannot find head of pull request #$PULL on $HOST:$REPO." >&2 echo "ERROR: Cannot find head of pull request #$PULL on $HOST:$REPO." >&2
exit 3 exit 3
fi fi
if ! git log -1q "refs/heads/pull/$PULL/merge" >/dev/null 2>&1; then if ! git log -q -1 "refs/heads/pull/$PULL/merge" >/dev/null 2>&1; then
echo "ERROR: Cannot find merge of pull request #$PULL on $HOST:$REPO." >&2 echo "ERROR: Cannot find merge of pull request #$PULL on $HOST:$REPO." >&2
exit 3 exit 3
fi fi

Write Preview
Loading…
Cancel
Save