This saves us some code, but it also reduces the number of
processes we start for each filtered commit. Since we can
parse both author and committer in the same sed invocation,
we save one process. And since the new interface avoids tr,
we save 4 processes.

It also avoids using "tr", which has had some odd
portability problems reported with from Solaris's xpg6
version.

We also tweak one of the tests in t7003 to double-check that
we are properly exporting the variables (because test-lib.sh
exports GIT_AUTHOR_NAME, it will be automatically exported
in subprograms. We override this to make sure that
filter-branch handles it properly itself).
Signed-off-by: NJeff King <peff@peff.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

The only ident-parsing function we currently provide is
get_author_ident_from_commit. This is not very
flexible for two reasons:

  1. It takes a commit as an argument, and can't read from
     commit headers saved on disk.

  2. It will only parse authors, not committers.

This patch provides a more flexible interface which will
parse multiple idents from a commit provide on stdin. We can
easily use it as a building block for the current function
to retain compatibility.
Signed-off-by: NJeff King <peff@peff.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* git://github.com/git-l10n/git-po:
  l10n: vi.po: update from v1.8.0-rc2-4-g42e55
  l10n: Update Swedish translation (1964t0f0u)

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* jk/maint-http-half-auth-push:
  http: fix segfault in handle_curl_result

* rr/git-uri-doc:
  Git url doc: mark ftp/ftps as read-only and deprecate them

* bw/cp-a-is-gnuism:
  tests: "cp -a" is a GNUism

* nd/doc-ignore:
  gitignore.txt: suggestions how to get literal # or ! at the beginning

* jc/doc-long-options:
  gitcli: parse-options lets you omit tail of long options

* jc/maint-t1450-fsck-order-fix:
  t1450: the order the objects are checked is undefined

* rr/test-use-shell-path-not-shell:
  test-lib: use $SHELL_PATH, not $SHELL

* rr/test-make-sure-we-have-git:
  t/test-lib: make sure Git has already been built

* po/maint-docs:
  Doc branch: show -vv option and alternative
  Doc clean: add See Also link
  Doc add: link gitignore
  Doc: separate gitignore pattern sources
  Doc: shallow clone deepens _to_ new depth

* jc/ll-merge-binary-ours:
  ll-merge: warn about inability to merge binary files only when we can't
  attr: "binary" attribute should choose built-in "binary" merge driver
  merge: teach -Xours/-Xtheirs to binary ll-merge driver

* db/doc-custom-xmlto:
  Documentation/Makefile: Allow custom XMLTO binary

* 'master' of https://github.com/nafmo/git-l10n-sv:
  l10n: Update Swedish translation (1964t0f0u)

* 'master' of git://github.com/vnwildman/git:
  l10n: vi.po: update from v1.8.0-rc2-4-g42e55

* translate 3 new messages
* review quotes
Signed-off-by: NTran Ngoc Quan <vnwildman@gmail.com>

These were used to keep track of the last commit a release notes
entry was written for, and should have been removed when cutting
the final release.
Signed-off-by: NThomas Ackermann <th.acker@arcor.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

We are almost there...
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Fixes a regression in maint-1.7.11 (v1.7.11.7), maint (v1.7.12.1)
and master (v1.8.0-rc0).

* jk/maint-http-half-auth-push:
  http: fix segfault in handle_curl_result

Signed-off-by: NPeter Krefting <peter@softwolves.pp.se>

This po/git.pot update is generated from v1.8.0-rc2-4-g42e55.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

* 'master' of git://github.com/vnwildman/git:
  l10n: vi.po: update translation upto cc76011e

* translate all new messages (100%)
* review some others
Signed-off-by: NTran Ngoc Quan <vnwildman@gmail.com>

* maint:
  Fix spelling error in post-receive-email hook

Signed-off-by: NRichard Fearn <richardfearn@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* maint:
  gitweb.cgi: fix "comitter_tz" typo in feed

When we create an http active_request_slot, we can set its
"results" pointer back to local storage. The http code will
fill in the details of how the request went, and we can
access those details even after the slot has been cleaned
up.

Commit 88097030 (http: factor out http error code handling)
switched us from accessing our local results struct directly
to accessing it via the "results" pointer of the slot. That
means we're accessing the slot after it has been marked as
finished, defeating the whole purpose of keeping the results
storage separate.

Most of the time this doesn't matter, as finishing the slot
does not actually clean up the pointer. However, when using
curl's multi interface with the dumb-http revision walker,
we might actually start a new request before handing control
back to the original caller. In that case, we may reuse the
slot, zeroing its results pointer, and leading the original
caller to segfault while looking for its results inside the
slot.

Instead, we need to pass a pointer to our local results
storage to the handle_curl_result function, rather than
relying on the pointer in the slot struct. This matches what
the original code did before the refactoring (which did not
use a separate function, and therefore just accessed the
results struct directly).
Signed-off-by: NJeff King <peff@peff.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

gitweb's feeds sometimes contained committer timestamps in the wrong timezone
due to a misspelling.
Signed-off-by: NDylan Simon <dylan@dylex.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* rr/git-uri-doc:
  Git url doc: mark ftp/ftps as read-only and deprecate them

* bw/cp-a-is-gnuism:
  tests: "cp -a" is a GNUism

* nd/doc-ignore:
  gitignore.txt: suggestions how to get literal # or ! at the beginning

* jc/doc-long-options:
  gitcli: parse-options lets you omit tail of long options

* maint:
  attr: a note about the order of .gitattributes lookup

* git://bogomips.org/git-svn:
  svn test: escape peg revision separator using empty peg rev
  git svn: work around SVN 1.7 mishandling of svn:special changes

This test script uses "svn cp" to create a branch with an @-sign in
its name:

	svn cp "pr ject/trunk" "pr ject/branches/not-a@{0}reflog"

That sets up for later tests that fetch the branch and check that git
svn mangles the refname appropriately.

Unfortunately, modern svn versions interpret path arguments with an
@-sign as an example of path@revision syntax (which pegs a path to a
particular revision) and truncate the path or error out with message
"svn: E205000: Syntax error parsing peg revision '{0}reflog'".

When using subversion 1.6.x, escaping the @ sign as %40 avoids trouble
(see 08fd28bb, 2010-07-08).  Newer versions are stricter:

	$ svn cp "$repo/pr ject/trunk" "$repo/pr ject/branches/not-a%40{reflog}"
	svn: E205000: Syntax error parsing peg revision '%7B0%7Dreflog'

The recommended method for escaping a literal @ sign in a path passed
to subversion is to add an empty peg revision at the end of the path
("branches/not-a@{0}reflog@").  Do that.

Pre-1.6.12 versions of Subversion probably treat the trailing @ as
another literal @-sign (svn issue 3651).  Luckily ever since
v1.8.0-rc0~155^2~7 (t9118: workaround inconsistency between SVN
versions, 2012-07-28) the test can survive that.

Tested with Debian Subversion 1.6.12dfsg-6 and 1.7.5-1 and r1395837
of Subversion trunk (1.8.x).
Signed-off-by: NJonathan Nieder <jrnieder@gmail.com>
Tested-by: NMichael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: NEric Wong <normalperson@yhbt.net>