git pull: remove the existing create_pull_request script
The patches to follow completely rewrite the existing create-pull-request. Rather than have an initial diff of the two files (which are not at all similar) remove the original, and then create the new one. Signed-off-by: Darren Hart <dvhart@linux.intel.com> CC: Nitin A Kamble <nitin.a.kamble@intel.com> CC: Richard Purdie <rpurdie@linux.intel.com> CC: Saul Wold <saul.wold@intel.com> CC: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
parent
a5bbeeed0d
commit
09ee361d42
|
@ -1,86 +0,0 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# create a pull request for your branch
|
||||
#
|
||||
|
||||
usage() {
|
||||
echo "Usage: "
|
||||
echo "$ $0 [-r <relative_to>] [-i <commit_id>] -b <contrib_branch>"
|
||||
echo " <relative_to> is a commit identifier, like branch-name, HEAD, hex-commit-id"
|
||||
echo " <commit_id> is a commit identifier, like branch-name, HEAD, hex-commit-id"
|
||||
echo " <contrib_branch> is the branch-name in the git.pokylinux.org/poky-contrib tree"
|
||||
echo " If <relative_to> is not specified then relative to master is assumed"
|
||||
echo " If <commit_id> is not specified then it is assumed as HEAD"
|
||||
echo " For Example:"
|
||||
echo " $0 -r master -i misc -b nitin/misc "
|
||||
echo " $0 -b nitin/misc "
|
||||
echo " $0 -r distro/master -i nitin/distro -b nitin/distro "
|
||||
exit 1
|
||||
}
|
||||
|
||||
while [ $# -ne 0 ] # loop over arguments
|
||||
do
|
||||
|
||||
case $1 in
|
||||
-r )
|
||||
shift
|
||||
RELATIVE_TO=$1
|
||||
shift
|
||||
;;
|
||||
-i )
|
||||
shift
|
||||
COMMIT_ID=$1
|
||||
shift
|
||||
;;
|
||||
-b )
|
||||
shift
|
||||
CONTRIB_BRANCH=$1
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
usage
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [ "${COMMIT_ID}" = "" ]; then
|
||||
COMMIT_ID=HEAD
|
||||
echo "Note: <commit_id> parameter assumed as 'HEAD'"
|
||||
fi
|
||||
|
||||
if [ "${RELATIVE_TO}" = "" ]; then
|
||||
RELATIVE_TO=master
|
||||
echo "Note: <relative_to> parameter assumed as 'master'"
|
||||
fi
|
||||
|
||||
if [ "${CONTRIB_BRANCH}" = "" ]; then
|
||||
echo "Error: Parameter <contrib_branch> not specified"
|
||||
usage
|
||||
fi
|
||||
|
||||
git --no-pager show ${COMMIT_ID} > /dev/null
|
||||
if [ "$?" != "0" ]; then
|
||||
echo "Error: Invalid <commit_id> parameter specified"
|
||||
usage
|
||||
fi
|
||||
|
||||
git --no-pager show ${RELATIVE_TO} > /dev/null
|
||||
if [ "$?" != "0" ]; then
|
||||
echo "Error: Invalid <relative_to> parameter specified: ${RELATIVE_TO}"
|
||||
usage
|
||||
fi
|
||||
|
||||
echo ""
|
||||
git --no-pager diff ${RELATIVE_TO}..${COMMIT_ID} | diffstat -p1
|
||||
echo ""
|
||||
git --no-pager log --no-merges ${RELATIVE_TO}..${COMMIT_ID} | git --no-pager shortlog
|
||||
|
||||
PULL_URL="http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=${CONTRIB_BRANCH}"
|
||||
|
||||
echo "Pull URL: ${PULL_URL}"
|
||||
|
||||
wget -q ${PULL_URL} -O - | grep -q "Invalid branch:\ ${CONTRIB_BRANCH}"
|
||||
if [ "$?" == "0" ]; then
|
||||
echo "Warning: Branch named '${CONTRIB_BRANCH}' was not found on contrib git tree"
|
||||
echo "Check your <contrib-branch> parameter"
|
||||
fi
|
Loading…
Reference in New Issue