From 6109647a9c92ef64e5f245ba9d623173a4b4b248 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 13 Jul 2011 02:29:45 -0400 Subject: [PATCH] add a force option (for kernel sync issues) --- .bin/git-format-request-pull | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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) -- 2.39.5