Merge branch 'jk/send-pack'
authorJunio C Hamano <gitster@pobox.com>
Sun, 25 Nov 2007 00:45:37 +0000 (16:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 25 Nov 2007 00:45:37 +0000 (16:45 -0800)
* jk/send-pack: (24 commits)
send-pack: cluster ref status reporting
send-pack: fix "everything up-to-date" message
send-pack: tighten remote error reporting
make "find_ref_by_name" a public function
Fix warning about bitfield in struct ref
send-pack: assign remote errors to each ref
send-pack: check ref->status before updating tracking refs
send-pack: track errors for each ref
git-push: add documentation for the newly added --mirror mode
Add tests for git push'es mirror mode
Update the tracking references only if they were succesfully updated on remote
Add a test checking if send-pack updated local tracking branches correctly
git-push: plumb in --mirror mode
Teach send-pack a mirror mode
send-pack: segfault fix on forced push
Reteach builtin-ls-remote to understand remotes
send-pack: require --verbose to show update of tracking refs
receive-pack: don't mention successful updates
more terse push output
Build in ls-remote
...

1  2 
Makefile
builtin-fetch.c
builtin.h
cache.h
git.c
refs.c
transport.c
diff --cc Makefile
index 8809b0ace6d55f4d33f820f0031fe7b4ac84e9a2,af827f6ef63be2072dded20f33c2a0fddb76e26f..ccf522adce9fccb8b94ebc26d686a995d900ebbf
+++ b/Makefile
@@@ -213,8 -211,7 +213,7 @@@ BASIC_LDFLAGS 
  
  SCRIPT_SH = \
        git-bisect.sh git-checkout.sh \
 -      git-clean.sh git-clone.sh git-commit.sh \
 +      git-clone.sh git-commit.sh \
-       git-ls-remote.sh \
        git-merge-one-file.sh git-mergetool.sh git-parse-remote.sh \
        git-pull.sh git-rebase.sh git-rebase--interactive.sh \
        git-repack.sh git-request-pull.sh \
diff --cc builtin-fetch.c
Simple merge
diff --cc builtin.h
Simple merge
diff --cc cache.h
Simple merge
diff --cc git.c
Simple merge
diff --cc refs.c
Simple merge
diff --cc transport.c
Simple merge