From: Junio C Hamano <junio@twinsun.com>
Date: Fri, 23 Jan 2009 18:36:53 +0000 (-0800)
Subject: Doit: allow private editions
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d8ad7137791e70d679424bd5f56a7e6e240e078;p=thirdparty%2Fgit.git

Doit: allow private editions
---

diff --git a/Doit b/Doit
index 5a86451668..74051e02d7 100755
--- a/Doit
+++ b/Doit
@@ -31,6 +31,9 @@ do
 		continue
 	}
 
+	private=$(git rev-parse -q --verify private-$branch 2>/dev/null)
+	case $? in 0|1) ;; *) exit $? ;; esac
+
 	if	installed=$($HOME/git-$branch/bin/git version) &&
 		if version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$')
 		then
@@ -52,6 +55,18 @@ do
 
 	echo "** $branch" &&
 	git checkout $branch &&
+
+	case "$private" in
+	'')
+		;;
+	?*)
+		git merge --squash --no-commit "$private" || {
+			echo >&2 "Cannot apply private edition changes"
+			git reset --hard
+		}
+		;;
+	esac &&
+
 	Meta/Make $M -- $J clean &&
 	case "$with_dash" in
 	y)
@@ -63,6 +78,7 @@ do
 		esac
 		;;
 	esac &&
+
 	Meta/Make $M -- $J all &&
 	Meta/Make $M -- $J test &&
 	case "$branch" in
@@ -78,6 +94,8 @@ do
 	Meta/Make $M -- install &&
 	Meta/Make clean || exit $?
 
+	git reset --hard
+
 done >./:all.log 3>&2 2>&1
 
 git checkout master