X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.bin%2Fgit-format-request-pull;h=f03345b7143f331e7c4f569a10fb36b44c72bc7c;hb=53756ed8612888ef97a5c39a83e9ceaaed56ac91;hp=b5df8fd83c3b56ea5d47d2f0bdfc420dff08e097;hpb=d8dea28fdcc8f32ddc8f194ea83ea80be482ff3d;p=home.git

diff --git a/.bin/git-format-request-pull b/.bin/git-format-request-pull
index b5df8fd..f03345b 100755
--- a/.bin/git-format-request-pull
+++ b/.bin/git-format-request-pull
@@ -6,11 +6,13 @@ usage() {
 }
 
 auto=false
-eval set -- `getopt -- eh "$@"`
+force=false
+eval set -- `getopt -- efh "$@"`
 while [[ -n $1 ]] ; do
 	case $1 in
 		-h|--help) usage;;
 		-e) auto=true;;
+		-f) force=true;;
 		--) shift; break;;
 		-*) usage 1;;
 		*)  break;
@@ -34,7 +36,10 @@ fi
 name=$(git config --get user.name)
 email=$(git config --get user.email)
 tmp=$(mktemp)
-request=$(PAGER= git request-pull ${commit} ${url} ${branch}) || exit 1
+if ! request=$(PAGER= git request-pull ${commit} ${url} ${branch}) ; then
+	${force} || exit 1
+	request=$(echo "${request}" | sed "s:..BRANCH.NOT.VERIFIED..:${branch}:")
+fi
 cat << EOF > ${tmp}
 From: ${name} <${email}>
 Date: $(date -R)