From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 25 Nov 2007 00:45:37 +0000 (-0800)
Subject: Merge branch 'jk/send-pack'
X-Git-Tag: v1.5.4-rc0~152
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fd200790dc518f297bfd538a53e232802904f1de;p=git.git

Merge branch 'jk/send-pack'

* 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
  ...
---

fd200790dc518f297bfd538a53e232802904f1de
diff --cc Makefile
index 8809b0ace,af827f6ef..ccf522adc
--- a/Makefile
+++ 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 \