From: Junio C Hamano <junkio@cox.net>
Date: Sun, 15 Jan 2006 09:55:09 +0000 (-0800)
Subject: Update pu rebuilding procedure.
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=8158d510c641e2354cf24a10bc3e994c7a1e3125;p=git.git

Update pu rebuilding procedure.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/PU b/PU
index 7af28ac9..c96ccbc4 100755
--- a/PU
+++ b/PU
@@ -51,21 +51,22 @@ case "$#" in
 			break ;;
 		esac
 		I=0
-		UNUSE=
-		USE=
+		UNUSE= USE= USED=
 		for H in $HH
 		do
 			I=$(($I+1))
 			case " $ans " in
 			*' '$I' '*)
 				USE="$USE$H "
+				USED="$USED,$H"
 				;;
 			*)
 				UNUSE="$UNUSE$H "
 				;;
 			esac
 		done
-		git pull -n . $USE || exit
+		USED=`expr "$USED" : ',\(.*\)'`
+		git merge -n "Merge $USED" pu $USE || exit
 		HH=$UNUSE
 	done
 	exit