From df6c8dfa67c58ed99fd4847551c6a22d61137b78 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 23 Jun 2010 21:27:43 +0200
Subject: [PATCH] rename admin-merge-2 to admin-merge, give it a branch name
argument
---
all | 29 ++++++-----------------------
1 file changed, 6 insertions(+), 23 deletions(-)
diff --git a/all b/all
index 71758f14..bba700ae 100755
--- a/all
+++ b/all
@@ -617,29 +617,7 @@ case "$cmd" in
rm -rf "$patchdir"
;;
admin-merge)
- if [ "$#" = 1 ]; then
- set -- "${1%%/*}" "${1#*/}"
- fi
- for d in $repos; do
- enter "$d0/$d" verbose
- git rev-parse "$1/$2" || continue
- # 1. review
- {
- git log HEAD.."$1/$2"
- git diff HEAD..."$1/$2"
- } | less
- if yesno "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"; then
- git merge "$1/$2"
- if "$SELF" compile && yesno "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
- git push origin HEAD
- git push "$1" :"$2"
- else
- git reset --hard HEAD@{1}
- fi
- fi
- done
- ;;
- admin-merge-2)
+ branch=$1
t=`mktemp`
report=""
reportecho()
@@ -670,6 +648,11 @@ case "$cmd" in
continue
;;
esac
+ if [ -n "$branch" ]; then
+ if [ x"$branch" != x"${ref#refs/remotes/origin/}" ]; then
+ continue
+ fi
+ fi
reportecho " Branch $ref:"
note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
logdata=`git log --color "$base".."$ref"`
--
2.39.5