1#!/bin/bash 2# 3# Copyright (c) 2016 ARM Limited 4# All rights reserved 5# 6# The license below extends only to copyright in the software and shall 7# not be construed as granting a license to any other intellectual 8# property including but not limited to intellectual property relating --- 30 unchanged lines hidden (view full) --- 39# 40 41set -e 42 43REL_SCRIPT_DIR=`dirname "$0"` 44SCRIPT_NAME=`basename "$0"` 45SCRIPT_DIR=$(cd "$REL_SCRIPT_DIR" && echo "$(pwd -P)") 46MSG_FILTER="$SCRIPT_DIR"/upstream_msg_filter.sed |
47 48PATCH_DIR="./patches/" 49UPSTREAM="upstream/master" |
50 51usage() 52{ 53 cat <<EOF 54$SCRIPT_NAME [OPTION]... [BRANCH] 55Format a patch series suitable for upstream consumption. 56 57Options: 58 -u BRANCH Upstream branch 59 -d DIR Patch directory |
60 -h Show this help string. 61 62This script creates a series of patches suitable from upstream 63consumption from a git branch. By default, the script works on the 64currently checked out branch (HEAD). When invoked, the script executes 65the following operations in order: 66 67 1. Rebase the patches in the current branch onto the upstream 68 branch. 69 2. Filter commit messages. |
70 3. Generate a set of patches in git format. |
71EOF 72} 73 74branch_exists() 75{ 76 git rev-parse --verify -q "$1" > /dev/null 77} 78 |
79while getopts ":u:d:h" OPT; do |
80 case $OPT in 81 d) 82 PATCH_DIR="$OPTARG" 83 ;; 84 u) 85 UPSTREAM="$OPTARG" 86 ;; |
87 h) 88 usage 89 exit 0 90 ;; 91 92 \?) 93 echo "$0: invalid option -- '$OPTARG'" >&2 94 echo "Try '$0 -h' for more information." >&2 --- 11 unchanged lines hidden (view full) --- 106 esac 107done 108 109 110shift $((OPTIND - 1)) 111 112BRANCH="${1:-HEAD}" 113 |
114if ! branch_exists "$BRANCH"; then 115 echo "Error: Patch branch '$BRANCH' doesn't exist" 1>&2 116 exit 2 117fi 118 119if ! branch_exists "$UPSTREAM"; then 120 echo "Error: Upstream branch '$UPSTREAM' doesn't exist." 1>&2 121 exit 2 --- 20 unchanged lines hidden (view full) --- 142 143echo "Filtering commit messages..." 144git filter-branch -f \ 145 --msg-filter "$MSG_FILTER" \ 146 "$SHA_UPSTREAM"..HEAD > /dev/null 147 148echo "Creating patches..." 149git format-patch -p -o "$PATCH_DIR" "$UPSTREAM" |