projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use blob_, commit_, tag_, and tree_type throughout.
[git.git]
/
git-clone.sh
diff --git
a/git-clone.sh
b/git-clone.sh
index
3b54753
..
823c74b
100755
(executable)
--- a/
git-clone.sh
+++ b/
git-clone.sh
@@
-9,7
+9,7
@@
unset CDPATH
usage() {
unset CDPATH
usage() {
- echo >&2 "Usage: $0 [--use-separate-remote] [--reference <reference-repo>] [--bare] [-l [-s]] [-q] [-u <upload-pack>] [-
o
<name>] [-n] <repo> [<dir>]"
+ echo >&2 "Usage: $0 [--use-separate-remote] [--reference <reference-repo>] [--bare] [-l [-s]] [-q] [-u <upload-pack>] [-
-origin
<name>] [-n] <repo> [<dir>]"
exit 1
}
exit 1
}
@@
-45,7
+45,7
@@
Perhaps git-update-server-info needs to be run there?"
if test -n "$use_separate_remote" &&
branch_name=`expr "$name" : 'heads/\(.*\)'`
then
if test -n "$use_separate_remote" &&
branch_name=`expr "$name" : 'heads/\(.*\)'`
then
- tname="remotes/$branch_name"
+ tname="remotes/$
origin/$
branch_name"
else
tname=$name
fi
else
tname=$name
fi
@@
-98,6
+98,7
@@
close FH;
'
quiet=
'
quiet=
+local=no
use_local=no
local_shared=no
no_checkout=
use_local=no
local_shared=no
no_checkout=
@@
-121,14
+122,15
@@
while
*,-q|*,--quiet) quiet=-q ;;
*,--use-separate-remote)
use_separate_remote=t ;;
*,-q|*,--quiet) quiet=-q ;;
*,--use-separate-remote)
use_separate_remote=t ;;
- 1,-o) usage;;
1,--reference) usage ;;
*,--reference)
shift; reference="$1" ;;
*,--reference=*)
reference=`expr "$1" : '--reference=\(.*\)'` ;;
1,--reference) usage ;;
*,--reference)
shift; reference="$1" ;;
*,--reference=*)
reference=`expr "$1" : '--reference=\(.*\)'` ;;
- *,-o)
+ *,-o
|*,--or|*,--ori|*,--orig|*,--origi|*,--origin
)
case "$2" in
case "$2" in
+ '')
+ usage ;;
*/*)
echo >&2 "'$2' is not suitable for an origin name"
exit 1
*/*)
echo >&2 "'$2' is not suitable for an origin name"
exit 1
@@
-138,7
+140,7
@@
while
exit 1
}
test -z "$origin_override" || {
exit 1
}
test -z "$origin_override" || {
- echo >&2 "Do not give more than one -
o
options."
+ echo >&2 "Do not give more than one -
-origin
options."
exit 1
}
origin_override=yes
exit 1
}
origin_override=yes
@@
-155,12
+157,19
@@
do
shift
done
shift
done
+repo="$1"
+if test -z "$repo"
+then
+ echo >&2 'you must specify a repository to clone.'
+ exit 1
+fi
+
# --bare implies --no-checkout
if test yes = "$bare"
then
if test yes = "$origin_override"
then
# --bare implies --no-checkout
if test yes = "$bare"
then
if test yes = "$origin_override"
then
- echo >&2 '--bare and -
o
$origin options are incompatible.'
+ echo >&2 '--bare and -
-origin
$origin options are incompatible.'
exit 1
fi
if test t = "$use_separate_remote"
exit 1
fi
if test t = "$use_separate_remote"
@@
-178,8
+187,6
@@
fi
# Turn the source into an absolute path if
# it is local
# Turn the source into an absolute path if
# it is local
-repo="$1"
-local=no
if base=$(get_repo_base "$repo"); then
repo="$base"
local=yes
if base=$(get_repo_base "$repo"); then
repo="$base"
local=yes
@@
-370,16
+377,22
@@
then
Pull: refs/heads/$head_points_at:refs/$origin_tracking" &&
case "$use_separate_remote" in
t) git-update-ref HEAD "$head_sha1" ;;
Pull: refs/heads/$head_points_at:refs/$origin_tracking" &&
case "$use_separate_remote" in
t) git-update-ref HEAD "$head_sha1" ;;
- *) git-update-ref "refs/
$origin" $(git-rev-parse HEAD)
+ *) git-update-ref "refs/
heads/$origin" $(git-rev-parse HEAD) ;;
esac &&
(cd "$GIT_DIR/$remote_top" && find . -type f -print) |
while read dotslref
do
name=`expr "$dotslref" : './\(.*\)'` &&
test "$head_points_at" = "$name" ||
esac &&
(cd "$GIT_DIR/$remote_top" && find . -type f -print) |
while read dotslref
do
name=`expr "$dotslref" : './\(.*\)'` &&
test "$head_points_at" = "$name" ||
- test "$origin" = "$
head
" ||
+ test "$origin" = "$
name
" ||
echo "Pull: refs/heads/${name}:$remote_top/${name}"
echo "Pull: refs/heads/${name}:$remote_top/${name}"
- done >>"$GIT_DIR/remotes/$origin"
+ done >>"$GIT_DIR/remotes/$origin" &&
+ case "$use_separate_remote" in
+ t)
+ rm -f "refs/remotes/$origin/HEAD"
+ git-symbolic-ref "refs/remotes/$origin/HEAD" \
+ "refs/remotes/$origin/$head_points_at"
+ esac
esac
case "$no_checkout" in
esac
case "$no_checkout" in