From 6e8313de403538157f086dfbf589896035e7126f Mon Sep 17 00:00:00 2001 From: Ben Shelton Date: Mon, 4 Aug 2014 13:55:49 -0500 Subject: create-pull-request: Fix error on 2.0 versions of git On 2.0 versions of git, the create-pull-request script exits with the warning "No match for commit... Are you sure you pushed 'HEAD' there?". This is due to a change in behavior where git used to guess the branch you meant, but no longer does. See the thread at http://www.spinics.net/lists/git/msg233050.html for more information. To accommodate the new behavior, if the COMMIT_ID is set to the default of "HEAD", make it point explicitly to $BRANCH instead. (From OE-Core rev: 7ee64ea60ede5477b2f9a355d93bdc556e6b7895) Signed-off-by: Ben Shelton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/create-pull-request | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scripts/create-pull-request') diff --git a/scripts/create-pull-request b/scripts/create-pull-request index 97ed874e7f..bc897468ef 100755 --- a/scripts/create-pull-request +++ b/scripts/create-pull-request @@ -125,6 +125,10 @@ if [ -z "$BRANCH" ]; then echo "NOTE: Assuming remote branch '$BRANCH', use -b to override." fi +if [ "$COMMIT_ID" == "HEAD" ]; then + COMMIT_ID="$BRANCH" +fi + if [ -z "$REMOTE_URL" ]; then echo "ERROR: Missing parameter -u, no git remote!" usage -- cgit v1.2.3-54-g00ecf