The logic to decide when to store fetched head/tag under
$GIT_DIR/refs/, and http transport were broken in the previous
round.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
---
*** I see you have already merged my broken one; sorry.
*** Anything written under the influence should be tested as twice
*** as hard than usual before being sent --- Don't drink and
*** develop ;-). *Blush*
cd /opt/packrat/playpen/public/in-place/git/git.junio/
jit-diff 8:10
# - 4: Documentation: describe short-hand used in fetch/pull.
# + 6: git-fetch-script: fix thinko in http fetch.
diff --git a/git-fetch-script b/git-fetch-script
--- 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
@@ -27,10 +27,10 @@ esac || exit 1
git-rev-parse --verify "$head" > /dev/null || exit 1
-case "$merge_store" in
-'')
+if test "$merge_store"
+then
echo "$head" > "$GIT_DIR/$merge_store"
-esac &&
+fi &&
# FETCH_HEAD is fed to git-resolve-script which will eventually be
# passed to git-commit-tree as one of the parents. Make sure we do
Compilation finished at Sat Jul 16 09:37:07
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
