diff options
| author | Tom Yu <tlyu@mit.edu> | 2012-05-15 15:15:07 -0400 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2012-05-15 15:15:07 -0400 |
| commit | 4fc9c72e5d30c94399baf7069a0d0db25e940a68 (patch) | |
| tree | 7c5febda5cd737f3099f50529ed4945d1325e176 | |
| parent | 6d204bc466e2038bacf3e2e3a4b4f5bdc56e6b5e (diff) | |
| download | krb5-4fc9c72e5d30c94399baf7069a0d0db25e940a68.tar.gz krb5-4fc9c72e5d30c94399baf7069a0d0db25e940a68.tar.xz krb5-4fc9c72e5d30c94399baf7069a0d0db25e940a68.zip | |
Make mkrel work on non-master branches
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.
| -rwxr-xr-x | src/util/mkrel | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/util/mkrel b/src/util/mkrel index 0f69effff..90c135afe 100755 --- a/src/util/mkrel +++ b/src/util/mkrel @@ -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 @@ -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 # @@ -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..." |