From 17d22308f54d26acd815fb0887110ad83f0d7437 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Sun, 6 Nov 2011 16:29:19 +0100 Subject: [PATCH] +option -c Change remote origin -> gdb. --- bin/dashtopatch | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/bin/dashtopatch b/bin/dashtopatch index bab4561..c48fad6 100755 --- a/bin/dashtopatch +++ b/bin/dashtopatch @@ -1,25 +1,33 @@ #! /bin/sh set -ex +compile=false +if [ "$1" = -c ];then + compile=true + shift +fi if [ $# != 1 ] || ! echo "$1" | grep -q '-';then echo >&2 "Syntax: $0 branch-list-delimited-by-dashes" exit 1 fi -base="origin/master" +base="gdb/master" gerrit=true if git branch -D gerrit;then - git checkout origin/master + git checkout gdb/master git checkout -b gerrit else gerrit=false fi for elem in $(echo "$1"|tr '-' ' ');do - if [ "$base" = "origin/master" ];then + if [ "$base" = "gdb/master" ];then next="$elem" else next="$base-$elem" fi git checkout "$next" git merge "$base" + if $compile;then + make + fi if [ -e "$next".patch ];then echo -e '/^--- /,$d\nw'|ed "$next".patch || : fi -- 1.8.3.1