gitweb.git
Merge branch 'ms/subtree-fixlets' into maintJunio C Hamano Tue, 8 Jan 2013 19:17:10 +0000 (11:17 -0800)

Merge branch 'ms/subtree-fixlets' into maint

* ms/subtree-fixlets:
git-subtree: fix typo in manpage
git-subtree: ignore git-subtree executable

Merge branch 'ss/nedmalloc-compilation' into maintJunio C Hamano Tue, 8 Jan 2013 19:17:07 +0000 (11:17 -0800)

Merge branch 'ss/nedmalloc-compilation' into maint

* ss/nedmalloc-compilation:
nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2

Merge branch 'jc/maint-fnmatch-old-style-definition... Junio C Hamano Tue, 8 Jan 2013 19:17:05 +0000 (11:17 -0800)

Merge branch 'jc/maint-fnmatch-old-style-definition' into maint

* jc/maint-fnmatch-old-style-definition:
compat/fnmatch: update old-style definition to ANSI

Merge branch 'jc/test-portability' into maintJunio C Hamano Tue, 8 Jan 2013 19:17:03 +0000 (11:17 -0800)

Merge branch 'jc/test-portability' into maint

* jc/test-portability:
t9020: use configured Python to run the test helper
t3600: Avoid "cp -a", which is a GNUism

Merge branch 'jc/maint-fbsd-sh-ifs-workaround' into... Junio C Hamano Tue, 8 Jan 2013 19:17:01 +0000 (11:17 -0800)

Merge branch 'jc/maint-fbsd-sh-ifs-workaround' into maint

* jc/maint-fbsd-sh-ifs-workaround:
sh-setup: work around "unset IFS" bug in some shells

Merge branch 'jc/mkstemp-more-careful-error-reporting... Junio C Hamano Tue, 8 Jan 2013 19:16:58 +0000 (11:16 -0800)

Merge branch 'jc/mkstemp-more-careful-error-reporting' into maint

* jc/mkstemp-more-careful-error-reporting:
xmkstemp(): avoid showing truncated template more carefully

Merge branch 'jc/test-cvs-no-init-in-existing-dir'... Junio C Hamano Tue, 8 Jan 2013 19:16:56 +0000 (11:16 -0800)

Merge branch 'jc/test-cvs-no-init-in-existing-dir' into maint

* jc/test-cvs-no-init-in-existing-dir:
t9200: let "cvs init" create the test repository

Merge branch 'jc/maint-test-portability' into maintJunio C Hamano Tue, 8 Jan 2013 19:16:52 +0000 (11:16 -0800)

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

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

remote-hg: Fix biridectionality -> bidirectionality... W. Trevor King Tue, 8 Jan 2013 15:47:37 +0000 (10:47 -0500)

remote-hg: Fix biridectionality -> bidirectionality typos

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 1.8.1 v1.8.1Junio C Hamano Mon, 31 Dec 2012 22:24:22 +0000 (14:24 -0800)

Git 1.8.1

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

Merge branch 'so/prompt-command'Junio C Hamano Fri, 28 Dec 2012 00:00:07 +0000 (16:00 -0800)

Merge branch 'so/prompt-command'

Finishing touches...

* so/prompt-command:
make __git_ps1 accept a third parameter in pcmode

Sync with 1.8.0.3Junio C Hamano Thu, 27 Dec 2012 23:59:42 +0000 (15:59 -0800)

Sync with 1.8.0.3

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

Git 1.8.0.3 v1.8.0.3Junio C Hamano Thu, 27 Dec 2012 23:57:20 +0000 (15:57 -0800)

Git 1.8.0.3

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>

Merge branch 'sl/maint-git-svn-docs' into maintJunio C Hamano Thu, 27 Dec 2012 23:38:34 +0000 (15:38 -0800)

Merge branch 'sl/maint-git-svn-docs' into maint

* sl/maint-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(@).

git-svn: Note about tags.Sebastian Leske Fri, 23 Nov 2012 07:29:38 +0000 (08:29 +0100)

git-svn: Note about tags.

Document that 'git svn' will import SVN tags as branches.

Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-svn: Expand documentation for --follow-parentSebastian Leske Fri, 30 Nov 2012 07:16:30 +0000 (08:16 +0100)

git-svn: Expand documentation for --follow-parent

Describe what the option --follow-parent does, and what happens if it is
set or unset.

Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-svn: Recommend use of structure options.Sebastian Leske Fri, 30 Nov 2012 07:16:30 +0000 (08:16 +0100)

git-svn: Recommend use of structure options.

Document that when using git svn, one should usually either use the
directory structure options to import branches as branches, or only
import one subdirectory. The default behaviour of cloning all branches
and tags as subdirectories in the working copy is usually not what the
user wants.

Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-svn: Document branches with at-sign(@).Sebastian Leske Fri, 30 Nov 2012 07:16:30 +0000 (08:16 +0100)

git-svn: Document branches with at-sign(@).

git svn sometimes creates branches with an at-sign in the name
(branchname@revision). These branches confuse many users and it is a FAQ
why they are created. Document when git svn creates them.

Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'gb/maint-doc-svn-log-window-size' into... Junio C Hamano Thu, 27 Dec 2012 23:34:37 +0000 (15:34 -0800)

Merge branch 'gb/maint-doc-svn-log-window-size' into maint

* branch 'gb/maint-doc-svn-log-window-size':
Document git-svn fetch --log-window-size parameter

Merge branch 'km/maint-doc-git-reset' into maintJunio C Hamano Thu, 27 Dec 2012 23:32:27 +0000 (15:32 -0800)

Merge branch 'km/maint-doc-git-reset' into maint

* branch 'km/maint-doc-git-reset':
doc: git-reset: make "<mode>" optional

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>

Merge branch 'jk/avoid-mailto-invalid-in-doc' into... Junio C Hamano Thu, 27 Dec 2012 23:27:46 +0000 (15:27 -0800)

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

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

Merge branch 'tj/maint-doc-commit-sign' into maintJunio C Hamano Thu, 27 Dec 2012 23:24:51 +0000 (15:24 -0800)

Merge branch 'tj/maint-doc-commit-sign' into maint

* branch 'tj/maint-doc-commit-sign':
Add -S, --gpg-sign option to manpage of "git commit"

Documentation: move diff.wordRegex from config.txt... Ramkumar Ramachandra Tue, 13 Nov 2012 15:42:44 +0000 (21:12 +0530)

Documentation: move diff.wordRegex from config.txt to diff-config.txt

19299a8 (Documentation: Move diff.<driver>.* from config.txt to
diff-config.txt, 2011-04-07) moved the diff configuration options to
diff-config.txt, but forgot about diff.wordRegex, which was left
behind in config.txt. Fix this.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

make __git_ps1 accept a third parameter in pcmodeSimon Oosthoek Wed, 26 Dec 2012 19:15:05 +0000 (20:15 +0100)

make __git_ps1 accept a third parameter in pcmode

The optional third parameter when __git_ps1 is used in
PROMPT_COMMAND mode as format string for printf to further
customize the way the git status string is embedded in the
user's PS1 prompt.

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

t9200: let "cvs init" create the test repositoryJunio C Hamano Tue, 25 Dec 2012 01:09:49 +0000 (17:09 -0800)

t9200: let "cvs init" create the test repository

Some platforms (e.g. NetBSD 6.0) seem to configure their CVS to
allow "cvs init" in an existing directory only to members of
"cvsadmin".

Instead of preparing an empty directory and then running "cvs init"
on it, let's run "cvs init" and let it create the necessary
directory.

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

Merge branch 'maint'Junio C Hamano Sun, 23 Dec 2012 04:40:07 +0000 (20:40 -0800)

Merge branch 'maint'

Merge branch 'jc/doc-diff-blobs' into maintJunio C Hamano Sun, 23 Dec 2012 04:38:07 +0000 (20:38 -0800)

Merge branch 'jc/doc-diff-blobs' into maint

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

Merge branch 'cr/doc-checkout-branch' into maintJunio C Hamano Sun, 23 Dec 2012 04:38:02 +0000 (20:38 -0800)

Merge branch 'cr/doc-checkout-branch' into maint

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

Merge branch 'ta/api-index-doc' into maintJunio C Hamano Sun, 23 Dec 2012 04:37:42 +0000 (20:37 -0800)

Merge branch 'ta/api-index-doc' into maint

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

Merge branch 'as/doc-for-devs' into maintJunio C Hamano Sun, 23 Dec 2012 04:37:33 +0000 (20:37 -0800)

Merge branch 'as/doc-for-devs' into maint

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

Merge branch 'sl/readme-gplv2' into maintJunio C Hamano Sun, 23 Dec 2012 04:37:27 +0000 (20:37 -0800)

Merge branch 'sl/readme-gplv2' into maint

* 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' into maintJunio C Hamano Sun, 23 Dec 2012 04:37:22 +0000 (20:37 -0800)

Merge branch 'jc/fetch-tags-doc' into maint

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

Merge branch 'nd/index-format-doc' into maintJunio C Hamano Sun, 23 Dec 2012 04:37:09 +0000 (20:37 -0800)

Merge branch 'nd/index-format-doc' into maint

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

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>

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>

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>

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>

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>

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>