Patchwork create-pull-request: Fix error on 2.0 versions of git

login
register
mail settings
Submitter Ben Shelton
Date Aug. 4, 2014, 6:55 p.m.
Message ID <1407178549-8464-1-git-send-email-ben.shelton@ni.com>
Download mbox | patch
Permalink /patch/77257/
State New
Headers show

Comments

Ben Shelton - Aug. 4, 2014, 6:55 p.m.
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.

Signed-off-by: Ben Shelton <ben.shelton@ni.com>
---
 scripts/create-pull-request | 4 ++++
 1 file changed, 4 insertions(+)

Patch

diff --git a/scripts/create-pull-request b/scripts/create-pull-request
index 503248b..2bf5eb5 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