git-daemon wrapper to wait until daemon is ready

The shell script which is currently used to parse git daemon output does
not seem to work reliably. In order to work around such issues,
re-implement the same procedure in C and write the daemon pid to a file.

This means that we can no longer wait on the daemon process, since it is
no longer a direct child of the shell process.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
index-pack: disable threading if NO_PREAD is defined

NO_PREAD simulates pread() as a sequence of seek, read, seek in
compat/pread.c. The simulation is not thread-safe because another
thread could move the file offset away in the middle of pread
operation. Do not allow threading in that case.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
fixup! git-rebase: add keep_empty flag

Signed-off-by: Junio C Hamano <gitster@pobox.com>
http: fix proxy password passing

The version of the cURL library that introduced CURLOPT_PROXYPASSWORD
was 7.19.1, so it needs to be spelled 0x071301.

Spotted by Jeff King.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
t9400: fix gnuism in grep

Using "\+" in "grep" and expecting that it means one or more
is a GNUism.  Spell it in a dumb and portable way.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer: remove additional blank line

Remove an additional blank line between the
headline and the list of conflicted files after
doing a recursive merge.

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'ct/advise-push-default' into jch

Breaks down the cases in which "git push" fails due to non-ff into three
categories, and gives separate advise messages.  This should be a good
change regardless of mm/push-default-switch-warning topic.

Will merge to 'master'.

By Christopher Tiwald (2) and Jeff King (1)
* ct/advise-push-default:
  Fix httpd tests that broke when non-ff push advice changed
  clean up struct ref's nonfastforward field
  push: Provide situational hints for non-fast-forward errors
Merge branch 'jc/fmt-merge-msg-people' into jch

The "fmt-merge-msg" command learns to list the primary contributors
involved in the side topic you are merging.

Will merge to 'master'.

* jc/fmt-merge-msg-people:
  fmt-merge-msg: show those involved in a merged series
Merge branch 'jb/am-include' into jch

"git am" learned the "--include" option, which is an opposite of existing
the "--exclude" option.

Will merge to 'master'.

By Johannes Berg
* jb/am-include:
  am: support --include option
Merge branch 'jc/am-report-3way' into jch

When "git am -3" needs to fall back to an application to a synthesized
preimage followed by a 3-way merge, the paths that needed such treatment
are now reported to the end user, so that the result in them can be
eyeballed with extra care.

Will merge to 'master'.

* jc/am-report-3way:
  am -3: list the paths that needed 3-way fallback
Merge branch 'jc/push-upstream-sanity' into jch

Fix broken 'push to upstream' implementation.  "git push $there" without
refspec, when the current branch is set to push to a remote different from
$there, used to push to $there using the upstream information to a remote
unreleated to $there.

Will merge to 'master'.

* jc/push-upstream-sanity:
  push: error out when the "upstream" semantics does not make sense
Merge branch 'jk/run-command-eacces' into jch

When PATH contains an unreadable directory, alias expansion code did not
kick in, and failed with an error that said "git-subcmd" was not found.

Will merge to 'master'.

By Jeff King (1) and Ramsay Jones (1)
* jk/run-command-eacces:
  run-command: treat inaccessible directories as ENOENT
  compat/mingw.[ch]: Change return type of exec functions to int
Merge branch 'bw/submodule-sed-solaris' into jch

Will merge to 'master'.

By Ben Walton
* bw/submodule-sed-solaris:
  Avoid bug in Solaris xpg4/sed as used in submodule
Merge branch 'jn/debian-customizes-default-editor' into jch

By Jonathan Nieder
* jn/debian-customizes-default-editor:
  var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings
  var doc: default editor and pager are configurable at build time
Merge branch 'ms/remote-usage-string' into jch

As an independent follow-up, we may want to rethink how the overall usage
string and subcommand usage strings are maintained.

By Michael Schubert
* ms/remote-usage-string:
  remote: update builtin usage
Merge branch 'pw/git-p4' into jch

By Pete Wyckoff
* pw/git-p4:
  git p4: use "git p4" directly in tests
  git p4: update name in script
  git-p4: move to toplevel
Merge branch 'ld/git-p4-tags-and-labels' into jch

A review from Pete Wyckoff needs to be addressed.
Message-ID: <20120418113422.GB19994@padd.com>

By Luke Diamand
* ld/git-p4-tags-and-labels:
  git p4: import/export of labels to/from p4
  git p4: Fixing script editor checks
Merge branch 'rs/commit-list-sort-in-batch' into jch

By René Scharfe (3) and Junio C Hamano (1)
* rs/commit-list-sort-in-batch:
  mergesort: rename it to llist_mergesort()
  revision: insert unsorted, then sort in prepare_revision_walk()
  commit: use mergesort() in commit_list_sort_by_date()
  add mergesort() for linked lists
Merge branch 'rl/show-empty-prefix' into jch

By Ross Lagerwall
* rl/show-empty-prefix:
  rev-parse --show-prefix: add in trailing newline
Merge branch 'sl/test-wc-l-line-count' into jch

By Stefano Lattarini
* sl/test-wc-l-line-count:
  tests: modernise style: more uses of test_line_count