X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.bin%2Fgit-format-request-pull;h=f03345b7143f331e7c4f569a10fb36b44c72bc7c;hb=05fa0b8255051e15def5845534f231495eedff7f;hp=a122ebde65c2af41a28886a6b8fd587f448dd95a;hpb=8069c098fceb3042ac94f947ae344b0ae7761b97;p=home.git

diff --git a/.bin/git-format-request-pull b/.bin/git-format-request-pull
index a122ebd..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;
@@ -19,7 +21,7 @@ while [[ -n $1 ]] ; do
 done
 
 commit=${1:-mainline/master}
-url=$(git config --get remote.origin.url)
+url=$(git config --get remote.pullrequest.url || git config --get remote.origin.url)
 branch=${2:-master}
 if [[ ${branch} != master ]] ; then
 	subject=" (${branch} branch)"
@@ -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)
@@ -45,7 +50,7 @@ EOF
 cat ${tmp}
 
 to=$(git config --get sendemail.pullrequest)
-cc=$(git config --get sendemail.to)
+cc=$(git config --get sendemail.to || git config --get sendemail.pullrequestcc)
 if ${auto} ; then
 	git send-email --to "${to}" --cc "${cc}" ${tmp}
 else