Skip to content

Commit

Permalink
Make mkrel work on non-master branches
Browse files Browse the repository at this point in the history
Appending "--" to the git checkout arguments appears to prevent it
from automatically creating a local branch from the remote.  Also
correct the default git URL and clean up a spurious find warning.
  • Loading branch information
tlyu committed May 15, 2012
1 parent 6d204bc commit 4fc9c72
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/util/mkrel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
set -e
repository=git.mit.edu:/git/krb5
repository=git.mit.edu:/git/krb5.git
dodoc=t
dosrc=t
checkout=t
Expand Down Expand Up @@ -97,7 +97,7 @@ echo "major=$relmajor minor=$relminor patch=$relpatch"
if test $checkout = t; then
echo "Checking out krb5 with tag $reltag into directory $reldir..."
git clone -q -n $repository $reldir
(cd $reldir && git checkout -q $reltag --)
(cd $reldir && git checkout -q $reltag)
fi

#
Expand Down Expand Up @@ -179,8 +179,9 @@ echo "Nuking unneeded files..."
find $reldir \( -name TODO -o -name todo -o -name .cvsignore \
-o -name .gitignore -o -name BADSYMS -o -name .Sanitize \
-o -name .rconf \) -print | xargs rm -f || true
find $reldir -type d \( -name autom4te.cache -o -name .git \
find $reldir -type d \( -name autom4te.cache \
-o -name \$ac_config_fragdir \) -exec rm -rf {} \; || true
rm -rf $reldir/.git || true

if test $dodoc = t; then
echo "Building doc..."
Expand Down

0 comments on commit 4fc9c72

Please sign in to comment.