gitweb.git
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

Merge branch 'jk/prune-packed-server-info'Junio C Hamano Wed, 14 Jan 2015 20:30:26 +0000 (12:30 -0800)

Merge branch 'jk/prune-packed-server-info'

Fix recent breakage in Git 2.2 that started creating info/refs and
objects/info/packs files with permission bits tighter than user's
umask.

* jk/prune-packed-server-info:
update-server-info: create info/* with mode 0666
t1301: set umask in reflog sharedrepository=group test

Merge branch 'js/remote-add-with-insteadof'Junio C Hamano Wed, 14 Jan 2015 20:29:47 +0000 (12:29 -0800)

Merge branch 'js/remote-add-with-insteadof'

"git remote add $name $URL" is now allowed when "url.$URL.insteadOf"
is already defined.

* js/remote-add-with-insteadof:
Add a regression test for 'git remote add <existing> <same-url>'
git remote: allow adding remotes agreeing with url.<...>.insteadOf

Document receive.advertiseatomicStefan Beller Tue, 13 Jan 2015 00:24:02 +0000 (16:24 -0800)

Document receive.advertiseatomic

This was missing in 1b70fe5d3054 (2015-01-07, receive-pack.c: negotiate
atomic push support) as I squashed the option in very late in the patch
series.

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

http-push: trim trailing newline from remote symrefJeff King Tue, 13 Jan 2015 02:28:58 +0000 (21:28 -0500)

http-push: trim trailing newline from remote symref

When we fetch a symbolic ref file from the remote, we get
the whole string "ref: refs/heads/master\n", recognize it by
skipping past the "ref: ", and store the rest. We should
chomp the trailing newline.

This bug was introduced in ae021d8 (use skip_prefix to avoid
magic numbers, 2014-06-18), which did not notice that the
length computation fed to xmemdupz was quietly tweaked by 1
to account for this.

We can solve it by explicitly trimming the newline, which is
more obvious. Note that we use strbuf_rtrim here, which will
actually cut off any trailing whitespace, not just a single
newline. This is a good thing, though, as it makes our
parsing more liberal (and spaces are not valid in refnames
anyway).

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

git-prompt: preserve value of $? in all casesTony Finch Wed, 14 Jan 2015 10:06:28 +0000 (10:06 +0000)

git-prompt: preserve value of $? in all cases

Signed-off-by: Tony Finch <dot@dotat.at>
Reviewed-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

standardize usage info string formatAlex Henrie Tue, 13 Jan 2015 07:44:47 +0000 (00:44 -0700)

standardize usage info string format

This patch puts the usage info strings that were not already in docopt-
like format into docopt-like format, which will be a litle easier for
end users and a lot easier for translators. Changes include:

- Placing angle brackets around fill-in-the-blank parameters
- Putting dashes in multiword parameter names
- Adding spaces to [-f|--foobar] to make [-f | --foobar]
- Replacing <foobar>* with [<foobar>...]

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

cat-file: use "type" and "size" from outer scopeAlexander Kuleshov Sat, 10 Jan 2015 18:13:23 +0000 (00:13 +0600)

cat-file: use "type" and "size" from outer scope

In cat_one_file(), "type" and "size" variables are defined in the
function scope, and then two variables of the same name are defined
in a block in one of the if/else statement, hiding the definitions
in the outer scope.

Because the values of the outer variables before the control enters
this scope, however, do not have to be preserved, we can remove
useless definitions of variables from the inner scope safely without
breaking anything.

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

l10n: fr.po v2.3.0 round 1Jean-Noel Avila Tue, 13 Jan 2015 19:22:58 +0000 (20:22 +0100)

l10n: fr.po v2.3.0 round 1

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

log: teach --invert-grep optionChristoph Junghans Tue, 13 Jan 2015 01:33:32 +0000 (18:33 -0700)

log: teach --invert-grep option

"git log --grep=<string>" shows only commits with messages that
match the given string, but sometimes it is useful to be able to
show only commits that do *not* have certain messages (e.g. "show
me ones that are not FIXUP commits").

Originally, we had the invert-grep flag in grep_opt, but because
"git grep --invert-grep" does not make sense except in conjunction
with "--files-with-matches", which is already covered by
"--files-without-matches", it was moved it to revisions structure.
To have the flag there expresses the function to the feature better.

When the newly inserted two tests run, the history would have commits
with messages "initial", "second", "third", "fourth", "fifth", "sixth"
and "Second", committed in this order. The commits that does not match
either "th" or "Sec" is "second" and "initial". For the case insensitive
case only "initial" matches.

Signed-off-by: Christoph Junghans <ottxor@gentoo.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

blame.c: fix garbled error messageLukas Fleischer Tue, 13 Jan 2015 01:59:26 +0000 (20:59 -0500)

blame.c: fix garbled error message

The helper functions prepare_final() and prepare_initial() return a
pointer to a string that is a member of an object in the revs->pending
array. This array is later rebuilt when running prepare_revision_walk()
which potentially transforms the pointer target into a bogus string. Fix
this by maintaining a copy of the original string.

Signed-off-by: Lukas Fleischer <git@cryptocrack.de>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

use xstrdup_or_null to replace ternary conditionalsJeff King Tue, 13 Jan 2015 01:59:09 +0000 (20:59 -0500)

use xstrdup_or_null to replace ternary conditionals

This replaces "x ? xstrdup(x) : NULL" with xstrdup_or_null(x).
The change is fairly mechanical, with the exception of
resolve_refdup, which can eliminate a temporary variable.

There are still a few hits grepping for "?.*xstrdup", but
these are of slightly different forms and cannot be
converted (e.g., "x ? xstrdup(x->foo) : NULL").

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

builtin/commit.c: use xstrdup_or_null instead of envdupJeff King Tue, 13 Jan 2015 01:58:33 +0000 (20:58 -0500)

builtin/commit.c: use xstrdup_or_null instead of envdup

The only reason for envdup to be its own function is that we
have to save the result in a temporary string. With
xstrdup_or_null, we can feed the result of getenv()
directly.

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

builtin/apply.c: use xstrdup_or_null instead of null_strdupJeff King Tue, 13 Jan 2015 01:58:15 +0000 (20:58 -0500)

builtin/apply.c: use xstrdup_or_null instead of null_strdup

This file had its own identical helper that predates
xstrdup_or_null. Let's use the global one to avoid
repetition.

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

git-compat-util: add xstrdup_or_null helperJeff King Tue, 13 Jan 2015 01:57:37 +0000 (20:57 -0500)

git-compat-util: add xstrdup_or_null helper

It's a common idiom to duplicate a string if it is non-NULL,
or pass a literal NULL through. This is already a one-liner
in C, but you do have to repeat the name of the string
twice. So if there's a function call, you must write:

const char *x = some_fun(...);
return x ? xstrdup(x) : NULL;

instead of (with this patch) just:

return xstrdup_or_null(some_fun(...));

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

l10n: vi.po(2298t): Updated and change Plural-FormsTran Ngoc Quan Tue, 13 Jan 2015 07:23:12 +0000 (14:23 +0700)

l10n: vi.po(2298t): Updated and change Plural-Forms

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

l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)Jiang Xin Tue, 13 Jan 2015 06:05:57 +0000 (14:05 +0800)

l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)

Generate po/git.pot from v2.3.0-rc0 for git v2.3.0 l10n round 1.

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

Merge branch 'master' of git://github.com/alexhenrie... Jiang Xin Tue, 13 Jan 2015 06:04:57 +0000 (14:04 +0800)

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

* 'master' of git://github.com/alexhenrie/git-po:
l10n: ca.po: various fixes

doc: core.ignoreStat update, and clarify the --assume... Philip Oakley Mon, 5 Jan 2015 22:22:53 +0000 (22:22 +0000)

doc: core.ignoreStat update, and clarify the --assume-unchanged effect

The assume-unchanged bit, and consequently core.ignoreStat, can be
misunderstood. Be assertive about the expectation that file changes should
notified to Git.

Overhaul the general wording thus:
1. direct description of what is ignored given first.
2. example instruction of the user manual action required.
3. use sideways indirection for assume-unchanged and update-index
references.
4. add a 'normally' to give leeway for the change detection.

Signed-off-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

for-each-ref: always check stat_tracking_info()'s retur... Raphael Kubo da Costa Mon, 5 Jan 2015 09:58:55 +0000 (11:58 +0200)

for-each-ref: always check stat_tracking_info()'s return value

The code handling %(upstream:track) and %(upstream:trackshort)
assumed that it always had a valid branch that had been sanitized
earlier in populate_value(), and thus did not check the return value
of the call to stat_tracking_info().

While there is indeed some sanitization code that basically
corresponds to stat_tracking_info() returning 0 (no base branch
set), the function can also return -1 when the base branch did exist
but has since then been deleted.

In this case, num_ours and num_theirs had undefined values and a
call to `git for-each-ref --format="%(upstream:track)"` could print
spurious values such as

[behind -111794512]
[ahead 38881640, behind 5103867]

even for repositories with one single commit.

Verify stat_tracking_info()'s return value and do not print anything
if it returns -1. This behavior also matches the documentation ("has
no effect if the ref does not have tracking information associated
with it").

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Git 2.3.0-rc0 v2.3.0-rc0Junio C Hamano Mon, 12 Jan 2015 22:12:42 +0000 (14:12 -0800)

Git 2.3.0-rc0

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

Sync with 2.2.2Junio C Hamano Mon, 12 Jan 2015 22:08:42 +0000 (14:08 -0800)

Sync with 2.2.2

Git 2.2.2 v2.2.2Junio C Hamano Mon, 12 Jan 2015 22:06:12 +0000 (14:06 -0800)

Git 2.2.2

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

Merge branch 'jk/read-packed-refs-without-path-max... Junio C Hamano Mon, 12 Jan 2015 22:02:54 +0000 (14:02 -0800)

Merge branch 'jk/read-packed-refs-without-path-max' into maint

* jk/read-packed-refs-without-path-max:
read_packed_refs: use skip_prefix instead of static array
read_packed_refs: pass strbuf to parse_ref_line
read_packed_refs: use a strbuf for reading lines

Merge branch 'mg/add-ignore-errors' into maintJunio C Hamano Mon, 12 Jan 2015 22:02:19 +0000 (14:02 -0800)

Merge branch 'mg/add-ignore-errors' into maint

* mg/add-ignore-errors:
add: ignore only ignored files

Merge branch 'mh/find-uniq-abbrev' into maintJunio C Hamano Mon, 12 Jan 2015 22:02:05 +0000 (14:02 -0800)

Merge branch 'mh/find-uniq-abbrev' into maint

* mh/find-uniq-abbrev:
sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrev

Merge branch 'jk/approxidate-avoid-y-d-m-over-future... Junio C Hamano Mon, 12 Jan 2015 22:01:18 +0000 (14:01 -0800)

Merge branch 'jk/approxidate-avoid-y-d-m-over-future-dates' into maint

* jk/approxidate-avoid-y-d-m-over-future-dates:
approxidate: allow ISO-like dates far in the future
pass TIME_DATE_NOW to approxidate future-check

Merge branch 'rw/apply-does-not-take-ignore-date' into... Junio C Hamano Mon, 12 Jan 2015 22:00:16 +0000 (14:00 -0800)

Merge branch 'rw/apply-does-not-take-ignore-date' into maint

* rw/apply-does-not-take-ignore-date:
git-am.txt: --ignore-date flag is not passed to git-apply

Merge branch 'jk/for-each-reflog-ent-reverse' into... Junio C Hamano Mon, 12 Jan 2015 20:19:17 +0000 (12:19 -0800)

Merge branch 'jk/for-each-reflog-ent-reverse' into maint

* jk/for-each-reflog-ent-reverse:
for_each_reflog_ent_reverse: turn leftover check into assertion
for_each_reflog_ent_reverse: fix newlines on block boundaries

Merge branch 'bc/fetch-thin-less-aggressive-in-normal... Junio C Hamano Mon, 12 Jan 2015 19:38:56 +0000 (11:38 -0800)

Merge branch 'bc/fetch-thin-less-aggressive-in-normal-repository'

Earlier we made "rev-list --object-edge" more aggressively list the
objects at the edge commits, in order to reduce number of objects
fetched into a shallow repository, but the change affected cases
other than "fetching into a shallow repository" and made it
unusably slow (e.g. fetching into a normal repository should not
have to suffer the overhead from extra processing). Limit it to a
more specific case by introducing --objects-edge-aggressive, a new
option to rev-list.

* bc/fetch-thin-less-aggressive-in-normal-repository:
pack-objects: use --objects-edge-aggressive for shallow repos
rev-list: add an option to mark fewer edges as uninteresting
Documentation: add missing article in rev-list-options.txt

Merge branch 'sb/doc-submitting-patches-keep-notes'Junio C Hamano Mon, 12 Jan 2015 19:38:54 +0000 (11:38 -0800)

Merge branch 'sb/doc-submitting-patches-keep-notes'

* sb/doc-submitting-patches-keep-notes:
SubmittingPatches: explain rationale for using --notes with format-patch

Merge branch 'rs/simplify-transport-get'Junio C Hamano Mon, 12 Jan 2015 19:38:51 +0000 (11:38 -0800)

Merge branch 'rs/simplify-transport-get'

* rs/simplify-transport-get:
transport: simplify duplicating a substring in transport_get() using xmemdupz()

Merge branch 'rs/simplify-parsing-commit-tree-S'Junio C Hamano Mon, 12 Jan 2015 19:38:39 +0000 (11:38 -0800)

Merge branch 'rs/simplify-parsing-commit-tree-S'

* rs/simplify-parsing-commit-tree-S:
commit-tree: simplify parsing of option -S using skip_prefix()

Merge branch 'rs/plug-strbuf-leak-in-merge'Junio C Hamano Mon, 12 Jan 2015 19:38:32 +0000 (11:38 -0800)

Merge branch 'rs/plug-strbuf-leak-in-merge'

* rs/plug-strbuf-leak-in-merge:
merge: release strbuf after use in suggest_conflicts()

Merge branch 'rs/plug-strbuf-leak-in-lock-ref'Junio C Hamano Mon, 12 Jan 2015 19:38:30 +0000 (11:38 -0800)

Merge branch 'rs/plug-strbuf-leak-in-lock-ref'

* rs/plug-strbuf-leak-in-lock-ref:
refs: plug strbuf leak in lock_ref_sha1_basic()

Merge branch 'es/checkout-index-temp'Junio C Hamano Mon, 12 Jan 2015 19:38:23 +0000 (11:38 -0800)

Merge branch 'es/checkout-index-temp'

"git checkout-index --temp=$target $path" did not work correctly
for paths outside the current subdirectory in the project.

* es/checkout-index-temp:
checkout-index: fix --temp relative path mangling
t2004: demonstrate broken relative path printing
t2004: standardize file naming in symlink test
t2004: drop unnecessary write-tree/read-tree
t2004: modernize style

Merge branch 'cc/bisect-rev-parsing'Junio C Hamano Mon, 12 Jan 2015 19:38:14 +0000 (11:38 -0800)

Merge branch 'cc/bisect-rev-parsing'

The logic in "git bisect bad HEAD" etc. to avoid forcing the test
of the common ancestor of bad and good commits was broken.

* cc/bisect-rev-parsing:
bisect: add test to check that revs are properly parsed
bisect: parse revs before passing them to check_expected_revs()

gettext.h: add parentheses around N_ expansion if supportedKyle J. McKay Sun, 11 Jan 2015 20:09:22 +0000 (12:09 -0800)

gettext.h: add parentheses around N_ expansion if supported

The gettext N_ macro is used to mark strings for translation
without actually translating them. At runtime the string is
expected to be passed to the gettext API for translation.

If two N_ macro invocations appear next to each other with only
whitespace (or nothing at all) between them, the two separate
strings will be marked for translation, but the preprocessor
will then silently combine the strings into one and at runtime
the string passed to gettext will not match the strings that
were translated so no translation will actually occur.

Avoid this by adding parentheses around the expansion of the
N_ macro so that instead of ending up with two adjacent strings
that are then combined by the preprocessor, two adjacent strings
surrounded by parentheses result instead which causes a compile
error so the mistake can be quickly found and corrected.

However, since these string literals are typically assigned to
static variables and not all compilers support parenthesized
string literal assignments, allow this to be controlled by the
Makefile with the default only enabled when the compiler is
known to support the syntax.

For now only __GNUC__ enables this by default which covers both
gcc and clang which should result in early detection of any
adjacent N_ macros.

Although the necessary tests make the affected files a bit less
elegant, the benefit of avoiding propagation of a translation-
marking error to all the translation teams thus creating extra
work for them when the error is eventually detected and fixed
would seem to outweigh the minor inelegance the additional
configuration tests introduce.

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

Documentation: list long options for -v and -nAlexander Kuleshov Fri, 9 Jan 2015 07:48:40 +0000 (13:48 +0600)

Documentation: list long options for -v and -n

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

cat-file: remove unused includesAlexander Kuleshov Thu, 8 Jan 2015 18:56:06 +0000 (00:56 +0600)

cat-file: remove unused includes

- "exec_cmd.h" became unnecessary at b931aa5a (Call builtin ls-tree
in git-cat-file -p, 2006-05-26), when it changed an earlier code
that delegated tree display to "ls-tree" via the run_command()
API (hence needing "exec_cmd.h") to call cmd_ls_tree() directly.
We should have removed the include in the same commit, but we
forgot to do so.

- "diff.h" was added at e5fba602 (textconv: support for cat_file,
2010-06-15), together with "userdiff.h", but "userdiff.h" can be
included without including "diff.h"; the header was unnecessary
from the beginning.

- "tag.h" and "tree.h" were necessary since 8e440259 (Use blob_,
commit_, tag_, and tree_type throughout., 2006-04-02) to check
the type of object by comparing typename with tree_type and
tag_type (pointers to extern strings).

21666f1a (convert object type handling from a string to a number,
2007-02-26) made these <type>_type strings unnecessary, and it
could have switched to include "object.h", which is necessary to
use typename(), but it forgot to do so. Because "tag.h" and
"tree.h" include "object.h", it did not need to explicitly
include "object.h" in order to start using typename() itself.

We do not even have to include "object.h" after removing these
two #includes, because "builtin.h" includes "commit.h" which in
turn includes "object.h" these days. This happened at 7b9c0a69
(git-commit-tree: make it usable from other builtins,
2008-07-01).

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

git.c: remove unnecessary #includesAlexander Kuleshov Fri, 9 Jan 2015 10:12:33 +0000 (16:12 +0600)

git.c: remove unnecessary #includes

"cache.h" and "commit.h" are already included via "builtin.h".

We started to include "quote.h" at 575ba9d6 (GIT_TRACE: show which
built-in/external commands are executed, 2006-06-25) that wanted to
use sq_quote_print().

When 6ce4e61f (Trace into a file or an open fd and refactor tracing
code., 2006-09-02) introduced trace.c API, the calls this file makes
to sq_quote_print() were replaced by calls to trace_argv_printf()
that are declared in "cache.h", which this file already includes.
We should have stopped including "quote.h" in that commit, but
forgot to do so.

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

configure.ac: check for HMAC_CTX_cleanupReuben Hawkins Thu, 8 Jan 2015 20:00:57 +0000 (12:00 -0800)

configure.ac: check for HMAC_CTX_cleanup

OpenSSL version 0.9.6b and before defined the function HMAC_cleanup.
Newer versions define HMAC_CTX_cleanup. Check for HMAC_CTX_cleanup and
fall back to HMAC_cleanup when the newer function is missing.

Signed-off-by: Reuben Hawkins <reubenhwk@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

configure.ac: check for clock_gettime and CLOCK_MONOTONICReuben Hawkins Thu, 8 Jan 2015 20:00:56 +0000 (12:00 -0800)

configure.ac: check for clock_gettime and CLOCK_MONOTONIC

Set or clear Makefile variables HAVE_CLOCK_GETTIME and
HAVE_CLOCK_MONOTONIC based upon results of the checks (overriding
default values from config.mak.uname).

CLOCK_MONOTONIC isn't available on RHEL3, but there are still RHEL3
systems being used in production.

Signed-off-by: Reuben Hawkins <reubenhwk@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

configure.ac: check 'tv_nsec' field in 'struct stat'Reuben Hawkins Thu, 8 Jan 2015 20:00:55 +0000 (12:00 -0800)

configure.ac: check 'tv_nsec' field in 'struct stat'

Detect 'tv_nsec' field in 'struct stat' and set Makefile variable
NO_NSEC appropriately.

A side-effect of the above detection is that we also determine
whether 'stat.st_mtimespec' is available, so, as a bonus, set the
Makefile variable USE_ST_TIMESPEC, as well.

Signed-off-by: Reuben Hawkins <reubenhwk@gmail.com>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

receive-pack: support push-to-checkout hookJunio C Hamano Mon, 1 Dec 2014 23:29:54 +0000 (15:29 -0800)

receive-pack: support push-to-checkout hook

When receive.denyCurrentBranch is set to updateInstead, a push that
tries to update the branch that is currently checked out is accepted
only when the index and the working tree exactly matches the
currently checked out commit, in which case the index and the
working tree are updated to match the pushed commit. Otherwise the
push is refused.

This hook can be used to customize this "push-to-deploy" logic. The
hook receives the commit with which the tip of the current branch is
going to be updated, and can decide what kind of local changes are
acceptable and how to update the index and the working tree to match
the updated tip of the current branch.

For example, the hook can simply run `git read-tree -u -m HEAD "$1"`
in order to emulate 'git fetch' that is run in the reverse direction
with `git push`, as the two-tree form of `read-tree -u -m` is
essentially the same as `git checkout` that switches branches while
keeping the local changes in the working tree that do not interfere
with the difference between the branches.

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

rerere: error out on autoupdate failureJonathan Nieder Wed, 3 Dec 2014 04:20:49 +0000 (20:20 -0800)

rerere: error out on autoupdate failure

We have been silently tolerating errors by returning early with an
error that the caller ignores since rerere.autoupdate was introduced
in v1.6.0-rc0~120^2 (2008-06-22). So on error (for example if the
index is already locked), rerere can return success silently without
updating the index or with only some items in the index updated.

Better to treat such failures as a fatal error so the operator can
figure out what is wrong and fix it.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

show-branch: line-wrap show-branch usageAlexander Kuleshov Thu, 8 Jan 2015 18:08:36 +0000 (00:08 +0600)

show-branch: line-wrap show-branch usage

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

t5543-atomic-push.sh: add basic tests for atomic pushesStefan Beller Thu, 8 Jan 2015 03:23:24 +0000 (19:23 -0800)

t5543-atomic-push.sh: add basic tests for atomic pushes

This adds tests for the atomic push option.
The first four tests check if the atomic option works in
good conditions and the last three patches check if the atomic
option prevents any change to be pushed if just one ref cannot
be updated.

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

push.c: add an --atomic argumentRonnie Sahlberg Thu, 8 Jan 2015 03:23:23 +0000 (19:23 -0800)

push.c: add an --atomic argument

Add a command line argument to the git push command to request atomic
pushes.

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

send-pack.c: add --atomic command line argumentRonnie Sahlberg Thu, 8 Jan 2015 03:23:22 +0000 (19:23 -0800)

send-pack.c: add --atomic command line argument

This adds support to send-pack to negotiate and use atomic pushes
iff the server supports it. Atomic pushes are activated by a new command
line flag --atomic.

In order to do this we also need to change the semantics for send_pack()
slightly. The existing send_pack() function actually doesn't send all the
refs back to the server when multiple refs are involved, for example
when using --all. Several of the failure modes for pushes can already be
detected locally in the send_pack client based on the information from the
initial server side list of all the refs as generated by receive-pack.
Any such refs that we thus know would fail to push are thus pruned from
the list of refs we send to the server to update.

For atomic pushes, we have to deal thus with both failures that are detected
locally as well as failures that are reported back from the server. In order
to do so we treat all local failures as push failures too.

We introduce a new status code REF_STATUS_ATOMIC_PUSH_FAILED so we can
flag all refs that we would normally have tried to push to the server
but we did not due to local failures. This is to improve the error message
back to the end user to flag that "these refs failed to update since the
atomic push operation failed."

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

send-pack: rename ref_update_to_be_sent to check_to_sen... Stefan Beller Thu, 8 Jan 2015 03:23:21 +0000 (19:23 -0800)

send-pack: rename ref_update_to_be_sent to check_to_send_update

This renames ref_update_to_be_sent to check_to_send_update and inverts
the meaning of the return value. Having the return value inverted we
can have different values for the error codes. This is useful in a
later patch when we want to know if we hit the CHECK_REF_STATUS_REJECTED
case.

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

receive-pack.c: negotiate atomic push supportRonnie Sahlberg Thu, 8 Jan 2015 03:23:20 +0000 (19:23 -0800)

receive-pack.c: negotiate atomic push support

This adds the atomic protocol option to allow
receive-pack to inform the client that it has
atomic push capability.

This commit makes the functionality introduced
in the previous commits go live for the serving
side. The changes in documentation reflect the
protocol capabilities of the server.

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

receive-pack.c: add execute_commands_atomic functionStefan Beller Thu, 8 Jan 2015 03:23:19 +0000 (19:23 -0800)

receive-pack.c: add execute_commands_atomic function

This introduces the new function execute_commands_atomic which will use
one atomic transaction for all updates. The default behavior is still
the old non atomic way, one ref at a time. This is to cause as little
disruption as possible to existing clients. It is unknown if there are
client scripts that depend on the old non-atomic behavior so we make it
opt-in for now.

A later patch will add the possibility to actually use the functionality
added by this patch. For now use_atomic is always 0.

Inspired-by: Ronnie Sahlberg <sahlberg@google.com>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

receive-pack.c: move transaction handling in a central... Stefan Beller Thu, 8 Jan 2015 03:23:18 +0000 (19:23 -0800)

receive-pack.c: move transaction handling in a central place

This moves all code related to transactions into the
execute_commands_non_atomic function. This includes
beginning and committing the transaction as well as
dealing with the errors which may occur during the
begin and commit phase of a transaction.

No functional changes intended.

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

receive-pack.c: move iterating over all commands outsid... Stefan Beller Thu, 8 Jan 2015 03:23:17 +0000 (19:23 -0800)

receive-pack.c: move iterating over all commands outside execute_commands

This commit allows us in a later patch to easily distinguish between
the non atomic way to update the received refs and the atomic way which
is introduced in a later patch.

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

receive-pack.c: die instead of error in case of possibl... Stefan Beller Thu, 8 Jan 2015 03:23:16 +0000 (19:23 -0800)

receive-pack.c: die instead of error in case of possible future bug

Discussion on the previous patch revealed we rather want to err on the
safe side. To do so we need to stop receive-pack in case of the possible
future bug when connectivity is not checked on a shallow push.

Also while touching that code we considered that removing the reported
refs may be harmful in some situations. Sound the message more like a
"This Cannot Happen, Please Investigate!" instead of giving advice to
remove refs.

Suggested-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

receive-pack.c: shorten the execute_commands loop over... Stefan Beller Thu, 8 Jan 2015 03:23:15 +0000 (19:23 -0800)

receive-pack.c: shorten the execute_commands loop over all commands

Make the main "execute_commands" loop in receive-pack easier to read
by splitting out some steps into helper functions. The new helper
'should_process_cmd' checks if a ref update is unnecessary, whether
due to an error having occurred or for another reason. The helper
'warn_if_skipped_connectivity_check' warns if we have forgotten to
run a connectivity check on a ref which is shallow for the client
which would be a bug.

This will help us to duplicate less code in a later patch when we make
a second copy of the "execute_commands" loop.

No functional change intended.

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

remote-curl: fall back to Basic auth if Negotiate failsbrian m. carlson Thu, 8 Jan 2015 00:29:20 +0000 (00:29 +0000)

remote-curl: fall back to Basic auth if Negotiate fails

Apache servers using mod_auth_kerb can be configured to allow the user
to authenticate either using Negotiate (using the Kerberos ticket) or
Basic authentication (using the Kerberos password). Often, one will
want to use Negotiate authentication if it is available, but fall back
to Basic authentication if the ticket is missing or expired.

However, libcurl will try very hard to use something other than Basic
auth, even over HTTPS. If Basic and something else are offered, libcurl
will never attempt to use Basic, even if the other option fails.
Teach the HTTP client code to stop trying authentication mechanisms that
don't use a password (currently Negotiate) after the first failure,
since if they failed the first time, they will never succeed.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

format-patch: ignore diff.submodule settingDoug Kelly Wed, 7 Jan 2015 20:32:12 +0000 (14:32 -0600)

format-patch: ignore diff.submodule setting

diff.submodule when set to log produces output which git-am cannot
handle. Ignore this setting when generating patch output.

Signed-off-by: Doug Kelly <dougk.ff7@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

t4255: test am submodule with diff.submoduleDoug Kelly Wed, 7 Jan 2015 20:32:11 +0000 (14:32 -0600)

t4255: test am submodule with diff.submodule

git am will break when using diff.submodule=log; add some test cases
to illustrate this breakage as simply as possible. There are
currently two ways this can fail:

* With errors ("unrecognized input"), if only change
* Silently (no submodule change), if other files change

Test for both conditions and ensure without diff.submodule this works.

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Doug Kelly <dougk.ff7@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Fourth batch for 2.3 cycleJunio C Hamano Wed, 7 Jan 2015 21:12:54 +0000 (13:12 -0800)

Fourth batch for 2.3 cycle

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

Merge branch 'maint'Junio C Hamano Wed, 7 Jan 2015 21:28:29 +0000 (13:28 -0800)

Merge branch 'maint'

* maint:
is_hfs_dotgit: loosen over-eager match of \u{..47}

Merge branch 'maint-2.1' into maintJunio C Hamano Wed, 7 Jan 2015 21:28:10 +0000 (13:28 -0800)

Merge branch 'maint-2.1' into maint

* maint-2.1:
is_hfs_dotgit: loosen over-eager match of \u{..47}

Merge branch 'maint-2.0' into maint-2.1Junio C Hamano Wed, 7 Jan 2015 21:27:56 +0000 (13:27 -0800)

Merge branch 'maint-2.0' into maint-2.1

* maint-2.0:
is_hfs_dotgit: loosen over-eager match of \u{..47}

Merge branch 'maint-1.9' into maint-2.0Junio C Hamano Wed, 7 Jan 2015 21:27:19 +0000 (13:27 -0800)

Merge branch 'maint-1.9' into maint-2.0

* maint-1.9:
is_hfs_dotgit: loosen over-eager match of \u{..47}

Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano Wed, 7 Jan 2015 21:27:13 +0000 (13:27 -0800)

Merge branch 'maint-1.8.5' into maint-1.9

* maint-1.8.5:
is_hfs_dotgit: loosen over-eager match of \u{..47}

Merge branch 'jk/dotgit-case-maint-1.8.5' into maint... Junio C Hamano Wed, 7 Jan 2015 21:26:35 +0000 (13:26 -0800)

Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5

* jk/dotgit-case-maint-1.8.5:
is_hfs_dotgit: loosen over-eager match of \u{..47}

Merge branch 'bw/maint-0090-awk-tweak'Junio C Hamano Wed, 7 Jan 2015 21:10:44 +0000 (13:10 -0800)

Merge branch 'bw/maint-0090-awk-tweak'

* bw/maint-0090-awk-tweak:
t0090: tweak awk statement for Solaris /usr/xpg4/bin/awk

Merge branch 'jh/pre-push-sample-no-custom-ifs'Junio C Hamano Wed, 7 Jan 2015 21:10:40 +0000 (13:10 -0800)

Merge branch 'jh/pre-push-sample-no-custom-ifs'

The sample pre-push hook used customized IFS=' ' for no good reason.

* jh/pre-push-sample-no-custom-ifs:
pre-push.sample: remove unnecessary and misleading IFS=' '

Merge branch 'tf/prompt-preserve-exit-status'Junio C Hamano Wed, 7 Jan 2015 21:09:35 +0000 (13:09 -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 $? inside shell prompt

Merge branch 'sb/dco-indentation-fix'Junio C Hamano Wed, 7 Jan 2015 21:09:32 +0000 (13:09 -0800)

Merge branch 'sb/dco-indentation-fix'

* sb/dco-indentation-fix:
Documentation/SubmittingPatches: unify whitespace/tabs for the DCO

Merge branch 'bb/update-unicode-table'Junio C Hamano Wed, 7 Jan 2015 21:09:04 +0000 (13:09 -0800)

Merge branch 'bb/update-unicode-table'

Simplify the procedure to generate unicode table.

* bb/update-unicode-table:
update_unicode.sh: delete the command group
update_unicode.sh: make the output structure visible
update_unicode.sh: shorten uniset invocation path
update_unicode.sh: set UNICODE_DIR only once
update_unicode.sh: simplify output capture

Merge branch 'es/squelch-openssl-warnings-on-macosx'Junio C Hamano Wed, 7 Jan 2015 21:08:30 +0000 (13:08 -0800)

Merge branch 'es/squelch-openssl-warnings-on-macosx'

Squelch useless compiler warnings on Mac OS X.

* es/squelch-openssl-warnings-on-macosx:
git-compat-util: suppress unavoidable Apple-specific deprecation warnings

Merge branch 'sb/t5400-remove-unused'Junio C Hamano Wed, 7 Jan 2015 21:08:26 +0000 (13:08 -0800)

Merge branch 'sb/t5400-remove-unused'

* sb/t5400-remove-unused:
t5400: remove dead code

Merge branch 'lh/send-email-hide-x-mailer'Junio C Hamano Wed, 7 Jan 2015 21:07:27 +0000 (13:07 -0800)

Merge branch 'lh/send-email-hide-x-mailer'

"git send-email" normally identifies itself via X-Mailer: header
in the message it sends out. A new command line flag allows the
user to squelch the header.

* lh/send-email-hide-x-mailer:
test/send-email: --[no-]xmailer tests
send-email: add --[no-]xmailer option