diff options
Diffstat (limited to 'backflip')
| -rwxr-xr-x | backflip | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -37,6 +37,8 @@ done shift $(($OPTIND - 1)) REV=$1 +commitfile=./backport-${REV}.msg + if [ -z ${DEV_BRANCH+x} ]; then DEV_BRANCH=${REF_BRANCH} fi @@ -81,7 +83,7 @@ ask() { # arg2 : ChangeLog file # Create ChangeLog entry for arg1 in arg2.arg1.frag forge_entry() { - echo -e $DATE" "$NAME" <"$EMAIL">\n\n\tBackport from trunk r"$1"." >> $2.$1.frag + echo -e $DATE" "$NAME" <"$EMAIL">\n\n\tBackport from trunk r"$1"." > $2.$1.frag git show --format=oneline ${SHA1} -- $2 \ | grep ^+ \ | sed -e '1d' -e 's:^+::' \ @@ -92,6 +94,7 @@ forge_entry() { if [ "$user_edit" == "y" ]; then "$EDITOR" $2.$1.frag fi + cat $2.$1.frag >> ${commitfile} } # arg1 : backported revision sha1 @@ -161,6 +164,7 @@ for i in $CHLOGS; do git reset -q HEAD $i git checkout $i # Create ChangeLog entry + echo `dirname $i`/ >> ${commitfile} forge_entry $1 $i done @@ -199,7 +203,7 @@ if [ "$user_bc" != "n" ]; then if $STACKED; then git commit --amend else - git commit + git commit -F ${commitfile} fi echo |