gitweb.git
Merge branch 'jk/mailmap-cleanup' into maintJunio C Hamano Sun, 23 Dec 2012 04:36:42 +0000 (20:36 -0800)

Merge branch 'jk/mailmap-cleanup' into maint

* jk/mailmap-cleanup:
contrib: update stats/mailmap script
.mailmap: normalize emails for Linus Torvalds
.mailmap: normalize emails for Jeff King
.mailmap: fix broken entry for Martin Langhoff
.mailmap: match up some obvious names/emails

Merge branch 'ta/doc-cleanup' into maintJunio C Hamano Sun, 23 Dec 2012 04:35:34 +0000 (20:35 -0800)

Merge branch 'ta/doc-cleanup' into maint

* ta/doc-cleanup:
Documentation: build html for all files in technical and howto
Documentation/howto: convert plain text files to asciidoc
Documentation/technical: convert plain text files to asciidoc
Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt
Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1
Split over-long synopsis in git-fetch-pack.txt into several lines

Sort howto documents in howto-index.txtThomas Ackermann Sat, 22 Dec 2012 18:34:27 +0000 (19:34 +0100)

Sort howto documents in howto-index.txt

Howto documents in howto-index.txt were listed in a rather
random order. So better sort them.

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-subtree: fix typo in manpageMichael Schubert Sat, 22 Dec 2012 14:46:02 +0000 (15:46 +0100)

git-subtree: fix typo in manpage

Signed-off-by: Michael Schubert <mschub@elegosoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-subtree: ignore git-subtree executableMichael Schubert Sat, 22 Dec 2012 14:45:40 +0000 (15:45 +0100)

git-subtree: ignore git-subtree executable

Signed-off-by: Michael Schubert <mschub@elegosoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 1.8.1-rc3 v1.8.1-rc3Junio C Hamano Sat, 22 Dec 2012 19:48:47 +0000 (11:48 -0800)

Git 1.8.1-rc3

The changes since -rc2 are mostly documentation updates.

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

Merge branch 'ta/new-command-howto'Junio C Hamano Fri, 21 Dec 2012 23:19:25 +0000 (15:19 -0800)

Merge branch 'ta/new-command-howto'

* ta/new-command-howto:
Move ./technical/api-command.txt to ./howto/new-command.txt

Merge branch 'jc/doc-diff-blobs'Junio C Hamano Fri, 21 Dec 2012 23:19:13 +0000 (15:19 -0800)

Merge branch 'jc/doc-diff-blobs'

"git diff <blob> <blob>" was not documented and was only hinted as
an extension to "git diff <commit> <commit> -- <pathspec>", but
comparison between two blobs are more special than that. It does
not take any pathspec to begin with.

* jc/doc-diff-blobs:
Documentation: Describe "git diff <blob> <blob>" separately

Merge branch 'cr/doc-checkout-branch'Junio C Hamano Fri, 21 Dec 2012 23:19:08 +0000 (15:19 -0800)

Merge branch 'cr/doc-checkout-branch'

Document the magic "git checkout <no-such-branch>" hack to create
local branch out of a remote tracking branch that hasn't been
documented so far.

* cr/doc-checkout-branch:
Documentation/git-checkout.txt: document 70c9ac2 behavior
Documentation/git-checkout.txt: clarify usage

Merge branch 'ta/api-index-doc'Junio C Hamano Fri, 21 Dec 2012 23:19:04 +0000 (15:19 -0800)

Merge branch 'ta/api-index-doc'

* ta/api-index-doc:
Remove misleading date from api-index-skel.txt

Merge branch 'jk/avoid-mailto-invalid-in-doc'Junio C Hamano Fri, 21 Dec 2012 23:18:57 +0000 (15:18 -0800)

Merge branch 'jk/avoid-mailto-invalid-in-doc'

Avoids invalid sample e-mail addresses from becoming mailto links
in the formatted output.

* jk/avoid-mailto-invalid-in-doc:
Documentation: don't link to example mail addresses

Merge branch 'as/doc-for-devs'Junio C Hamano Fri, 21 Dec 2012 23:18:47 +0000 (15:18 -0800)

Merge branch 'as/doc-for-devs'

It might be a better idea to move the text the bottom one adds to
the extended description from the quick checklist part.

* as/doc-for-devs:
Documentation: move support for old compilers to CodingGuidelines
SubmittingPatches: add convention of prefixing commit messages

Merge branch 'sl/readme-gplv2'Junio C Hamano Fri, 21 Dec 2012 23:18:41 +0000 (15:18 -0800)

Merge branch 'sl/readme-gplv2'

Clarify that the project as a whole is GPLv2 only, with some parts
borrowed under different licenses that are compatible with GPLv2.

* sl/readme-gplv2:
README: it does not matter who the current maintainer is
README: Git is released under the GPLv2, not just "the GPL"

Merge branch 'jc/fetch-tags-doc'Junio C Hamano Fri, 21 Dec 2012 23:18:35 +0000 (15:18 -0800)

Merge branch 'jc/fetch-tags-doc'

"git fetch --tags" was explained as if it were "git fetch
--no-no-tags", which is not the case, causing confusion.

* jc/fetch-tags-doc:
fetch --tags: clarify documentation

Merge branch 'nd/index-format-doc'Junio C Hamano Fri, 21 Dec 2012 23:18:31 +0000 (15:18 -0800)

Merge branch 'nd/index-format-doc'

* nd/index-format-doc:
index-format.txt: clarify what is "invalid"

Merge branch 'sl/git-svn-docs'Junio C Hamano Fri, 21 Dec 2012 23:18:27 +0000 (15:18 -0800)

Merge branch 'sl/git-svn-docs'

* sl/git-svn-docs:
git-svn: Note about tags.
git-svn: Expand documentation for --follow-parent
git-svn: Recommend use of structure options.
git-svn: Document branches with at-sign(@).

Merge branch 'jk/mailmap-cleanup'Junio C Hamano Fri, 21 Dec 2012 23:18:20 +0000 (15:18 -0800)

Merge branch 'jk/mailmap-cleanup'

Update various entries in our .mailmap file.

* jk/mailmap-cleanup:
contrib: update stats/mailmap script
.mailmap: normalize emails for Linus Torvalds
.mailmap: normalize emails for Jeff King
.mailmap: fix broken entry for Martin Langhoff
.mailmap: match up some obvious names/emails

Move ./technical/api-command.txt to ./howto/new-command.txtThomas Ackermann Fri, 21 Dec 2012 18:05:28 +0000 (19:05 +0100)

Move ./technical/api-command.txt to ./howto/new-command.txt

The contents of this document does not describe any particular API, but
is more about the way to add a new command, which belongs to the "How To"
section of the documentation suite.

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

http.c: Avoid username prompt for certifcate credentialsRene Bredlau Fri, 21 Dec 2012 16:31:19 +0000 (17:31 +0100)

http.c: Avoid username prompt for certifcate credentials

If sslCertPasswordProtected is set to true do not ask for username to decrypt rsa key. This question is pointless, the key is only protected by a password. Internaly the username is simply set to "".

Signed-off-by: Rene Bredlau <git@unrelated.de>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

refs: do not use cached refs in repack_without_refJeff King Fri, 21 Dec 2012 08:04:49 +0000 (03:04 -0500)

refs: do not use cached refs in repack_without_ref

When we delete a ref that is packed, we rewrite the whole
packed-refs file and simply omit the ref that no longer
exists. However, we base the rewrite on whatever happens to
be in our refs cache, not what is necessarily on disk. That
opens us up to a race condition if another process is
simultaneously packing the refs, as we will overwrite their
newly-made pack-refs file with our potentially stale data,
losing commits.

You can demonstrate the race like this:

# setup some repositories
git init --bare parent &&
(cd parent && git config core.logallrefupdates true) &&
git clone parent child &&
(cd child && git commit --allow-empty -m base)

# in one terminal, repack the refs repeatedly
cd parent &&
while true; do
git pack-refs --all
done

# in another terminal, simultaneously push updates to
# master, and create and delete an unrelated ref
cd child &&
while true; do
git push origin HEAD:newbranch &&
git commit --allow-empty -m foo
us=`git rev-parse master` &&
git push origin master &&
git push origin :newbranch &&
them=`git --git-dir=../parent rev-parse master` &&
if test "$them" != "$us"; then
echo >&2 "$them" != "$us"
exit 1
fi
done

In many cases the two processes will conflict over locking
the packed-refs file, and the deletion of newbranch will
simply fail. But eventually you will hit the race, which
happens like this:

1. We push a new commit to master. It is already packed
(from the looping pack-refs call). We write the new
value (let us call it B) to $GIT_DIR/refs/heads/master,
but the old value (call it A) remains in the
packed-refs file.

2. We push the deletion of newbranch, spawning a
receive-pack process. Receive-pack advertises all refs
to the client, causing it to iterate over each ref; it
caches the packed refs in memory, which points at the
stale value A.

3. Meanwhile, a separate pack-refs process is running. It
runs to completion, updating the packed-refs file to
point master at B, and deleting $GIT_DIR/refs/heads/master
which also pointed at B.

4. Back in the receive-pack process, we get the
instruction to delete :newbranch. We take a lock on
packed-refs (which works, as the other pack-refs
process has already finished). We then rewrite the
contents using the cached refs, which contain the stale
value A.

The resulting packed-refs file points master once again at
A. The loose ref which would override it to point at B was
deleted (rightfully) in step 3. As a result, master now
points at A. The only trace that B ever existed in the
parent is in the reflog: the final entry will show master
moving from A to B, even though the ref still points at A
(so you can detect this race after the fact, because the
next reflog entry will move from A to C).

We can fix this by invalidating the packed-refs cache after
we have taken the lock. This means that we will re-read the
packed-refs file, and since we have the lock, we will be
sure that what we read will be atomically up-to-date when we
write (it may be out of date with respect to loose refs, but
that is OK, as loose refs take precedence).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Remove duplicate entry in ./Documentation/MakefileThomas Ackermann Wed, 19 Dec 2012 18:15:25 +0000 (19:15 +0100)

Remove duplicate entry in ./Documentation/Makefile

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

compat/fnmatch: update old-style definition to ANSIJunio C Hamano Wed, 19 Dec 2012 16:54:25 +0000 (08:54 -0800)

compat/fnmatch: update old-style definition to ANSI

We try to avoid touching borrowed code, but we encourage people to
write without old-style definition and compile with -Werror these
days, and on platforms that need to use NO_FNMATCH, these three
functions make the compilation fail.

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

t9020: use configured Python to run the test helperJunio C Hamano Wed, 19 Dec 2012 04:41:15 +0000 (20:41 -0800)

t9020: use configured Python to run the test helper

The test helper svnrdump_sim.py is used as "svnrdump" during the
execution of this test, but the arrangement was not optimal:

- it relied on symbolic links;
- unportable "export VAR=VAL" was used;
- GIT_BUILD_DIR variable was not quoted correctly;
- it assumed that the Python interpreter is in /usr/bin/ and
called "python" (i.e. not "python2.7" etc.)

Rework this by writing a small shell script that spawns the right
Python interpreter, using the right quoting.

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

t3600: Avoid "cp -a", which is a GNUismJunio C Hamano Wed, 19 Dec 2012 02:47:50 +0000 (18:47 -0800)

t3600: Avoid "cp -a", which is a GNUism

With d4a7ffa (tests: "cp -a" is a GNUism, 2012-10-08), we got rid of
most of them, but the ones in a topic that was still in flight were
missed.

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

Merge branch 'jc/maint-test-portability' into 'jc/test... Junio C Hamano Wed, 19 Dec 2012 15:46:05 +0000 (07:46 -0800)

Merge branch 'jc/maint-test-portability' into 'jc/test-portability'

* jc/maint-test-portability:
t4014: fix arguments to grep
t9502: do not assume GNU tar
t0200: "locale" may not exist

t4014: fix arguments to grepJunio C Hamano Wed, 19 Dec 2012 03:13:30 +0000 (19:13 -0800)

t4014: fix arguments to grep

These "expect-failure" tests were not looking for the right string
in the patch file. For example:

grep "^ *"S. E. Cipient" <scipient@example.com>\$" patch5

was looking for "^ *S." in these three files:

"E."
"Cipient <scipient@example.com>$"
"patch5"

With some implementations of grep, the lack of file "E." was
reported as an error, leading to the failure of the test.

With other implementations of grep, the pattern "^ *S." matched what
was in patch5, without diagnosing the missing files as an error, and
made these tests unexpectedly pass.

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

t9502: do not assume GNU tarJunio C Hamano Wed, 19 Dec 2012 04:57:13 +0000 (20:57 -0800)

t9502: do not assume GNU tar

The check_snapshot function makes sure that no cruft outside the
repository hierarchy is added to the tar archive. The output from
"tar tf" on the resulting archive is inspected to see if there is
anything that does not begin with "$prefix/".

There are two issues with this implementation:

- Traditional tar implemenations that do not understand
pax_global_header will write it out as if it is a plain file at
the top-level;

- Some implementations of tar do not add trailing slash when
showing a directory entry (i.e. the output line for the entire
archive will show "$prefix", not "$prefix/").

Fix them so that what we want to validate can be tested with
traditional tar implementations.

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

t0200: "locale" may not existJunio C Hamano Wed, 19 Dec 2012 06:44:56 +0000 (22:44 -0800)

t0200: "locale" may not exist

On systems without "locale" installed, t0200-gettext-basic.sh leaked
error messages when checking if some test locales are available.
Hide them, as they are not very useful.

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

Merge branch 'maint'Junio C Hamano Tue, 18 Dec 2012 23:35:01 +0000 (15:35 -0800)

Merge branch 'maint'

* maint:
t7004: do not create unneeded gpghome/gpg.conf when GPG is not used

xmkstemp(): avoid showing truncated template more carefullyJunio C Hamano Tue, 18 Dec 2012 20:51:35 +0000 (12:51 -0800)

xmkstemp(): avoid showing truncated template more carefully

Some implementations of xmkstemp() leaves the given in/out buffer
truncated when they return with failure.

6cf6bb3 (Improve error messages when temporary file creation fails,
2010-12-18) attempted to show the real filename we tried to create
(but failed), and if that is not available due to such truncation,
to show the original template that was given by the caller.

But it failed to take into account that the given template could
have "directory/" in front, in which case the truncation point may
not be template[0] but somewhere else.

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

Documentation: Describe "git diff <blob> <blob>" separatelyJunio C Hamano Tue, 18 Dec 2012 19:35:28 +0000 (11:35 -0800)

Documentation: Describe "git diff <blob> <blob>" separately

As it was not a common operation, it was described as if it is a
side note for the more common two-commit variant, but this mode
behaves very differently, e.g. it does not make any sense to ask
recursive behaviour, or give the command a pathspec.

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

t7004: do not create unneeded gpghome/gpg.conf when... Junio C Hamano Tue, 18 Dec 2012 19:26:24 +0000 (11:26 -0800)

t7004: do not create unneeded gpghome/gpg.conf when GPG is not used

These tests themselves are properly protected by the GPG
prerequisite, but one of the set-up steps outside the
test_expect_success block unconditionally assumed that there is a
gpghome/ directory, which is not true if GPG is not being used.

It may be a good idea to move the whole set-up steps in the test but
that is a follow-up topic.

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

Documentation/git-checkout.txt: document 70c9ac2 behaviorChris Rorvick Mon, 17 Dec 2012 06:45:02 +0000 (00:45 -0600)

Documentation/git-checkout.txt: document 70c9ac2 behavior

Document the behavior implemented in 70c9ac2 (DWIM "git checkout
frotz" to "git checkout -b frotz origin/frotz").

Signed-off-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/git-checkout.txt: clarify usageChris Rorvick Mon, 17 Dec 2012 06:45:01 +0000 (00:45 -0600)

Documentation/git-checkout.txt: clarify usage

The forms of checkout that do not take a path are lumped together in
the DESCRIPTION section, but the description for this group is
dominated by explanation of the -b|-B form.

Split these apart for more clarity.

Signed-off-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sync with 'maint'Junio C Hamano Tue, 18 Dec 2012 18:51:22 +0000 (10:51 -0800)

Sync with 'maint'

Merge branch 'jk/pickaxe-textconv' into maintJunio C Hamano Tue, 18 Dec 2012 18:50:07 +0000 (10:50 -0800)

Merge branch 'jk/pickaxe-textconv' into maint

"git log -p -S<string>" now looks for the <string> after applying
the textconv filter (if defined); earlier it inspected the contents
of the blobs without filtering.

clarify -M without % symbol in diff-optionsSitaram Chamarty Tue, 18 Dec 2012 10:47:09 +0000 (16:17 +0530)

clarify -M without % symbol in diff-options

Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add directory pattern matching to attributesJean-Noël AVILA Sat, 8 Dec 2012 20:04:39 +0000 (21:04 +0100)

Add directory pattern matching to attributes

The manpage of gitattributes says: "The rules how the pattern
matches paths are the same as in .gitignore files" and the gitignore
pattern matching has a pattern ending with / for directory matching.

This rule is specifically relevant for the 'export-ignore' rule used
for git archive.

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-svn, perl/Git.pm: extend and use Git->prompt method... Sven Strickroth Tue, 18 Dec 2012 00:28:48 +0000 (01:28 +0100)

git-svn, perl/Git.pm: extend and use Git->prompt method for querying users

git-svn reads usernames and other user queries from an interactive
terminal. This cause GUIs (w/o STDIN connected) to hang waiting forever
for git-svn to complete (http://code.google.com/p/tortoisegit/issues/detail?id=967).

This change extends the Git::prompt helper, so that it can also be used
for non password queries, and makes use of it instead of using
hand-rolled prompt-response code that only works with the interactive
terminal.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPA... Sven Strickroth Tue, 18 Dec 2012 00:28:47 +0000 (01:28 +0100)

perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set

If GIT_ASKPASS environment variable is not set, git-svn does not try to use
SSH_ASKPASS as git-core does. This change adds a fallback to SSH_ASKPASS.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-svn, perl/Git.pm: add central method for prompting... Sven Strickroth Tue, 18 Dec 2012 00:28:45 +0000 (01:28 +0100)

git-svn, perl/Git.pm: add central method for prompting passwords

git-svn reads passwords from an interactive terminal or by using
GIT_ASKPASS helper tool. This cause GUIs (w/o STDIN connected) to hang
waiting forever for git-svn to complete
(http://code.google.com/p/tortoisegit/issues/detail?id=967).

Commit 56a853b62c0ae7ebaad0a7a0a704f5ef561eb795 also tried to solve
this issue, but was incomplete as described above.

Instead of using hand-rolled prompt-response code that only works with the
interactive terminal, a reusable prompt() method is introduced in this commit.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: move support for old compilers to Coding... Adam Spiers Sun, 16 Dec 2012 19:36:00 +0000 (19:36 +0000)

Documentation: move support for old compilers to CodingGuidelines

The "Try to be nice to older C compilers" text is clearly a guideline
to be borne in mind whilst coding rather than when submitting patches.

Signed-off-by: Adam Spiers <git@adamspiers.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

SubmittingPatches: add convention of prefixing commit... Adam Spiers Sun, 16 Dec 2012 19:35:59 +0000 (19:35 +0000)

SubmittingPatches: add convention of prefixing commit messages

Conscientious newcomers to git development will read SubmittingPatches
and CodingGuidelines, but could easily miss the convention of
prefixing commit messages with a single word identifying the file
or area the commit touches.

Signed-off-by: Adam Spiers <git@adamspiers.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: don't link to example mail addressesJohn Keeping Sun, 16 Dec 2012 14:00:29 +0000 (14:00 +0000)

Documentation: don't link to example mail addresses

Email addresses in documentation are converted into mailto: hyperlinks
in the HTML output and footnotes in man pages. This isn't desirable for
cases where the address is used as an example and is not valid.

Particularly annoying is the example "jane@laptop.(none)" which appears
in git-shortlog(1) as "jane@laptop[1].(none)", with note 1 saying:

1. jane@laptop
mailto:jane@laptop

Fix this by escaping these email addresses with a leading backslash, to
prevent Asciidoc expanding them as inline macros.

In the case of mailmap.txt, render the address monospaced so that it
matches the block examples surrounding that paragraph.

Helped-by: Jeff King <peff@peff.net>
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Remove misleading date from api-index-skel.txtThomas Ackermann Sun, 16 Dec 2012 08:42:49 +0000 (09:42 +0100)

Remove misleading date from api-index-skel.txt

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

cache-tree: invalidate i-t-a paths after generating... Nguyễn Thái Ngọc Duy Sun, 16 Dec 2012 04:15:28 +0000 (11:15 +0700)

cache-tree: invalidate i-t-a paths after generating trees

Intent-to-add entries used to forbid writing trees so it was not a
problem. After commit 3f6d56d (commit: ignore intent-to-add entries
instead of refusing - 2012-02-07), we can generate trees from an index
with i-t-a entries.

However, the commit forgets to invalidate all paths leading to i-t-a
entries. With fully valid cache-tree (e.g. after commit or
write-tree), diff operations may prefer cache-tree to index and not
see i-t-a entries in the index, because cache-tree does not have them.

Reported-by: Jonathon Mah <me@JonathonMah.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

cache-tree: fix writing cache-tree when CE_REMOVE is... Nguyễn Thái Ngọc Duy Sun, 16 Dec 2012 04:15:27 +0000 (11:15 +0700)

cache-tree: fix writing cache-tree when CE_REMOVE is present

entry_count is used in update_one() for two purposes:

1. to skip through the number of processed entries in in-memory index
2. to record the number of entries this cache-tree covers on disk

Unfortunately when CE_REMOVE is present these numbers are not the same
because CE_REMOVE entries are automatically removed before writing to
disk but entry_count is not adjusted and still counts CE_REMOVE
entries.

Separate the two use cases into two different variables. #1 is taken
care by the new field count in struct cache_tree_sub and entry_count
is prepared for #2.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

cache-tree: replace "for" loops in update_one with... Nguyễn Thái Ngọc Duy Sun, 16 Dec 2012 04:15:26 +0000 (11:15 +0700)

cache-tree: replace "for" loops in update_one with "while" loops

The loops in update_one can be increased in two different ways: step
by one for files and by <n> for directories. "for" loop is not
suitable for this as it always steps by one and special handling is
required for directories. Replace them with "while" loops for clarity.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

cache-tree: remove dead i-t-a code in verify_cache()Nguyễn Thái Ngọc Duy Sun, 16 Dec 2012 04:15:25 +0000 (11:15 +0700)

cache-tree: remove dead i-t-a code in verify_cache()

This code is added in 331fcb5 (git add --intent-to-add: do not let an
empty blob be committed by accident - 2008-11-28) to forbid committing
when i-t-a entries are present. When we allow that, we forgot to
remove this.

Noticed-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

README: it does not matter who the current maintainer isJunio C Hamano Sun, 16 Dec 2012 06:24:10 +0000 (22:24 -0800)

README: it does not matter who the current maintainer is

The audience of this introductory document does not have to know nor
interact with the maintainer, so drop the mention of him. Other
documents such as SubmittingPatches may be a more suitable place to
have it.

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

README: Git is released under the GPLv2, not just ... Stefano Lattarini Fri, 14 Dec 2012 15:37:47 +0000 (16:37 +0100)

README: Git is released under the GPLv2, not just "the GPL"

And this is clearly stressed by Linus in the COPYING file. So make it
clear in the README as well, to avoid possible misunderstandings.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 1.8.1-rc2 v1.8.1-rc2Junio C Hamano Sat, 15 Dec 2012 19:19:02 +0000 (11:19 -0800)

Git 1.8.1-rc2

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

completion: complete refs for "git commit -c"Jeff King Sat, 15 Dec 2012 17:46:43 +0000 (12:46 -0500)

completion: complete refs for "git commit -c"

The "-c" and "-C" options take an existing commit, so let's
complete refs, just as we would for --squash or --fixup.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Renumber list in api-command.txtThomas Ackermann Sat, 15 Dec 2012 08:29:07 +0000 (09:29 +0100)

Renumber list in api-command.txt

Start list with 1 instead of 0; ASCIIDOC will renumber it anyway.

Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

remote-testsvn: fix unitialized variableJeff King Fri, 14 Dec 2012 22:11:44 +0000 (17:11 -0500)

remote-testsvn: fix unitialized variable

In remote-test-svn, there is a parse_rev_note function to
parse lines of the form "Revision-number" from notes. If it
finds such a line and parses it, it returns 0, copying the
value into a "struct rev_note". If it finds an entry that is
garbled or out of range, it returns -1 to signal an error.

However, if it does not find any "Revision-number" line at
all, it returns success but does not put anything into the
rev_note. So upon a successful return, the rev_note may or
may not be initialized, and the caller has no way of
knowing.

gcc does not usually catch the use of the unitialized
variable because the conditional assignment happens in a
separate function from the point of use. However, when
compiling with -O3, gcc will inline parse_rev_note and
notice the problem.

We can fix it by returning "-1" when no note is found (so on
a zero return, we always found a valid value).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fetch --tags: clarify documentationJunio C Hamano Fri, 14 Dec 2012 00:19:45 +0000 (16:19 -0800)

fetch --tags: clarify documentation

Explain that --tags is just like another explicit refspec on the
command line and as such overrides the default refspecs configured
via the remote.$name.fetch variable.

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

Merge branch 'maint'Junio C Hamano Thu, 13 Dec 2012 19:13:56 +0000 (11:13 -0800)

Merge branch 'maint'

Fix sizeof usage in get_permutationsMatthew Daley Thu, 13 Dec 2012 13:36:30 +0000 (02:36 +1300)

Fix sizeof usage in get_permutations

Currently it gets the size of an otherwise unrelated, unused variable
instead of the expected struct size.

Signed-off-by: Matthew Daley <mattjd@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'mh/doc-remote-helpers'Junio C Hamano Thu, 13 Dec 2012 19:00:15 +0000 (11:00 -0800)

Merge branch 'mh/doc-remote-helpers'

* mh/doc-remote-helpers:
git-remote-helpers.txt: clarify options & ref list attributes
git-remote-helpers.txt: clarify command <-> capability correspondences
git-remote-helpers.txt: rearrange description of capabilities
git-remote-helpers.txt: minor grammar fix
git-remote-helpers.txt: document missing capabilities
git-remote-helpers.txt: document invocation before input format

git.txt: add missing info about --git-dir command-line... Manlio Perillo Thu, 13 Dec 2012 17:57:19 +0000 (18:57 +0100)

git.txt: add missing info about --git-dir command-line option

Unlike other environment variables (e.g. GIT_WORK_TREE, GIT_NAMESPACE),
the Documentation/git.txt file did not mention that the GIT_DIR
environment variable can also be set using the --git-dir command line
option.

Signed-off-by: Manlio Perillo <manlio.perillo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

index-format.txt: clarify what is "invalid"Nguyễn Thái Ngọc Duy Thu, 13 Dec 2012 01:14:47 +0000 (08:14 +0700)

index-format.txt: clarify what is "invalid"

A cache-tree entry with a negative entry count is considered invalid
by the current Git; it records that we do not know the object name
of a tree that would result by writing the directory covered by the
cache-tree as a tree object.

Clarify that any entry with a negative entry count is invalid, but
the implementations must write -1 there. This way, we can later
decide to allow writers to use negative values other than -1 to
encode optional information on such invalidated entries without
harming interoperability; we do not know what will be encoded and
how, so we keep these other negative values as reserved for now.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git(1): show link to contributor summary pageJunio C Hamano Wed, 12 Dec 2012 18:06:24 +0000 (10:06 -0800)

git(1): show link to contributor summary page

We earlier removed a link to list of contributors that pointed to a
defunct page; let's use a working one from Ohloh.net to replace it
instead.

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

contrib: update stats/mailmap scriptJeff King Wed, 12 Dec 2012 11:41:41 +0000 (06:41 -0500)

contrib: update stats/mailmap script

This version changes quite a few things:

1. The original parsed the mailmap file itself, and it did
it wrong (it did not understand entries with an extra
email key).

Instead, this version uses git's "%aE" and "%aN"
formats to have git perform the mapping, meaning we do
not have to read .mailmap at all, but still operate on
the current state that git sees (and it also works
properly from subdirs).

2. The original would find multiple names for an email,
but not the other way around.

This version can do either or both. If we find multiple
emails for a name, the resolution is less obvious than
the other way around. However, it can still be a
starting point for a human to investigate.

3. The original would order only by count, not by recency.

This version can do either. Combined with showing the
counts, it can be easier to decide how to resolve.

4. This version shows similar entries in a blank-delimited
stanza, which makes it more clear which options you are
picking from.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

.mailmap: normalize emails for Linus TorvaldsJeff King Wed, 12 Dec 2012 11:41:04 +0000 (06:41 -0500)

.mailmap: normalize emails for Linus Torvalds

Linus used a lot of different per-machine email addresses in
the early days. This means that "git shortlog -nse" does not
aggregate his counts, and he is listed well below where he
should be (8th instead of 3rd).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

.mailmap: normalize emails for Jeff KingJeff King Wed, 12 Dec 2012 11:38:26 +0000 (06:38 -0500)

.mailmap: normalize emails for Jeff King

I never meant anything special by using my @github.com
address; it is merely a mistake that it has sometimes bled
through to patches.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

.mailmap: fix broken entry for Martin LanghoffJeff King Wed, 12 Dec 2012 11:38:06 +0000 (06:38 -0500)

.mailmap: fix broken entry for Martin Langhoff

Commit adc3192 (Martin Langhoff has a new e-mail address,
2010-10-05) added a mailmap entry, but forgot that both the
old and new email addresses need to appear for one to be
mapped to the other (i.e., we do not key mailmap emails by
name).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

.mailmap: match up some obvious names/emailsJeff King Wed, 12 Dec 2012 11:36:35 +0000 (06:36 -0500)

.mailmap: match up some obvious names/emails

This patch updates git's .mailmap in cases where multiple
names are matched to a single email. The "master" name for
each email was chosen by:

1. If the only difference is in the presence or absence
of accented characters, the accented form is chosen
(under the assumption that it is the natural spelling,
and accents are sometimes stripped in email).

2. Otherwise, the most commonly used name is chosen.

3. If all names are equally common, the most recently used name is
chosen.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'so/prompt-command'Junio C Hamano Wed, 12 Dec 2012 19:08:13 +0000 (11:08 -0800)

Merge branch 'so/prompt-command'

* so/prompt-command:
git-prompt.sh: update PROMPT_COMMAND documentation

git-prompt.sh: update PROMPT_COMMAND documentationJunio C Hamano Tue, 11 Dec 2012 23:04:36 +0000 (15:04 -0800)

git-prompt.sh: update PROMPT_COMMAND documentation

The description of __git_ps1 function operating in two-arg mode was
not very clear. It said "set PROMPT_COMMAND=__git_ps1" which is not
the right usage for this mode, followed by "To customize the prompt,
do this", giving a false impression that those who do not want to
customize it can get away with no-arg form, which was incorrect.

Make it clear that this mode always takes two arguments, pre and
post, with an example.

The straight-forward one should be listed as the primary usage, and
the confusing one should be an alternate for advanced users. Swap
the order of these two.

Acked-by: Simon Oosthoek <s.oosthoek@xs4all.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

nedmalloc: Fix a compile warning (exposed as error... Sebastian Schuberth Tue, 11 Dec 2012 20:34:51 +0000 (21:34 +0100)

nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2

On MinGW, GCC 4.7.2 complains about

operation on 'p->m[end]' may be undefined

Fix this by replacing the faulty lines with those of 69825ca from

https://github.com/ned14/nedmalloc/blob/master/nedmalloc.c

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add file completion to tcsh git completion.Marc Khouzam Tue, 11 Dec 2012 21:36:57 +0000 (21:36 +0000)

Add file completion to tcsh git completion.

For bash completion, the option '-o bashdefault' is used to indicate
that when no other choices are available, file completion should be
performed. Since this option is not available in tcsh, no file
completion is ever performed. Therefore, commands like 'git add ',
'git send-email ', etc, require the user to manually type out
the file name. This can be quite annoying.

To improve the user experience we try to simulate file completion
directly in this script (although not perfectly).

The known issues with the file completion simulation are:
- Possible completions are shown with their directory prefix.
- Completions containing shell variables are not handled.
- Completions with ~ as the first character are not handled.

Signed-off-by: Marc Khouzam <marc.khouzam@ericsson.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'ef/mingw-rmdir'Junio C Hamano Tue, 11 Dec 2012 23:51:14 +0000 (15:51 -0800)

Merge branch 'ef/mingw-rmdir'

MinGW has a workaround when rmdir unnecessarily fails to retry with
a prompt, but the logic was kicking in when the rmdir failed with
ENOTEMPTY, i.e. was expected to fail and there is no point retrying.

* ef/mingw-rmdir:
mingw_rmdir: do not prompt for retry when non-empty

Merge branch 'ef/mingw-tty-getpass'Junio C Hamano Tue, 11 Dec 2012 23:51:09 +0000 (15:51 -0800)

Merge branch 'ef/mingw-tty-getpass'

Update getpass() emulation for MinGW.

* ef/mingw-tty-getpass:
mingw: get rid of getpass implementation
mingw: reuse tty-version of git_terminal_prompt
compat/terminal: separate input and output handles
compat/terminal: factor out echo-disabling
mingw: make fgetc raise SIGINT if apropriate
mingw: correct exit-code for SIGALRM's SIG_DFL

Merge branch 'maint'Junio C Hamano Tue, 11 Dec 2012 23:50:10 +0000 (15:50 -0800)

Merge branch 'maint'

* maint:
git-prompt: Document GIT_PS1_DESCRIBE_STYLE

git-prompt: Document GIT_PS1_DESCRIBE_STYLEAnders Kaseorg Tue, 11 Dec 2012 23:20:24 +0000 (18:20 -0500)

git-prompt: Document GIT_PS1_DESCRIBE_STYLE

GIT_PS1_DESCRIBE_STYLE was introduced in v1.6.3.2~35. Document it in the
header comments.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

fetch: ignore wildcarded refspecs that update local... Junio C Hamano Tue, 11 Dec 2012 21:00:52 +0000 (13:00 -0800)

fetch: ignore wildcarded refspecs that update local symbolic refs

In a repository cloned from somewhere else, you typically have a
symbolic ref refs/remotes/origin/HEAD pointing at the 'master'
remote-tracking ref that is next to it. When fetching into such a
repository with "git fetch --mirror" from another repository that
was similarly cloned, the implied wildcard refspec refs/*:refs/*
will end up asking to update refs/remotes/origin/HEAD with the
object at refs/remotes/origin/HEAD at the remote side, while asking
to update refs/remotes/origin/master the same way. Depending on the
order the two updates happen, the latter one would find that the
value of the ref before it is updated has changed from what the code
expects.

When the user asks to update the underlying ref via the symbolic ref
explicitly without using a wildcard refspec, e.g. "git fetch $there
refs/heads/master:refs/remotes/origin/HEAD", we should still let him
do so, but when expanding wildcard refs, it will result in a more
intuitive outcome if we simply ignore local symbolic refs.

As the purpose of the symbolic ref refs/remotes/origin/HEAD is to
follow the ref it points at (e.g. refs/remotes/origin/master), its
value would change when the underlying ref is updated.

Earlier commit da3efdb (receive-pack: detect aliased updates which
can occur with symrefs, 2010-04-19) fixed a similar issue for "git
push".

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

gitweb: Sort projects with undefined ages lastMatthew Daley Tue, 11 Dec 2012 10:56:07 +0000 (23:56 +1300)

gitweb: Sort projects with undefined ages last

Sorting gitweb's project list by age ('Last Change') currently shows
projects with undefined ages at the head of the list. This gives a less
useful result when there are a number of projects that are missing or
otherwise faulty and one is trying to see what projects have been
updated recently.

Fix by sorting these projects with undefined ages at the bottom of the
list when sorting by age.

Signed-off-by: Matthew Daley <mattjd@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

strbuf_add_wrapped*(): Remove unused return valueSteffen Prohaska Tue, 11 Dec 2012 05:59:22 +0000 (06:59 +0100)

strbuf_add_wrapped*(): Remove unused return value

Since shortlog isn't using the return value anymore (see previous
commit), the functions can be changed to void.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

shortlog: fix wrapping lines of wraplenSteffen Prohaska Tue, 11 Dec 2012 05:59:21 +0000 (06:59 +0100)

shortlog: fix wrapping lines of wraplen

A recent commit [1] fixed a off-by-one wrapping error. As a
side-effect, the conditional in add_wrapped_shortlog_msg() to decide
whether to append a newline needs to be removed. The function
should always append a newline, which was the case before the
off-by-one fix, because strbuf_add_wrapped_text() never returns a
value of wraplen; when it returns wraplen, the string does not end
with a newline, so this caller needs to add one anyway.

[1] 14e1a4e1ff70aff36db3f5d2a8b806efd0134d50 utf8: fix off-by-one
wrapping of text

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

sh-setup: work around "unset IFS" bug in some shellsJunio C Hamano Fri, 7 Dec 2012 22:31:52 +0000 (14:31 -0800)

sh-setup: work around "unset IFS" bug in some shells

With an unset IFS, field splitting is supposed to act as if IFS is
set to the usual SP HT LF, but Marc Branchaud reports that the shell
on FreeBSD 7.2 gets this wrong.

It is easy to set it to the default value manually, and it is also
safer in case somebody tries to save the old value away and restore,
e.g.

$oIFS=$IFS
IFS=something
...
IFS=$oIFS

while forgetting that the original IFS might be unset (which can be
coded but would be more involved).

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

Sync with 1.8.0.2Junio C Hamano Mon, 10 Dec 2012 21:07:12 +0000 (13:07 -0800)

Sync with 1.8.0.2

* maint:
Git 1.8.0.2
Documentation/git-stash.txt: add a missing verb
git(1): remove a defunct link to "list of authors"

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

Git 1.8.0.2 v1.8.0.2Junio C Hamano Mon, 10 Dec 2012 21:05:47 +0000 (13:05 -0800)

Git 1.8.0.2

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

format_commit_message(): simplify calls to logmsg_reenc... Junio C Hamano Mon, 10 Dec 2012 20:50:10 +0000 (12:50 -0800)

format_commit_message(): simplify calls to logmsg_reencode()

All the other callers of logmsg_reencode() pass return value of
get_commit_output_encoding() or get_log_output_encoding(). Teach
the function to optionally take NULL as a synonym to "" aka "no
conversion requested" so that we can simplify the only remaining
calling site.

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

Makefile: whitespace style fixes in macro definitionsStefano Lattarini Sun, 9 Dec 2012 10:36:17 +0000 (11:36 +0100)

Makefile: whitespace style fixes in macro definitions

Consistently use a single space before and after the "=" (or ":=", "+=",
etc.) in assignments to make macros. Granted, this was not a big deal,
but I did find the needless inconsistency quite distracting.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

mingw_rmdir: do not prompt for retry when non-emptyErik Faye-Lund Mon, 10 Dec 2012 14:42:27 +0000 (15:42 +0100)

mingw_rmdir: do not prompt for retry when non-empty

in ab1a11be ("mingw_rmdir: set errno=ENOTEMPTY when appropriate"),
a check was added to prevent us from retrying to delete a directory
that is both in use and non-empty.

However, this logic was slightly flawed; since we didn't return
immediately, we end up falling out of the retry-loop, but right into
the prompting-loop.

Fix this by setting errno, and guarding the prompting-loop with an
errno-check.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/git-stash.txt: add a missing verbSébastien Loriot Mon, 10 Dec 2012 07:22:34 +0000 (08:22 +0100)

Documentation/git-stash.txt: add a missing verb

Signed-off-by: Sébastien Loriot <sloriot.ml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git(1): remove a defunct link to "list of authors"Junio C Hamano Fri, 7 Dec 2012 17:54:50 +0000 (09:54 -0800)

git(1): remove a defunct link to "list of authors"

The linked page has not been showing the promised "more complete
list" for more than 6 months by now, and nobody has resurrected
the list there nor elsewhere since then.

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

Git 1.8.1-rc1 v1.8.1-rc1Junio C Hamano Fri, 7 Dec 2012 22:18:55 +0000 (14:18 -0800)

Git 1.8.1-rc1

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

Documentation/diff-config: work around AsciiDoc misfortuneJunio C Hamano Fri, 7 Dec 2012 23:15:59 +0000 (15:15 -0800)

Documentation/diff-config: work around AsciiDoc misfortune

The line that happens to begin with indent followed by "3. " was
interpreted as if it was an enumerated list; just wrap the lines
differently to work it around for now.

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

Merge branch 'maint'Junio C Hamano Fri, 7 Dec 2012 22:16:52 +0000 (14:16 -0800)

Merge branch 'maint'

* maint:
Update draft release notes to 1.8.0.2

Update draft release notes to 1.8.0.2Junio C Hamano Fri, 7 Dec 2012 22:16:38 +0000 (14:16 -0800)

Update draft release notes to 1.8.0.2

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

Merge branch 'jc/doc-push-satellite' into maintJunio C Hamano Fri, 7 Dec 2012 22:11:21 +0000 (14:11 -0800)

Merge branch 'jc/doc-push-satellite' into maint

* jc/doc-push-satellite:
Documentation/git-push.txt: clarify the "push from satellite" workflow

Merge branch 'jc/same-encoding' into maintJunio C Hamano Fri, 7 Dec 2012 22:10:56 +0000 (14:10 -0800)

Merge branch 'jc/same-encoding' into maint

Various codepaths checked if two encoding names are the same using
ad-hoc code and some of them ended up asking iconv() to convert
between "utf8" and "UTF-8". The former is not a valid way to spell
the encoding name, but often people use it by mistake, and we
equated them in some but not all codepaths. Introduce a new helper
function to make these codepaths consistent.

* jc/same-encoding:
reencode_string(): introduce and use same_encoding()

Merge branch 'lt/diff-stat-show-0-lines' into maintJunio C Hamano Fri, 7 Dec 2012 22:10:17 +0000 (14:10 -0800)

Merge branch 'lt/diff-stat-show-0-lines' into maint

"git diff --stat" miscounted the total number of changed lines when
binary files were involved and hidden beyond --stat-count. It also
miscounted the total number of changed files when there were
unmerged paths.

* lt/diff-stat-show-0-lines:
t4049: refocus tests
diff --shortstat: do not count "unmerged" entries
diff --stat: do not count "unmerged" entries
diff --stat: move the "total count" logic to the last loop
diff --stat: use "file" temporary variable to refer to data->files[i]
diff --stat: status of unmodified pair in diff-q is not zero
test: add failing tests for "diff --stat" to t4049
Fix "git diff --stat" for interesting - but empty - file changes

git-remote-helpers.txt: clarify options & ref list... Max Horn Tue, 27 Nov 2012 23:03:26 +0000 (00:03 +0100)

git-remote-helpers.txt: clarify options & ref list attributes

The documentation was misleading in that it gave the impression that
'for-push' could be used as a ref attribute in the output of the
'list' command. That is wrong.

Also, explicitly point out the connection between the commands
'list' and 'options' on the one hand, and the sections
'REF LIST ATTRIBUTES' and 'OPTIONS' on the other hand.

Signed-off-by: Max Horn <max@quendi.de>
Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-remote-helpers.txt: clarify command <-> capability... Max Horn Tue, 27 Nov 2012 23:03:25 +0000 (00:03 +0100)

git-remote-helpers.txt: clarify command <-> capability correspondences

In particular, document 'list for-push' separately from 'list', as
the former needs only be supported for the push/export
capabilities, and the latter only for fetch/import. Indeed, a
hypothetically 'push-only' helper would only need to support the
former, not the latter.

Signed-off-by: Max Horn <max@quendi.de>
Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-remote-helpers.txt: rearrange description of capabi... Max Horn Tue, 27 Nov 2012 23:03:24 +0000 (00:03 +0100)

git-remote-helpers.txt: rearrange description of capabilities

This also remove some duplication in the descriptions
(e.g. refspec was explained twice with similar level of detail).

Signed-off-by: Max Horn <max@quendi.de>
Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-remote-helpers.txt: minor grammar fixMax Horn Tue, 27 Nov 2012 23:03:23 +0000 (00:03 +0100)

git-remote-helpers.txt: minor grammar fix

Signed-off-by: Max Horn <max@quendi.de>
Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-remote-helpers.txt: document missing capabilitiesMax Horn Tue, 27 Nov 2012 23:03:22 +0000 (00:03 +0100)

git-remote-helpers.txt: document missing capabilities

Specifically, document the 'export' and '(im|ex)port-marks'
capabilities as well as the export command, which were
undocumented (but in active use).

Signed-off-by: Max Horn <max@quendi.de>
Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-remote-helpers.txt: document invocation before... Max Horn Tue, 27 Nov 2012 23:03:21 +0000 (00:03 +0100)

git-remote-helpers.txt: document invocation before input format

In the distant past, the order things were documented was
'Invocation', 'Commands', 'Capabilities', ...

Then it was decided that before giving a list of Commands, there
should be an overall description of the 'Input format', which was
a wise decision. However, this description was put as the very
first thing, with the rationale that any implementor would want
to know that first.

However, it seems an implementor would actually first need to
know how the remote helper will be invoked, so moving
'Invocation' to the front again seems logical. Moreover, we now
don't switch from discussing the input format to the invocation
style and then back to input related stuff.

Signed-off-by: Max Horn <max@quendi.de>
Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>