>>>>> "LT" == Linus Torvalds <[EMAIL PROTECTED]> writes:
LT> Merged. Here's the command line history:
LT> ~/git/git-pull-script \
Maybe it is just me, but I have this setup:
$ /bin/ls -lF .git
-rw-rw-r-- 1 junio src 41 Apr 18 16:03 HEAD
-rw-rw-r-- 1 junio junio 41 Apr 18 15:07 MERGE_HEAD
-rw------- 1 junio src 2720 Apr 18 16:03 index
lrwxrwxrwx 1 junio src 18 Apr 18 15:55 objects -> ../../.git/objects/
My point being that .git/objects is a symbolic link and shares
object database with somewhere else.
However the "Getting object database" part trashed this symlink
when I tried to pull from my other repo locally. I am wondering
it the following might be a better alternative. A possible
downside in this approach is that you would not pull .git/heads
and .git/tags (i.e. Pesky stuff) from the remote anymore. Is it
a problem (I am also CC'ing Petr to hear his opinion on this).
If not, please apply.
[PATCH] Do not let rsync obliterate .git/object symbolic link.
Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]>
@@ -6,7 +6,7 @@
echo "Getting object database"
-rsync -avz --ignore-existing $merge_repo/ .git/
+rsync -avz --ignore-existing $merge_repo/objects/. .git/objects/.
echo "Getting remote head"
rsync -avz $merge_repo/HEAD .git/MERGE_HEAD
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