gitweb.git
Merge git://github.com/git-l10n/git-poJunio C Hamano Mon, 2 Feb 2015 20:05:56 +0000 (12:05 -0800)

Merge git://github.com/git-l10n/git-po

* git://github.com/git-l10n/git-po:
l10n: ca.po: Fix trailing whitespace

CodingGuidelines: describe naming rules for configurati... Junio C Hamano Tue, 27 Jan 2015 20:26:03 +0000 (12:26 -0800)

CodingGuidelines: describe naming rules for configuration variables

We may want to say something about command line option names in the
new section as well, but for now, let's make sure everybody is clear
on how to structure and name their configuration variables.

The text for the rules are partly taken from the log message of
Jonathan's 6b3020a2 (add: introduce add.ignoreerrors synonym for
add.ignore-errors, 2010-12-01).

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

l10n: ca.po: Fix trailing whitespaceAlex Henrie Fri, 30 Jan 2015 22:02:34 +0000 (15:02 -0700)

l10n: ca.po: Fix trailing whitespace

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>

Documentation/git-remote.txt: stress that set-url is... Junio C Hamano Thu, 29 Jan 2015 20:26:09 +0000 (12:26 -0800)

Documentation/git-remote.txt: stress that set-url is not for triangular

It seems to be a common mistake to try using a single remote
(e.g. 'origin') to fetch from one place (i.e. upstream) while
pushing to another (i.e. your publishing point).

That will never work satisfactorily, and it is easy to understand
why if you think about what refs/remotes/origin/* would mean in such
a world. It fundamentally cannot reflect the reality. If it
follows the state of your upstream, it cannot match what you have
published, and vice versa.

It may be that misinformation is spread by some people. Let's
counter them by adding a few words to our documentation.

- The description was referring to <oldurl> and <newurl>, but never
mentioned <name> argument you give from the command line. By
mentioning "remote <name>", stress the fact that it is configuring
a single remote.

- Add a reminder that explicitly states that this is about a single
remote, which the triangular workflow is not about.

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

t/lib-gpg: sanity-check that we can actually signJeff King Thu, 29 Jan 2015 15:51:11 +0000 (10:51 -0500)

t/lib-gpg: sanity-check that we can actually sign

Some older versions of gpg (reportedly v1.2.6 from RHEL4) cannot
import the keyrings found in our test suite, and thus cannot even
make a signature. The previous change works it around, but we
cannot anticipate breakages update to GPG would cause in the future.

Do a test-sign before declaring the GPG prerequisite fulfilled
to future-proof our tests.

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

t/lib-gpg: include separate public keys in keyring.gpgJeff King Thu, 29 Jan 2015 15:43:20 +0000 (10:43 -0500)

t/lib-gpg: include separate public keys in keyring.gpg

Since 1e3eefb (tests: replace binary GPG keyrings with
ASCII-armored keys, 2014-12-12), we import our test GPG keys
from a single file. Each keypair in the import stream
contains both the secret and public keys. However, older
versions of gpg reportedly fail to import the public half of
the key. We can solve this by including duplicates of the
public keys separately. The duplicates are ignored by modern
gpg, and this makes older versions work.

Reported by Tom G. Christensen <tgc@statsbiblioteket.dk> on
gpg 1.2.6 (from RHEL4).

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

t4122: use test_write_lines from test-lib-functionsJunio C Hamano Thu, 29 Jan 2015 05:15:24 +0000 (21:15 -0800)

t4122: use test_write_lines from test-lib-functions

Instead of using a custom lecho function, just use what the test
framework already gives us.

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

diff-format doc: a score can follow M for rewriteJunio C Hamano Wed, 28 Jan 2015 21:17:19 +0000 (13:17 -0800)

diff-format doc: a score can follow M for rewrite

b6d8f309 (diff-raw format update take #2., 2005-05-23) started
documenting the diff format, and it said

...
(8) sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".
(9) status, followed by similarlity index number only for C and R.
(10) a tab or a NUL when '-z' option is used.
...

because C and R _were_ the only ones that came with a number back
then. This was corrected by ddafa7e9 (diff-helper: Fix R/C score
parsing under -z flag., 2005-05-29) and we started saying "score"
instead of "similarlity index" (because we can have other kind of
score there), and stopped saying "only for C and R" (because Git is
an ever evolving system). Later f345b0a0 (Add -B flag to diff-*
brothers., 2005-05-30) introduced a new concept, "dissimilarity"
score; it did not have to fix any documentation.

The current text that says only C and R can have scores came
independently from a5a323f3 (Add reference for status letters in
documentation., 2008-11-02) and it was wrong from the day one.

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

git-push.txt: document the behavior of --repoMichael J Gruber Tue, 27 Jan 2015 12:35:53 +0000 (13:35 +0100)

git-push.txt: document the behavior of --repo

As per the code, the --repo <repo> option is equivalent to the
<repo> argument to 'git push', but somehow it was documented as
something that is more than that. [It exists for historical
reasons, back from the time when options had to come before
arguments.]

Say so. [But not that.]

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

do not check truth value of flex arraysJeff King Wed, 28 Jan 2015 17:58:50 +0000 (12:58 -0500)

do not check truth value of flex arrays

There is no point in checking "!ref->name" when ref is a
"struct ref". The name field is a flex-array, and there
always has a non-zero address. This is almost certainly not
hurting anything, but it does cause clang-3.6 to complain.

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

read_and_strip_branch: fix typo'd address-of operatorJeff King Wed, 28 Jan 2015 17:57:35 +0000 (12:57 -0500)

read_and_strip_branch: fix typo'd address-of operator

When we are chomping newlines from the end of a strbuf, we
must check "sb.len != 0" before accessing "sb.buf[sb.len - 1]".
However, this code mistakenly checks "&sb.len", which is
always true (it is a part of an auto struct, so the address
is always non-zero). This could lead to us accessing memory
outside the strbuf when we read an empty file.

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

config.txt: mark deprecated variables more prominentlyJunio C Hamano Tue, 27 Jan 2015 20:25:48 +0000 (12:25 -0800)

config.txt: mark deprecated variables more prominently

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

config.txt: clarify that add.ignore-errors is deprecatedJunio C Hamano Tue, 27 Jan 2015 20:19:11 +0000 (12:19 -0800)

config.txt: clarify that add.ignore-errors is deprecated

The old text gave an impression that even in a new repository using
old form might be safer. Only Git from pre 1.7.0 days choke on the
correctly named variable, which is ancient by today's standard.

We have no intention to remove the support for deprecated ones, but
let's make sure that we do not give room for confused questions such
as "why does core.sparse-checkout not work, when add.ignore-errors
does?"

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

http: add Accept-Language header if possibleYi EungJun Wed, 28 Jan 2015 12:04:37 +0000 (21:04 +0900)

http: add Accept-Language header if possible

Add an Accept-Language header which indicates the user's preferred
languages defined by $LANGUAGE, $LC_ALL, $LC_MESSAGES and $LANG.

Examples:
LANGUAGE= -> ""
LANGUAGE=ko:en -> "Accept-Language: ko, en;q=0.9, *;q=0.1"
LANGUAGE=ko LANG=en_US.UTF-8 -> "Accept-Language: ko, *;q=0.1"
LANGUAGE= LANG=en_US.UTF-8 -> "Accept-Language: en-US, *;q=0.1"

This gives git servers a chance to display remote error messages in
the user's preferred language.

Limit the number of languages to 1,000 because q-value must not be
smaller than 0.001, and limit the length of Accept-Language header to
4,000 bytes for some HTTP servers which cannot accept such long header.

Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 2.3.0-rc2 v2.3.0-rc2Junio C Hamano Tue, 27 Jan 2015 22:39:53 +0000 (14:39 -0800)

Git 2.3.0-rc2

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

dumb-http: do not pass NULL path to parse_pack_indexJeff King Tue, 27 Jan 2015 20:02:27 +0000 (15:02 -0500)

dumb-http: do not pass NULL path to parse_pack_index

Once upon a time, dumb http always fetched .idx files
directly into their final location, and then checked their
validity with parse_pack_index. This was refactored in
commit 750ef42 (http-fetch: Use temporary files for
pack-*.idx until verified, 2010-04-19), which uses the
following logic:

1. If we have the idx already in place, see if it's
valid (using parse_pack_index). If so, use it.

2. Otherwise, fetch the .idx to a tempfile, check
that, and if so move it into place.

3. Either way, fetch the pack itself if necessary.

However, it got step 1 wrong. We pass a NULL path parameter
to parse_pack_index, so an existing .idx file always looks
broken. Worse, we do not treat this broken .idx as an
opportunity to re-fetch, but instead return an error,
ignoring the pack entirely. This can lead to a dumb-http
fetch failing to retrieve the necessary objects.

This doesn't come up much in practice, because it must be a
packfile that we found out about (and whose .idx we stored)
during an earlier dumb-http fetch, but whose packfile we
_didn't_ fetch. I.e., we did a partial clone of a
repository, didn't need some packfiles, and now a followup
fetch needs them.

Discovery and tests by Charles Bailey <charles@hashpling.org>.

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

Merge git://github.com/git-l10n/git-poJunio C Hamano Tue, 27 Jan 2015 19:01:05 +0000 (11:01 -0800)

Merge git://github.com/git-l10n/git-po

* git://github.com/git-l10n/git-po:
l10n: de.po: correct singular form
l10n: de.po: translate "leave behind" correctly
l10n: de.po: fix typo
l10n: ca.po: update translation

Merge branch 'master' of git://github.com/alexhenrie... Jiang Xin Tue, 27 Jan 2015 07:00:48 +0000 (15:00 +0800)

Merge branch 'master' of git://github.com/alexhenrie/git-po

* 'master' of git://github.com/alexhenrie/git-po:
l10n: ca.po: update translation

commit: reword --author error messageMichael J Gruber Mon, 26 Jan 2015 15:48:33 +0000 (16:48 +0100)

commit: reword --author error message

If an --author argument is specified but does not contain a '>' then git tries
to find the argument within the existing authors; and gives the error
message "No existing author found with '%s'" if there is no match.

This is confusing for users who try to specify a valid complete author
name.

Rename the error message to make it clearer that the failure has two
reasons in this case.

(This codepath is touched only when we know already that the argument
cannot be a completely wellformed author ident.)

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

l10n: de.po: correct singular formMichael J Gruber Mon, 26 Jan 2015 15:34:32 +0000 (16:34 +0100)

l10n: de.po: correct singular form

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>

l10n: de.po: translate "leave behind" correctlyMichael J Gruber Mon, 26 Jan 2015 15:34:31 +0000 (16:34 +0100)

l10n: de.po: translate "leave behind" correctly

This message is about leaving orphaned commits behind, not about
behind an upstream branch. Try to make this clear.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>

l10n: de.po: fix typoBenedikt Heine Sun, 25 Jan 2015 11:00:04 +0000 (12:00 +0100)

l10n: de.po: fix typo

Signed-off-by: Benedikt Heine <bebe@bebehei.de>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>

l10n: ca.po: update translationAlex Henrie Mon, 26 Jan 2015 17:12:50 +0000 (10:12 -0700)

l10n: ca.po: update translation

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>

wincred: fix get credential if username has "@"Aleksey Vasenev Wed, 19 Nov 2014 21:47:32 +0000 (00:47 +0300)

wincred: fix get credential if username has "@"

Such a username with "@" in it isn't all that unusual these days.

cf. https://groups.google.com/forum/#!msg/msysgit/YVuCqmwwRyY/HULHj5OoE88J

Signed-off-by: Aleksey Vasenev <margtu-fivt@ya.ru>
Acked-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation: what does "git log --indexed-objects... Junio C Hamano Fri, 23 Jan 2015 19:49:05 +0000 (11:49 -0800)

Documentation: what does "git log --indexed-objects" even mean?

4fe10219 (rev-list: add --indexed-objects option, 2014-10-16) adds
"--indexed-objects" option to "rev-list", and it is only useful in
the context of "git rev-list" and not "git log". There are other
object traversal options that do not make sense for "git log" that
are shown in the manual page.

Move the description of "--indexed-objects" to the object traversal
section so that it sits together with its friends "--objects",
"--objects-edge", etc. and then show them only in "git rev-list"
documentation.

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

git-p4: correct --prepare-p4-only instructionsLuke Diamand Fri, 23 Jan 2015 09:15:12 +0000 (09:15 +0000)

git-p4: correct --prepare-p4-only instructions

If you use git-p4 with the "--prepare-p4-only" option, then
it prints the p4 command line to use. However, the command
line was incorrect: the changelist specification must be
supplied on standard input, not as an argument to p4.

Signed-off-by: Luke Diamand <luke@diamand.org>
Acked-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

add -i: return from list_and_choose if there is no... Alexander Kuleshov Thu, 22 Jan 2015 08:39:44 +0000 (14:39 +0600)

add -i: return from list_and_choose if there is no candidate

The list_and_choose() helper is given a prompt and a list, asks the
user to make selection from the list, and then returns a list of
items chosen. Even when it is given an empty list as the original
candidate set to choose from, it gave a prompt to the user, who can
only say "I am done choosing".

Return an empty result when the input is an empty list without
bothering the user. The existing caller must already have a logic
to say "Nothing to do" or an equivalent when the returned list is
empty (i.e. the user chose to select nothing) if it is necessary, so
no change to the callers is necessary.

This fixes the case where "add untracked" is asked in "git add -i"
and there is no untracked files in the working tree. We used to give
an empty list of files to choose from with a prompt, but with this
change, we no longer do.

Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'js/t1050'Junio C Hamano Thu, 22 Jan 2015 21:46:45 +0000 (13:46 -0800)

Merge branch 'js/t1050'

* js/t1050:
t1050-large: generate large files without dd

Merge branch 'ak/cat-file-clean-up'Junio C Hamano Thu, 22 Jan 2015 21:46:38 +0000 (13:46 -0800)

Merge branch 'ak/cat-file-clean-up'

* ak/cat-file-clean-up:
cat-file: use "type" and "size" from outer scope

Merge git://github.com/git-l10n/git-poJunio C Hamano Thu, 22 Jan 2015 21:45:07 +0000 (13:45 -0800)

Merge git://github.com/git-l10n/git-po

* git://github.com/git-l10n/git-po:
l10n: correct indentation of show-branch usage
l10n: de.po: translate 3 messages
l10n: zh_CN: various fixes on command arguments
l10n: vi.po(2298t): Updated 3 new strings
l10n: sv.po: Update Swedish translation (2298t0f0u)
l10n: fr.po v2.3.0 round 2
l10n: git.pot: v2.3.0 round 2 (3 updated)
l10n: de.po: translate 13 new messages
l10n: de.po: fix typo
l10n: de.po: translate "track" as "versionieren"
l10n: zh_CN: translations for git v2.3.0-rc0
l10n: sv.po: Update Swedish translation (2298t0f0u)
l10n: fr.po v2.3.0 round 1
l10n: vi.po(2298t): Updated and change Plural-Forms
l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)
l10n: ca.po: various fixes

Merge branch 'sh/asciidoc-git-version-fix'Junio C Hamano Thu, 22 Jan 2015 21:44:47 +0000 (13:44 -0800)

Merge branch 'sh/asciidoc-git-version-fix'

* sh/asciidoc-git-version-fix:
Documentation: fix version numbering

Documentation: fix version numberingSven van Haastregt Thu, 22 Jan 2015 19:32:33 +0000 (19:32 +0000)

Documentation: fix version numbering

Version numbers in asciidoc-generated content (such as man pages)
went missing as of da8a366 (Documentation: refactor common operations
into variables). Fix by putting the underscore back in the variable
name.

Signed-off-by: Sven van Haastregt <svenvh@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jh/empty-notes'Junio C Hamano Thu, 22 Jan 2015 21:42:37 +0000 (13:42 -0800)

Merge branch 'jh/empty-notes'

* jh/empty-notes:
Fix unclosed here document in t3301.sh

apply: count the size of postimage correctlyJunio C Hamano Fri, 16 Jan 2015 23:32:00 +0000 (15:32 -0800)

apply: count the size of postimage correctly

Under --whitespace=fix option, match_fragment() function examines
the preimage (the common context and the removed lines in the patch)
and the file being patched and checks if they match after correcting
all whitespace errors. When they are found to match, the common
context lines in the preimage is replaced with the fixed copy,
because these lines will then be copied to the corresponding place
in the postimage by a later call to update_pre_post_images(). Lines
that are added in the postimage, under --whitespace=fix, have their
whitespace errors already fixed when apply_one_fragment() prepares
the preimage and the postimage, so in the end, application of the
patch can be done by replacing the block of text in the file being
patched that matched the preimage with what is in the postimage that
was updated by update_pre_post_images().

In the earlier days, fixing whitespace errors always resulted in
reduction of size, either collapsing runs of spaces in the indent to
a tab or removing the trailing whitespaces. These days, however,
some whitespace error fix results in extending the size.

250b3c6c (apply --whitespace=fix: avoid running over the postimage
buffer, 2013-03-22) tried to compute the final postimage size but
its math was flawed. It counted the size of the block of text in
the original being patched after fixing the whitespace errors on its
lines that correspond to the preimage. That number does not have
much to do with how big the final postimage would be.

Instead count (1) the added lines in the postimage, whose size is
the same as in the final patch result because their whitespace
errors have already been corrected, and (2) the fixed size of the
lines that are common.

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

apply: make update_pre_post_images() sanity check the... Junio C Hamano Fri, 16 Jan 2015 19:54:47 +0000 (11:54 -0800)

apply: make update_pre_post_images() sanity check the given postlen

"git apply --whitespace=fix" used to be able to assume that fixing
errors will always reduce the size by e.g. stripping whitespaces at
the end of lines or collapsing runs of spaces into tabs at the
beginning of lines. An update to accomodate fixes that lengthens
the result by e.g. expanding leading tabs into spaces were made long
time ago but the logic miscounted the necessary space after such
whitespace fixes, leading to either under-allocation or over-usage
of already allocated space.

Illustrate this with a runtime sanity-check to protect us from
future breakage. The test was stolen from Kyle McKay who helped
to identify the problem.

Helped-by: "Kyle J. McKay" <mackyle@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

apply.c: typofixJunio C Hamano Fri, 16 Jan 2015 21:54:52 +0000 (13:54 -0800)

apply.c: typofix

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

Fix unclosed here document in t3301.shKacper Kornet Thu, 22 Jan 2015 11:59:36 +0000 (12:59 +0100)

Fix unclosed here document in t3301.sh

Commit 908a3203632a02568df230c0fccf9a2cd8da24e6 introduced indentation
to here documents in t3301.sh. However in one place <<-EOF was missing
-, which broke this test when run with mksh-50d. This commit fixes it.

Signed-off-by: Kacper Kornet <draenog@pld-linux.org>
Acked-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

rebase -i: use full object name internally throughout... Kirill A. Shutemov Thu, 22 Jan 2015 11:50:15 +0000 (13:50 +0200)

rebase -i: use full object name internally throughout the script

In earlier days, the abbreviated commit object name shown to the end
users were generated with hardcoded --abbrev=7; 56895038 (rebase
-i: respect core.abbrev, 2013-09-28) tried to make it honor the user
specified core.abbrev, but it missed the very initial invocation of
the editor.

These days, we try to use the full 40-hex object names internally to
avoid ambiguity that can arise after rebase starts running. Newly
created objects during the rebase may share the same prefix with
existing commits listed in the insn sheet. These object names are
shortened just before invoking the sequence editor to present the
insn sheet to the end user, and then expanded back to full object
names when the editor returns.

But the code still used the shortened names when preparing the insn
sheet for the very first time, resulting "7 hexdigits or more"
output to the user. Change the code to use full 40-hex commit
object names from the very beginning to make things more uniform.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

transport-helper: do not request symbolic refs to remot... Mike Hommey Mon, 19 Jan 2015 01:35:07 +0000 (10:35 +0900)

transport-helper: do not request symbolic refs to remote helpers

A typical remote helper will return a `list` of refs containing a symbolic
ref HEAD, pointing to, e.g. refs/heads/master. In the case of a clone, all
the refs are being requested through `fetch` or `import`, including the
symbolic ref.

While this works properly, in some cases of a fetch, like `git fetch url`
or `git fetch origin HEAD`, or any fetch command involving a symbolic ref
without also fetching the corresponding ref it points to, the fetch command
fails with:

fatal: bad object 0000000000000000000000000000000000000000
error: <remote> did not send all necessary objects

(in the case the remote helper returned '?' values to the `list` command).

This is because there is only one ref given to fetch(), and it's not
further resolved to something at the end of fetch_with_import().

While this can be somehow handled in the remote helper itself, by adding
a refspec for the symbolic ref, and storing an explicit ref in a private
namespace, and then handling the `import` for that symbolic ref
specifically, very few existing remote helpers are actually doing that.

So, instead of requesting the exact list of wanted refs to remote helpers,
treat symbolic refs differently and request the ref they point to instead.
Then, resolve the symbolic refs values based on the pointed ref.
This assumes there is no more than one level of indirection (a symbolic
ref doesn't point to another symbolic ref).

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t/lib-terminal.sh: fix typoAlexander Kuleshov Wed, 21 Jan 2015 09:14:01 +0000 (15:14 +0600)

t/lib-terminal.sh: fix typo

Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

pack-bitmap: fix typoAlexander Kuleshov Wed, 21 Jan 2015 09:13:51 +0000 (15:13 +0600)

pack-bitmap: fix typo

Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

l10n: correct indentation of show-branch usageJiang Xin Wed, 21 Jan 2015 07:05:03 +0000 (15:05 +0800)

l10n: correct indentation of show-branch usage

An indentation error was found right after we started l10n round 2, and
commit d6589d1 (show-branch: fix indentation of usage string) and this
update would fix it.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Merge branch 'master' of git://github.com/git-l10n... Jiang Xin Wed, 21 Jan 2015 06:20:53 +0000 (14:20 +0800)

Merge branch 'master' of git://github.com/git-l10n/git-po

* 'master' of git://github.com/git-l10n/git-po:
l10n: de.po: translate 3 messages
l10n: zh_CN: various fixes on command arguments
l10n: vi.po(2298t): Updated 3 new strings
l10n: sv.po: Update Swedish translation (2298t0f0u)
l10n: fr.po v2.3.0 round 2
l10n: git.pot: v2.3.0 round 2 (3 updated)
l10n: de.po: translate 13 new messages
l10n: de.po: fix typo
l10n: de.po: translate "track" as "versionieren"
l10n: zh_CN: translations for git v2.3.0-rc0
l10n: sv.po: Update Swedish translation (2298t0f0u)
l10n: fr.po v2.3.0 round 1
l10n: vi.po(2298t): Updated and change Plural-Forms
l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)
l10n: ca.po: various fixes

Git 2.3.0-rc1 v2.3.0-rc1Junio C Hamano Wed, 21 Jan 2015 00:54:58 +0000 (16:54 -0800)

Git 2.3.0-rc1

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

Merge branch 'jk/http-push-symref-fix'Junio C Hamano Wed, 21 Jan 2015 01:31:50 +0000 (17:31 -0800)

Merge branch 'jk/http-push-symref-fix'

* jk/http-push-symref-fix:
http-push: trim trailing newline from remote symref

Merge branch 'ak/show-branch-usage-string'Junio C Hamano Wed, 21 Jan 2015 00:16:09 +0000 (16:16 -0800)

Merge branch 'ak/show-branch-usage-string'

* ak/show-branch-usage-string:
show-branch: fix indentation of usage string

show-branch: fix indentation of usage stringRalf Thielow Tue, 20 Jan 2015 19:30:28 +0000 (20:30 +0100)

show-branch: fix indentation of usage string

Noticed-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jk/colors'Junio C Hamano Tue, 20 Jan 2015 23:57:22 +0000 (15:57 -0800)

Merge branch 'jk/colors'

* jk/colors:
parse_color: fix return value for numeric color values 0-8

parse_color: fix return value for numeric color values 0-8Jeff King Tue, 20 Jan 2015 22:14:48 +0000 (17:14 -0500)

parse_color: fix return value for numeric color values 0-8

When commit 695d95d refactored the color parsing, it missed
a "return 0" when parsing literal numbers 0-8 (which
represent basic ANSI colors), leading us to report these
colors as an error.

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

l10n: de.po: translate 3 messagesRalf Thielow Mon, 19 Jan 2015 06:15:29 +0000 (07:15 +0100)

l10n: de.po: translate 3 messages

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>

l10n: zh_CN: various fixes on command argumentsJiang Xin Sun, 18 Jan 2015 12:37:57 +0000 (20:37 +0800)

l10n: zh_CN: various fixes on command arguments

Updated translations for Git 2.3.0 l10n round 2, and fixed various
translations for command arguments.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Merge branch 'v2.3.0' of git://github.com/jnavila/gitJiang Xin Mon, 19 Jan 2015 02:12:46 +0000 (10:12 +0800)

Merge branch 'v2.3.0' of git://github.com/jnavila/git

* 'v2.3.0' of git://github.com/jnavila/git:
l10n: fr.po v2.3.0 round 2

Merge branch 'master' of git://github.com/nafmo/git... Jiang Xin Mon, 19 Jan 2015 02:10:57 +0000 (10:10 +0800)

Merge branch 'master' of git://github.com/nafmo/git-l10n-sv

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

l10n: vi.po(2298t): Updated 3 new stringsTran Ngoc Quan Mon, 19 Jan 2015 00:20:28 +0000 (07:20 +0700)

l10n: vi.po(2298t): Updated 3 new strings

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>

l10n: sv.po: Update Swedish translation (2298t0f0u)Peter Krefting Sun, 18 Jan 2015 19:30:18 +0000 (20:30 +0100)

l10n: sv.po: Update Swedish translation (2298t0f0u)

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

l10n: fr.po v2.3.0 round 2Jean-Noel Avila Sun, 18 Jan 2015 16:03:27 +0000 (17:03 +0100)

l10n: fr.po v2.3.0 round 2

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>

l10n: git.pot: v2.3.0 round 2 (3 updated)Jiang Xin Sun, 18 Jan 2015 03:26:57 +0000 (11:26 +0800)

l10n: git.pot: v2.3.0 round 2 (3 updated)

Generate po/git.pot from v2.3.0-rc0-44-ga94655d for git v2.3.0 l10n
round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Merge branch 'master' of git://github.com/git-l10n... Jiang Xin Sun, 18 Jan 2015 03:24:00 +0000 (11:24 +0800)

Merge branch 'master' of git://github.com/git-l10n/git-po

* 'master' of git://github.com/git-l10n/git-po:
l10n: de.po: translate 13 new messages
l10n: de.po: fix typo
l10n: de.po: translate "track" as "versionieren"
l10n: zh_CN: translations for git v2.3.0-rc0
l10n: sv.po: Update Swedish translation (2298t0f0u)
l10n: fr.po v2.3.0 round 1
l10n: vi.po(2298t): Updated and change Plural-Forms
l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)
l10n: ca.po: various fixes

l10n: de.po: translate 13 new messagesRalf Thielow Wed, 31 Dec 2014 19:06:51 +0000 (20:06 +0100)

l10n: de.po: translate 13 new messages

Translate 13 new messages came from git.pot update in
beb691f (l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>

l10n: de.po: fix typoRalf Thielow Wed, 31 Dec 2014 19:16:35 +0000 (20:16 +0100)

l10n: de.po: fix typo

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>

l10n: de.po: translate "track" as "versionieren"Ralf Thielow Sat, 6 Dec 2014 19:16:49 +0000 (20:16 +0100)

l10n: de.po: translate "track" as "versionieren"

Suggested-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>

l10n: zh_CN: translations for git v2.3.0-rc0Jiang Xin Sun, 4 Jan 2015 04:27:38 +0000 (12:27 +0800)

l10n: zh_CN: translations for git v2.3.0-rc0

Translate 13 new messages (2298t0f0u) for git v2.3.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

strbuf.h: group documentation for trim functionsJeff King Fri, 16 Jan 2015 09:06:04 +0000 (04:06 -0500)

strbuf.h: group documentation for trim functions

The relationship between these makes more sense if you read
them as a group, which can help people who are looking for
the right function. Let's give them a single comment.

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

strbuf.h: drop boilerplate descriptions of strbuf_split_*Jeff King Fri, 16 Jan 2015 09:05:57 +0000 (04:05 -0500)

strbuf.h: drop boilerplate descriptions of strbuf_split_*

The description of strbuf_split_buf says most of what
needs to be said for all of the split variants that take
strings, raw memory, etc. We have a boilerplate comment
above each that points to the first. This boilerplate
ends up making it harder to read, because it spaces out the
functions, which could otherwise be read as a group.

Let's drop the boilerplate completely, and mention the
variants in the top comment. This is perhaps slightly worse
for a hypothetical system which pulls the documentation for
each function out of the comment immediately preceding it.
But such a system does not yet exist, and anyway, the end
result of extracting the boilerplate comments would not lead
to a very easy-to-read result. We would do better in the
long run to teach the extraction system about groups of
related functions.

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

strbuf.h: reorganize api function grouping headersJeff King Fri, 16 Jan 2015 09:05:28 +0000 (04:05 -0500)

strbuf.h: reorganize api function grouping headers

The original API doc had something like:

Functions
---------

* Life cycle

... some life-cycle functions ...

* Related to the contents of the buffer

... functions related to contents ....

etc

This grouping can be hard to read in the comment sources,
given the "*" in the comment lines, and the amount of text
between each section.

Instead, let's make a flat list of groupings, and underline
each as a section header. That makes them stand out, and
eliminates the weird half-phrase of "Related to...". Like:

Functions related to the contents of the buffer
-----------------------------------------------

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

strbuf.h: format asciidoc code blocks as 4-space indentJeff King Fri, 16 Jan 2015 09:05:16 +0000 (04:05 -0500)

strbuf.h: format asciidoc code blocks as 4-space indent

This is much easier to read when the whole thing is stuffed
inside a comment block. And there is precedent for this
convention in markdown (and just in general ascii text).

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

strbuf.h: drop asciidoc list formatting from API docsJeff King Fri, 16 Jan 2015 09:05:10 +0000 (04:05 -0500)

strbuf.h: drop asciidoc list formatting from API docs

Using a hanging indent is much more readable. This means we
won't format as asciidoc anymore, but since we don't have a
working system for extracting these comments anyway, it's
probably more important to just make the source readable.

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

strbuf.h: unify documentation comments beginningsStefan Beller Fri, 16 Jan 2015 09:04:51 +0000 (04:04 -0500)

strbuf.h: unify documentation comments beginnings

The prior patch uses "/**" to denote "documentation"
comments that we pulled from api-strbuf.txt. Let's use a
consistent style for similar comments that were already in
strbuf.h.

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

strbuf.h: integrate api-strbuf.txt documentationJeff King Fri, 16 Jan 2015 09:04:04 +0000 (04:04 -0500)

strbuf.h: integrate api-strbuf.txt documentation

Some of strbuf is documented as comments above functions,
and some is separate in Documentation/technical/api-strbuf.txt.
This makes it annoying to find the appropriate documentation.
We'd rather have it all in one place, which means all in the
text document, or all in the header.

Let's choose the header as that place. Even though the
formatting is not quite as pretty, this keeps the
documentation close to the related code. The hope is that
this makes it easier to find what you want (human-readable
comments are right next to the C declarations), and easier
for writers to keep the documentation up to date.

This is more or less a straight import of the text from
api-strbuf.txt into C comments, complete with asciidoc
formatting. The exceptions are:

1. All comments created in this way are started with "/**"
to indicate they are part of the API documentation. This
may help later with extracting the text to pretty-print
it.

2. Function descriptions do not repeat the function name,
as it is available in the context directly below. So:

`strbuf_add`::

Add data of given length to the buffer.

from api-strbuf.txt becomes:

/**
* Add data of given length to the buffer.
*/
void strbuf_add(struct strbuf *sb, const void *, size_t);

As a result, any block-continuation required in asciidoc
for that list item was dropped in favor of straight
blank-line paragraph (since it is not necessary when we
are not in a list item).

3. There is minor re-wording to integrate existing comments
and api-strbuf text. In each case, I took whichever
version was more descriptive, and eliminated any
redundancies. In one case, for strbuf_addstr, the api
documentation gave its inline definition; I eliminated
this as redundant with the actual definition, which can
be seen directly below the comment.

4. The functions in the header file are re-ordered to match
the ordering of the API documentation, under the
assumption that more thought went into the grouping
there.

Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

tests: correct misuses of POSIXPERMJunio C Hamano Fri, 16 Jan 2015 18:32:09 +0000 (10:32 -0800)

tests: correct misuses of POSIXPERM

POSIXPERM requires that a later call to stat(2) (hence "ls -l")
faithfully reproduces what an earlier chmod(2) did. Some
filesystems cannot satisify this.

SANITY requires that a file or a directory is indeed accessible (or
inaccessible) when its permission bits would say it ought to be
accessible (or inaccessible). Running tests as root would lose this
prerequisite for obvious reasons.

Fix a few tests that misuse POSIXPERM.

t0061-run-command.sh has two uses of POSIXPERM.

- One checks that an attempt to execute a file that is marked as
unexecutable results in a failure with EACCES; I do not think
having root-ness or any other capability that busts the
filesystem permission mode bits will make you run an unexecutable
file, so this should be left as-is. The test does not have
anything to do with SANITY.

- The other one expects 'git nitfol' runs the alias when an
alias.nitfol is defined and a directory on the PATH is marked as
unreadable and unsearchable. I _think_ the test tries to reject
the alternative expectation that we want to refuse to run the
alias because it would break "no alias may mask a command" rule
if a file 'git-nitfol' exists in the unreadable directory but we
cannot even determine if that is the case. Under !SANITY that
busts the permission bits, this test no longer checks that, so it
must be protected with SANITY.

t1509-root-worktree.sh expects to be run on a / that is writable by
the user and sees if Git behaves "sensibly" when /.git is the
repository to govern a worktree that is the whole filesystem, and
also if Git behaves "sensibly" when / itself is a bare repository
with refs, objects, and friends (I find the definition of "behaves
sensibly" under these conditions hard to fathom, but it is a
different matter).

The implementation of the test is very much problematic.

- It requires POSIXPERM, but it does not do chmod or checks modes
in any way.

- It runs "rm /*" and "rm -fr /refs /objects ..." in one of the
tests, and also does "cd / && git init --bare". If done on a
live system that takes advantages of the "feature" being tested,
these obviously will clobber the system. But there is no guard
against such a breakage.

- It uses "test $UID = 0" to see rootness, which now should be
spelled "! test_have_prereq NOT_ROOT"

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

t/lib-httpd: switch SANITY check for NOT_ROOTJeff King Fri, 16 Jan 2015 09:16:49 +0000 (04:16 -0500)

t/lib-httpd: switch SANITY check for NOT_ROOT

The SANITY prerequisite is really about whether the
filesystem will respect the permissions we set, and being
root is only one part of that. But the httpd tests really
just care about not being root, as they are trying to avoid
weirdness in apache (see a1a3011 for details).

Let's switch out SANITY for a new NOT_ROOT prerequisite,
which will let us tweak SANITY more freely.

We implement NOT_ROOT by checking `id -u`, which is in POSIX
and seems to be available even on MSYS. Note that we cannot
just call this "ROOT" and ask for "!ROOT". The possible
outcomes are:

1. we know we are root

2. we know we are not root

3. we could not tell, because `id` was not available

We should conservatively treat (3) as "does not have the
prerequisite", which means that a naive negation would not
work.

Helped-by: Kyle J. McKay <mackyle@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

"log --pretty" documentation: do not forget "tformat:"Junio C Hamano Fri, 16 Jan 2015 01:32:57 +0000 (17:32 -0800)

"log --pretty" documentation: do not forget "tformat:"

We forgot to list "tformat:<string>" when enumerating possible
values that "--pretty=<format>" can take. It was not described
that "--pretty='string with %s placeholder'" that is not understood
is DWIMmed as "--pretty=tformat:<that string>".

Further, it was unclear what "When omitted, defaults to 'medium'"
was meant. Is it "When --pretty=<something> was not given at all",
or is it "When --pretty is given without =<something>"? Clarify
that it is the latter.

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

CodingGuidelines: clarify C #include rulesJunio C Hamano Thu, 15 Jan 2015 23:20:09 +0000 (15:20 -0800)

CodingGuidelines: clarify C #include rules

Even though "advice.h" includes "git-compat-util.h", it is not
sensible to have it as the first #include and indirectly satisify
the "You must give git-compat-util.h a clean environment to set up
feature test macros before including any of the system headers are
included", which is the real requirement.

Because:

- A command that interacts with the object store, config subsystem,
the index, or the working tree cannot do anything without using
what is declared in "cache.h";

- A built-in command must be declared in "builtin.h", so anything
in builtin/*.c must include it;

- These two headers both include "git-compat-util.h" as the first
thing; and

- Almost all our *.c files (outside compat/ and borrowed files in
xdiff/) need some Git-ness from "cache.h" to do something
Git-ish.

let's explicitly specify that one of these three header files must
be the first thing that is included.

Any of our *.c file should include the header file that directly
declares what it uses, instead of relying on the fact that some *.h
file it includes happens to include another *.h file that declares
the necessary function or type. Spell it out as another guideline
item.

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

shallow.c: make check_shallow_file_for_update() staticJunio C Hamano Wed, 14 Jan 2015 23:01:27 +0000 (15:01 -0800)

shallow.c: make check_shallow_file_for_update() static

No external callers exist.

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

remote.c: make clear_cas_option() staticJunio C Hamano Wed, 14 Jan 2015 22:58:44 +0000 (14:58 -0800)

remote.c: make clear_cas_option() static

No external callers exist.

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

urlmatch.c: make match_urls() staticJunio C Hamano Wed, 14 Jan 2015 22:57:08 +0000 (14:57 -0800)

urlmatch.c: make match_urls() static

No external callers exist.

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

revision.c: make save_parents() and free_saved_parents... Junio C Hamano Wed, 14 Jan 2015 22:49:24 +0000 (14:49 -0800)

revision.c: make save_parents() and free_saved_parents() static

No external callers exist.

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

line-log.c: make line_log_data_init() staticJunio C Hamano Wed, 14 Jan 2015 22:39:02 +0000 (14:39 -0800)

line-log.c: make line_log_data_init() static

No external callers exist.

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

pack-bitmap.c: make pack_bitmap_filename() staticJunio C Hamano Wed, 14 Jan 2015 23:40:53 +0000 (15:40 -0800)

pack-bitmap.c: make pack_bitmap_filename() static

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

prompt.c: remove git_getpass() nobody usesJunio C Hamano Wed, 14 Jan 2015 23:40:48 +0000 (15:40 -0800)

prompt.c: remove git_getpass() nobody uses

This was whittled down to a compatibility wrapper around the more
flexible git_prompt() in 1cb0134f (refactor git_getpass into generic
prompt function, 2011-12-10), waiting for the final callers to go
away. That happened in 791643a8 (imap-send: use git-credential,
2014-04-28) when imap-send learned to use the credential interface.

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

http.c: make finish_active_slot() and handle_curl_resul... Junio C Hamano Wed, 14 Jan 2015 23:40:46 +0000 (15:40 -0800)

http.c: make finish_active_slot() and handle_curl_result() static

They used to be used directly by remote-curl.c for the smart-http
protocol. But they got wrapped by run_one_slot() in beed336 (http:
never use curl_easy_perform, 2014-02-18). Any future users are
expected to follow that route.

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

git-svn: make it play nicely with submodulesRamkumar Ramachandra Sat, 10 Jan 2015 14:55:11 +0000 (09:55 -0500)

git-svn: make it play nicely with submodules

It's a simple matter of opening the directory specified in the gitfile.

[ew: tweaked check to avoid open() on directories]

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>

Git::SVN: handle missing ref_id case correctlyRamkumar Ramachandra Sat, 10 Jan 2015 14:35:10 +0000 (09:35 -0500)

Git::SVN: handle missing ref_id case correctly

ref_id should not match "refs/remotes/".

[ew: dropped initial hunk for GIT_SVN_ID at Ramkumar's request]

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>

l10n: sv.po: Update Swedish translation (2298t0f0u)Peter Krefting Wed, 14 Jan 2015 21:55:49 +0000 (22:55 +0100)

l10n: sv.po: Update Swedish translation (2298t0f0u)

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

t1050-large: generate large files without ddJohannes Sixt Wed, 14 Jan 2015 20:28:56 +0000 (21:28 +0100)

t1050-large: generate large files without dd

For some unknown reason, the dd on my Windows box segfaults randomly,
but since recently, it does so much more often than it used to, which
makes running the test suite burdensome.

Use printf to write large files instead of dd. To emphasize that three
of the large blobs are exact copies, use cp to allocate them.

The new code makes the files a bit smaller, and they are not sparse
anymore, but the tests do not depend on these properties. We do not want
to use test-genrandom here (which is used to generate large files
elsewhere in t1050), so that the files can be compressed well (which
keeps the run-time short).

The files are now large text files, not binary files. But since they
are larger than core.bigfilethreshold they are diagnosed as binary
by Git. For this reason, the 'git diff' tests that check the output
for "Binary files differ" still pass.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fifth batch for 2.3 cycleJunio C Hamano Wed, 14 Jan 2015 20:44:03 +0000 (12:44 -0800)

Fifth batch for 2.3 cycle

Hopefully this will be the final feature update for 2.3-rc1

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

Merge branch 'po/doc-core-ignorestat'Junio C Hamano Wed, 14 Jan 2015 20:41:38 +0000 (12:41 -0800)

Merge branch 'po/doc-core-ignorestat'

* po/doc-core-ignorestat:
doc: core.ignoreStat update, and clarify the --assume-unchanged effect
doc: core.ignoreStat clarify the --assume-unchanged effect

Merge branch 'rc/for-each-ref-tracking'Junio C Hamano Wed, 14 Jan 2015 20:39:02 +0000 (12:39 -0800)

Merge branch 'rc/for-each-ref-tracking'

* rc/for-each-ref-tracking:
for-each-ref: always check stat_tracking_info()'s return value

Merge branch 'rh/autoconf-rhel3'Junio C Hamano Wed, 14 Jan 2015 20:37:21 +0000 (12:37 -0800)

Merge branch 'rh/autoconf-rhel3'

Build update for older RHEL.

* rh/autoconf-rhel3:
configure.ac: check for HMAC_CTX_cleanup
configure.ac: check for clock_gettime and CLOCK_MONOTONIC
configure.ac: check 'tv_nsec' field in 'struct stat'

Merge branch 'ak/fewer-includes'Junio C Hamano Wed, 14 Jan 2015 20:37:19 +0000 (12:37 -0800)

Merge branch 'ak/fewer-includes'

* ak/fewer-includes:
cat-file: remove unused includes
git.c: remove unnecessary #includes

Merge branch 'ak/doc-add-v-n-options'Junio C Hamano Wed, 14 Jan 2015 20:37:13 +0000 (12:37 -0800)

Merge branch 'ak/doc-add-v-n-options'

* ak/doc-add-v-n-options:
Documentation: list long options for -v and -n

Merge branch 'ak/show-branch-usage-string'Junio C Hamano Wed, 14 Jan 2015 20:37:07 +0000 (12:37 -0800)

Merge branch 'ak/show-branch-usage-string'

* ak/show-branch-usage-string:
show-branch: line-wrap show-branch usage

Merge branch 'rh/test-color-avoid-terminfo-in-original... Junio C Hamano Wed, 14 Jan 2015 20:36:45 +0000 (12:36 -0800)

Merge branch 'rh/test-color-avoid-terminfo-in-original-home'

We try to see if "tput" gives a useful result before switching TERM
to dumb and moving HOME to point to our fake location for stability
of the tests, and then use the command when coloring the output
from the tests, but there is no guarantee "tput" works after
switching HOME.

* rh/test-color-avoid-terminfo-in-original-home:
test-lib.sh: do tests for color support after changing HOME
test-lib: use 'test ...' instead of '[ ... ]'

Merge branch 'tf/prompt-preserve-exit-status'Junio C Hamano Wed, 14 Jan 2015 20:35:48 +0000 (12:35 -0800)

Merge branch 'tf/prompt-preserve-exit-status'

Using the exit status of the last command in the prompt, e.g.
PS1='$(__git_ps1) $? ', did not work well because the helper
function stomped on the exit status.

* tf/prompt-preserve-exit-status:
git-prompt: preserve value of $? in all cases

Merge branch 'rh/hide-prompt-in-ignored-directory'Junio C Hamano Wed, 14 Jan 2015 20:34:01 +0000 (12:34 -0800)

Merge branch 'rh/hide-prompt-in-ignored-directory'

* rh/hide-prompt-in-ignored-directory:
git-prompt.sh: allow to hide prompt for ignored pwd
git-prompt.sh: if pc mode, immediately set PS1 to a plain prompt

Merge branch 'mm/complete-rebase-autostash'Junio C Hamano Wed, 14 Jan 2015 20:33:57 +0000 (12:33 -0800)

Merge branch 'mm/complete-rebase-autostash'

* mm/complete-rebase-autostash:
git-completion: add --autostash for 'git rebase'

Merge branch 'aw/doc-smtp-ssl-cert-path'Junio C Hamano Wed, 14 Jan 2015 20:33:50 +0000 (12:33 -0800)

Merge branch 'aw/doc-smtp-ssl-cert-path'

A long overdue documentation update to match an age-old code
update.

* aw/doc-smtp-ssl-cert-path:
correct smtp-ssl-cert-path description

Merge branch 'sp/subtree-doc'Junio C Hamano Wed, 14 Jan 2015 20:33:45 +0000 (12:33 -0800)

Merge branch 'sp/subtree-doc'

* sp/subtree-doc:
subtree: fix AsciiDoc list item continuation

Merge branch 'km/log-usage-string-i18n'Junio C Hamano Wed, 14 Jan 2015 20:32:39 +0000 (12:32 -0800)

Merge branch 'km/log-usage-string-i18n'

* km/log-usage-string-i18n:
log.c: fix translation markings

Merge branch 'km/imap-send-libcurl-options'Junio C Hamano Wed, 14 Jan 2015 20:31:50 +0000 (12:31 -0800)

Merge branch 'km/imap-send-libcurl-options'

Now imap-send learned to talk to the server using cURL library,
allow the same GIT_CURL_VERBOSE environment variable to control the
verbosity of the chattering.

* km/imap-send-libcurl-options:
imap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRY
imap-send.c: support GIT_CURL_VERBOSE