Skip to contentSkip to conversation

create-pull-request: Assume remote branch from local branch

PATCH Applied Darren Hart 3 participants 4 messages Apr 5, 2012 – Apr 10, 2012

lore
Share & tools
lore
#0 lore raw

cover create-pull-request: Assume remote branch from local branch

The following changes since commit 3e4562500956550dbae5467a5fe9289f1d32f775:

self-hosted-image: Increase space for build and allow builder user sudo access (2012-04-04 17:17:11 +0100)

are available in the git repository at:
git://git.yoctoproject.org/user-contrib/dvhart/oe-core scripts
http://git.yoctoproject.org/cgit.cgi/user-contrib/dvhart/oe-core/log/?h=scripts

Darren Hart (1):
create-pull-request: Assume remote branch from local branch

 scripts/create-pull-request |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.6.5
#1 lore raw

PATCH 1/1 create-pull-request: Assume remote branch from local branch

It is common to use the same remote branch name as the local branch name. In this case, it would be nice not to have to specify the remote branch name.

Make the -b argument optional and assume the remote branch is the same name as the local branch. Print a NOTE to this effect so as not to catch the user by surprise:

NOTE: Assuming remote branch 'notthere', use -b to override.

If the remote branch doesn't exist, a WARNING is displayed just as if the user had used -b to specify a non-existent branch:

WARNING: Branch 'notthere' was not found on the contrib git tree.
Please check your remote and branch parameter before sending.

---
 scripts/create-pull-request |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
scripts/create-pull-request +8 -3
index 600fa7a..9a8913d 100755
@@ -34,8 +34,8 @@ RFC=0
 usage() {
 CMD=$(basename $0)
 cat <<EOM
-Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to] [-i commit_id] -u remote -b branch
-  -b branch           Branch name in the specified remote
+Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r relative_to] [-i commit_id] -u remote [-b branch]
+  -b branch           Branch name in the specified remote (default: current branch)
   -c                  Create an RFC (Request for Comment) patch series
   -h                  Display this help message
   -i commit_id        Ending commit (default: HEAD)
@@ -120,7 +120,12 @@ while getopts "b:chi:m:o:p:r:s:u:" OPT; do
 	esac
 done
 
-if [ -z "$BRANCH" ] || [ -z "$REMOTE_URL" ]; then
+if [ -z "$BRANCH" ]; then
+	BRANCH=$(git branch | grep -e "^\* " | cut -d' ' -f2)
+	echo "NOTE: Assuming remote branch '$BRANCH', use -b to override."
+fi
+	
+if [ -z "$REMOTE_URL" ]; then
 	usage
 	exit 1
 fi
Signature · 1 line
1.7.6.5
#2 lore raw

Good idea and good work.

*@g*

Quoted 62 lines · Darren Hart

It is common to use the same remote branch name as the local branch name. In this case, it would be nice not to have to specify the remote branch name.

Make the -b argument optional and assume the remote branch is the same name as the local branch. Print a NOTE to this effect so as not to catch the user by surprise:

NOTE: Assuming remote branch 'notthere', use -b to override.

If the remote branch doesn't exist, a WARNING is displayed just as if the user had used -b to specify a non-existent branch:

WARNING: Branch 'notthere' was not found on the contrib git tree.
Please check your remote and branch parameter before sending.

---
 scripts/create-pull-request |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
scripts/create-pull-request +0 -1
index 600fa7a..9a8913d 100755
@@ -34,8 +34,8 @@ RFC=0
 usage() {
 CMD=$(basename $0)
 cat <<EOM
-Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r

relative_to] [-i commit_id] -u remote -b branch

scripts/create-pull-request +1 -1
-  -b branch           Branch name in the specified remote
+Usage: $CMD [-h] [-o output_dir] [-m msg_body_file] [-s subject] [-r

relative_to] [-i commit_id] -u remote [-b branch]
+ -b branch Branch name in the specified remote (default:
current branch)

  -c                  Create an RFC (Request for Comment) patch series
  -h                  Display this help message
  -i commit_id        Ending commit (default: HEAD)
scripts/create-pull-request +6 -2
@@ -120,7 +120,12 @@ while getopts "b:chi:m:o:p:r:s:u:" OPT; do
       esac
 done
 
-if [ -z "$BRANCH" ] || [ -z "$REMOTE_URL" ]; then
+if [ -z "$BRANCH" ]; then
+       BRANCH=$(git branch | grep -e "^\* " | cut -d' ' -f2)
+       echo "NOTE: Assuming remote branch '$BRANCH', use -b to override."
+fi
+
+if [ -z "$REMOTE_URL" ]; then
       usage
       exit 1
 fi
--

1.7.6.5

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Applied
#3 lore raw
In reply to Darren Hart
Quoted 8 lines · Darren Hart

The following changes since commit 3e4562500956550dbae5467a5fe9289f1d32f775:

self-hosted-image: Increase space for build and allow builder user sudo access (2012-04-04 17:17:11 +0100)

are available in the git repository at:
git://git.yoctoproject.org/user-contrib/dvhart/oe-core scripts
http://git.yoctoproject.org/cgit.cgi/user-contrib/dvhart/oe-core/log/?h=scripts

Quoted 6 lines

Darren Hart (1):
create-pull-request: Assume remote branch from local branch

  scripts/create-pull-request |   11 ++++++++---
  1 files changed, 8 insertions(+), 3 deletions(-)

Merged into OE-Core

Thanks
Sau!