mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-clone.sh: properly configure remote even if remote's head is dangling

Browse Source 
When cloning a remote repository which's HEAD refers to a nonexistent
ref, git-clone cloned all existing refs, but failed to write the
configuration for 'remote'.  Now it detects the dangling remote HEAD,
refuses to checkout any local branch since HEAD refers to nowhere, but
properly writes the configuration for 'remote', so that subsequent
'git fetch's don't fail.

The problem was reported by Daniel Jacobowitz through
 http://bugs.debian.org/466581

Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Gerrit Pape
2008-02-20 15:10:17 +00:00
committed by Junio C Hamano
parent fbd538c262
commit 5274ba6907
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
git-clone.sh
View File

@ -409,11 +409,12 @@ else
cd "$D" || exit cd "$D" || exit
fi fi
if test -z "$bare" && test -f "$GIT_DIR/REMOTE_HEAD" if test -z "$bare"
then then
# a non-bare repository is always in separate-remote layout # a non-bare repository is always in separate-remote layout
remote_top="refs/remotes/$origin" remote_top="refs/remotes/$origin"
head_sha1=`cat "$GIT_DIR/REMOTE_HEAD"` head_sha1=
test ! -r "$GIT_DIR/REMOTE_HEAD" || head_sha1=`cat "$GIT_DIR/REMOTE_HEAD"`
case "$head_sha1" in case "$head_sha1" in
'ref: refs/'*) 'ref: refs/'*)
# Uh-oh, the remote told us (http transport done against # Uh-oh, the remote told us (http transport done against
@ -470,9 +471,16 @@ then
git config branch."$head_points_at".merge "refs/heads/$head_points_at" git config branch."$head_points_at".merge "refs/heads/$head_points_at"
;; ;;
'') '')
# Source had detached HEAD pointing nowhere if test -z "$head_sha1"
git update-ref --no-deref HEAD "$head_sha1" && then
rm -f "refs/remotes/$origin/HEAD" # Source had nonexistent ref in HEAD
echo >&2 "Warning: Remote HEAD refers to nonexistent ref, unable to checkout."
no_checkout=t
else
# Source had detached HEAD pointing nowhere
git update-ref --no-deref HEAD "$head_sha1" &&
rm -f "refs/remotes/$origin/HEAD"
fi
;; ;;
esac esac

8
t/t5701-clone-local.sh
View File

@ -63,4 +63,12 @@ test_expect_success 'Even without -l, local will make a hardlink' '
test 0 = $copied test 0 = $copied
' '
test_expect_success 'local clone of repo with nonexistent ref in HEAD' '
cd "$D" &&
echo "ref: refs/heads/nonexistent" > a.git/HEAD &&
git clone a d &&
cd d &&
git fetch &&
test ! -e .git/refs/remotes/origin/HEAD'
test_done test_done