X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-fetch-script;h=b44cf3f5a5bf61788ae6dc384ed59841ddd1f517;hb=f0b32737ad5a35cc047db47353a75faccfe5939e;hp=fce43e6dc07c698eba292f5f07f9c24786280e0e;hpb=98e031f0bb6e857c684e6db24d03d22cfc1a532a;p=git.git diff --git a/git-fetch-script b/git-fetch-script index fce43e6d..b44cf3f5 100755 --- a/git-fetch-script +++ b/git-fetch-script @@ -12,7 +12,7 @@ case "$merge_repo" in http://*) head=$(wget -q -O - "$merge_repo/$merge_head") || exit 1 echo Fetching "$merge_head" using http - git-http-pull -v -a "$merge_head" "$merge_repo/" + git-http-pull -v -a "$head" "$merge_repo/" ;; rsync://*) rsync -L "$merge_repo/$merge_head" "$TMP_HEAD" || exit 1 @@ -29,6 +29,8 @@ git-rev-parse --verify "$head" > /dev/null || exit 1 case "$merge_store" in '') + ;; +*) echo "$head" > "$GIT_DIR/$merge_store" esac &&