Update pu rebuilding procedure.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Jan 15, 2006 at 01:55 UTC
8158d510c641e2354cf24a10bc3e994c7a1e3125
1 file changed
+4
-3
PU
+4
-3
index 7af28ac9fd..c96ccbc486 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