Skip to content

Commit 8158d51

Browse files
author
Junio C Hamano
committed
Update pu rebuilding procedure.
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 8124686 commit 8158d51

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

PU

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,22 @@ case "$#" in
5151
break ;;
5252
esac
5353
I=0
54-
UNUSE=
55-
USE=
54+
UNUSE= USE= USED=
5655
for H in $HH
5756
do
5857
I=$(($I+1))
5958
case " $ans " in
6059
*' '$I' '*)
6160
USE="$USE$H "
61+
USED="$USED,$H"
6262
;;
6363
*)
6464
UNUSE="$UNUSE$H "
6565
;;
6666
esac
6767
done
68-
git pull -n . $USE || exit
68+
USED=`expr "$USED" : ',\(.*\)'`
69+
git merge -n "Merge $USED" pu $USE || exit
6970
HH=$UNUSE
7071
done
7172
exit

0 commit comments

Comments
 (0)