Doit: allow private editions
Junio C Hamano committed
Jan 23, 2009 at 10:36 UTC
6d8ad7137791e70d679424bd5f56a7e6e240e078
1 file changed
+18
Doit
+18
@@ -31,6 +31,9 @@ do
31
continue
32
}
33
34
+ private=$(git rev-parse -q --verify private-$branch 2>/dev/null)
35
+ case $? in 0|1) ;; *) exit $? ;; esac
36
+
37
if installed=$($HOME/git-$branch/bin/git version) &&
38
if version=$(expr "$installed" : '.*\.g\([0-9a-f]*\)$')
39
then
@@ -52,6 +55,18 @@ do
55
56
echo "** $branch" &&
57
git checkout $branch &&
58
+
59
+ case "$private" in
60
+ '')
61
+ ;;
62
+ ?*)
63
+ git merge --squash --no-commit "$private" || {
64
+ echo >&2 "Cannot apply private edition changes"
65
+ git reset --hard
66
+ }
67
+ ;;
68
+ esac &&
69
+
70
Meta/Make $M -- $J clean &&
71
case "$with_dash" in
72
y)
@@ -63,6 +78,7 @@ do
78
esac
79
;;
80
esac &&
81
+
82
Meta/Make $M -- $J all &&
83
Meta/Make $M -- $J test &&
84
case "$branch" in
@@ -78,6 +94,8 @@ do
94
Meta/Make $M -- install &&
95
Meta/Make clean || exit $?
96
97
+ git reset --hard
98
+
99
done >./:all.log 3>&2 2>&1
100
101
git checkout master