git/git.git
7 years agopush: use remote.$name.push as a refmap
Junio C Hamano [Tue, 3 Dec 2013 23:41:15 +0000 (15:41 -0800)]
push: use remote.$name.push as a refmap

Since f2690487 (fetch: opportunistically update tracking refs,
2013-05-11), we stopped taking a non-storing refspec given on the
command line of "git fetch" literally, and instead started mapping
it via remote.$name.fetch refspecs.  This allows

    $ git fetch origin master

from the 'origin' repository, which is configured with

    [remote "origin"]
        fetch = +refs/heads/*:refs/remotes/origin/*

to update refs/remotes/origin/master with the result, as if the
command line were

    $ git fetch origin +master:refs/remotes/origin/master

to reduce surprises and improve usability.  Before that change, a
refspec on the command line without a colon was only to fetch the
history and leave the result in FETCH_HEAD, without updating the
remote-tracking branches.

When you are simulating a fetch from you by your mothership with a
push by you into your mothership, instead of having:

    [remote "satellite"]
        fetch = +refs/heads/*:refs/remotes/satellite/*

on the mothership repository and running:

    mothership$ git fetch satellite

you would have:

    [remote "mothership"]
        push = +refs/heads/*:refs/remotes/satellite/*

on your satellite machine, and run:

    satellite$ git push mothership

Because we so far did not make the corresponding change to the push
side, this command:

    satellite$ git push mothership master

does _not_ allow you on the satellite to only push 'master' out but
still to the usual destination (i.e. refs/remotes/satellite/master).

Implement the logic to map an unqualified refspec given on the
command line via the remote.$name.push refspec.  This will bring a
bit more symmetry between "fetch" and "push".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agobuiltin/push.c: use strbuf instead of manual allocation
Junio C Hamano [Tue, 3 Dec 2013 22:33:10 +0000 (14:33 -0800)]
builtin/push.c: use strbuf instead of manual allocation

The command line arguments given to "git push" are massaged into
a list of refspecs in set_refspecs() function. This was implemented
using xmalloc, strcpy and friends, but it is much easier to read if
done using strbuf.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoSync with 1.8.5.1
Junio C Hamano [Tue, 3 Dec 2013 19:42:03 +0000 (11:42 -0800)]
Sync with 1.8.5.1

* maint:
  Git 1.8.5.1
  ref-iteration doc: add_submodule_odb() returns 0 for success

7 years agoMerge branch 'nd/glossary-content-pathspec-markup'
Junio C Hamano [Tue, 3 Dec 2013 19:41:52 +0000 (11:41 -0800)]
Merge branch 'nd/glossary-content-pathspec-markup'

* nd/glossary-content-pathspec-markup:
  glossary-content.txt: fix documentation of "**" patterns

7 years agoMerge branch 'jj/doc-markup-gitcli'
Junio C Hamano [Tue, 3 Dec 2013 19:41:46 +0000 (11:41 -0800)]
Merge branch 'jj/doc-markup-gitcli'

* jj/doc-markup-gitcli:
  Documentation/gitcli.txt: fix double quotes

7 years agoMerge branch 'jj/doc-markup-hints-in-coding-guidelines'
Junio C Hamano [Tue, 3 Dec 2013 19:41:43 +0000 (11:41 -0800)]
Merge branch 'jj/doc-markup-hints-in-coding-guidelines'

* jj/doc-markup-hints-in-coding-guidelines:
  State correct usage of literal examples in man pages in the coding standards

7 years agoMerge branch 'jj/log-doc'
Junio C Hamano [Tue, 3 Dec 2013 19:41:40 +0000 (11:41 -0800)]
Merge branch 'jj/log-doc'

Mark-up fixes.

* jj/log-doc:
  Documentation/git-log.txt: mark-up fix and minor rephasing
  Documentation/git-log: update "--log-size" description

7 years agoMerge branch 'jj/rev-list-options-doc'
Junio C Hamano [Tue, 3 Dec 2013 19:41:37 +0000 (11:41 -0800)]
Merge branch 'jj/rev-list-options-doc'

Mark-up and grammo fixes.

* jj/rev-list-options-doc:
  Documentation/rev-list-options.txt: fix some grammatical issues and typos
  Documentation/rev-list-options.txt: fix mark-up

7 years agoMerge branch 'mi/typofixes'
Junio C Hamano [Tue, 3 Dec 2013 19:41:33 +0000 (11:41 -0800)]
Merge branch 'mi/typofixes'

* mi/typofixes:
  contrib: typofixes
  Documentation/technical/http-protocol.txt: typofixes
  typofixes: fix misspelt comments

7 years agoMerge branch 'tb/doc-fetch-pack-url'
Junio C Hamano [Tue, 3 Dec 2013 19:41:31 +0000 (11:41 -0800)]
Merge branch 'tb/doc-fetch-pack-url'

* tb/doc-fetch-pack-url:
  git-fetch-pack uses URLs like git-fetch

7 years agoGit 1.8.5.1 v1.8.5.1
Junio C Hamano [Tue, 3 Dec 2013 19:16:56 +0000 (11:16 -0800)]
Git 1.8.5.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoref-iteration doc: add_submodule_odb() returns 0 for success
Nick Townsend [Mon, 25 Nov 2013 23:31:09 +0000 (15:31 -0800)]
ref-iteration doc: add_submodule_odb() returns 0 for success

The usage sample of add_submodule_odb() function in the Submodules
section expects non-zero return value for success, but the function
actually reports success with zero.

Helped-by: René Scharfe <l.s.r@web.de>
Reviewed-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Nick Townsend <nick.townsend@mac.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoSync with 1.8.4.5
Junio C Hamano [Mon, 2 Dec 2013 23:34:44 +0000 (15:34 -0800)]
Sync with 1.8.4.5

7 years agoGit 1.8.4.5 v1.8.4.5
Junio C Hamano [Mon, 2 Dec 2013 23:33:30 +0000 (15:33 -0800)]
Git 1.8.4.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agosubmodule: do not copy unknown update mode from .gitmodules
Junio C Hamano [Mon, 2 Dec 2013 21:31:55 +0000 (13:31 -0800)]
submodule: do not copy unknown update mode from .gitmodules

When submodule.$name.update is given as hint from the upstream in
the .gitmodules file, we used to blindly copy it to .git/config,
unless there already is a value defined for the submodule.

However, there is no reason to expect that the update mode hinted by
the upstream is available in the version of Git the user is using,
and a really custom "!cmd" prepared by an upstream person running on
Linux may not even be available to a user on Windows.  It is simply
irresponsible to copy the setting blindly and to attempt to use it
during a later "submodule update" without validating it first.

Just show the suggested value to the diagnostic output, and set the
value to 'none' in the configuration, if it is not one of the ones
that are known to be supported by this version of Git.

Helped-by: Jens Lehmann <Jens.Lehmann@web.de>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoGit 1.8.5 v1.8.5
Junio C Hamano [Wed, 27 Nov 2013 20:14:45 +0000 (12:14 -0800)]
Git 1.8.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoSync with maint
Junio C Hamano [Wed, 27 Nov 2013 20:13:29 +0000 (12:13 -0800)]
Sync with maint

* maint:
  remote-hg: don't decode UTF-8 paths into Unicode objects

7 years agoremote-hg: don't decode UTF-8 paths into Unicode objects
Richard Hansen [Mon, 18 Nov 2013 04:12:42 +0000 (23:12 -0500)]
remote-hg: don't decode UTF-8 paths into Unicode objects

The internal mercurial API expects ordinary 8-bit string objects, not
Unicode string objects.  With this change, the test-hg.sh unit tests
pass again.

Signed-off-by: Richard Hansen <rhansen@bbn.com>
Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'rh/remote-hg-bzr-updates' (early part)
Junio C Hamano [Mon, 25 Nov 2013 16:20:02 +0000 (08:20 -0800)]
Merge branch 'rh/remote-hg-bzr-updates' (early part)

Unbreaks a recent breakage due to use of unquote-c-style.

This may need to be cherry-picked down to 1.8.4.x series.

* 'rh/remote-hg-bzr-updates' (early part):
  remote-hg: don't decode UTF-8 paths into Unicode objects

7 years agoglossary-content.txt: fix documentation of "**" patterns
Nguyễn Thái Ngọc Duy [Thu, 21 Nov 2013 06:44:20 +0000 (13:44 +0700)]
glossary-content.txt: fix documentation of "**" patterns

"**" means bold in ASCIIDOC, so we need to escape it. This is similar
to 8447dc8 (gitignore.txt: fix documentation of "**" patterns -
2013-11-07)

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoDocumentation/gitcli.txt: fix double quotes
Jason St. John [Wed, 20 Nov 2013 01:34:40 +0000 (20:34 -0500)]
Documentation/gitcli.txt: fix double quotes

Replace double quotes around literal examples with backticks

Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoGit 1.8.5-rc3 v1.8.5-rc3
Junio C Hamano [Wed, 20 Nov 2013 19:18:25 +0000 (11:18 -0800)]
Git 1.8.5-rc3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoSync with 1.8.4.4
Junio C Hamano [Wed, 20 Nov 2013 19:26:59 +0000 (11:26 -0800)]
Sync with 1.8.4.4

7 years agoGit 1.8.4.4 v1.8.4.4
Junio C Hamano [Wed, 20 Nov 2013 19:26:08 +0000 (11:26 -0800)]
Git 1.8.4.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'mb/relnotes-1.8.5-fix'
Junio C Hamano [Wed, 20 Nov 2013 19:15:25 +0000 (11:15 -0800)]
Merge branch 'mb/relnotes-1.8.5-fix'

* mb/relnotes-1.8.5-fix:
  RelNotes: spelling & grammar fixes

7 years agoRelNotes: spelling & grammar fixes
Marc Branchaud [Thu, 14 Nov 2013 17:01:13 +0000 (12:01 -0500)]
RelNotes: spelling & grammar fixes

Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'nd/literal-pathspecs'
Junio C Hamano [Mon, 18 Nov 2013 22:31:29 +0000 (14:31 -0800)]
Merge branch 'nd/literal-pathspecs'

Fixes a regression on 'master' since v1.8.4.

* nd/literal-pathspecs:
  pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses

7 years agoremote-hg: don't decode UTF-8 paths into Unicode objects
Richard Hansen [Mon, 18 Nov 2013 04:12:42 +0000 (23:12 -0500)]
remote-hg: don't decode UTF-8 paths into Unicode objects

The internal mercurial API expects ordinary 8-bit string objects, not
Unicode string objects.  With this change, the test-hg.sh unit tests
pass again.

Signed-off-by: Richard Hansen <rhansen@bbn.com>
Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoDocumentation/rev-list-options.txt: fix some grammatical issues and typos
Jason St. John [Fri, 15 Nov 2013 01:34:02 +0000 (20:34 -0500)]
Documentation/rev-list-options.txt: fix some grammatical issues and typos

Various fixes:

 - fix typos (e.g. "show" -> "shown")
 - use "regular expression(s)" instead of "regexp" where appropriate
 - reword some sentences for easier reading
 - fix/improve some grammatical issues (e.g. comma usage)
 - add missing articles (e.g. "the")
 - change "E-mail" to "email"

Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoDocumentation/rev-list-options.txt: fix mark-up
Jason St. John [Fri, 15 Nov 2013 01:34:01 +0000 (20:34 -0500)]
Documentation/rev-list-options.txt: fix mark-up

Some the labeled list entries have a blank line between the label
and the body text, and some don't.  Use the latter style for
consistency; incidentally, syntax highlighting in Vim works better
if there is no blank line there.

Typeset literal options, commands, and path names in monospace.
When using `literal string` mark-up to do so, there is no need to
escape AsciiDoc special characters with backslashes, so make sure we
don't do so.

Replace some double quotes with proper AsciiDoc quotes
(e.g. ``foo'').

Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoState correct usage of literal examples in man pages in the coding standards
Jason St. John [Thu, 14 Nov 2013 23:08:45 +0000 (18:08 -0500)]
State correct usage of literal examples in man pages in the coding standards

The man pages contain inconsistent usage of backticks vs. single quotes
around options, commands, etc. that are in paragraphs. This commit states
that backticks should always be used around literal examples.

This commit states that "--" and friends should not be escaped
(e.g. use `--pretty=oneline` instead of `\--pretty=oneline`).

This commit also states correct usage for typesetting command usage
examples with inline substitutions.

Thanks-to: Ramkumar Ramachandra <artagnon@gmail.com>
Thanks-to: Stuart Rackham <srackham@gmail.com>
Thanks-to: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'maint'
Junio C Hamano [Mon, 18 Nov 2013 20:25:28 +0000 (12:25 -0800)]
Merge branch 'maint'

Hotfix for recent regression while talking to upload-pack
in a repository with many symbolic refs.

* maint:
  Revert "upload-pack: send non-HEAD symbolic refs"

7 years agoMerge branch 'jx/branch-vv-always-compare-with-upstream'
Junio C Hamano [Mon, 18 Nov 2013 20:24:49 +0000 (12:24 -0800)]
Merge branch 'jx/branch-vv-always-compare-with-upstream'

Hot-fix for a regression.

* jx/branch-vv-always-compare-with-upstream:
  branch: fix --verbose output column alignment

7 years agobranch: fix --verbose output column alignment
Torstein Hegge [Thu, 14 Nov 2013 18:18:01 +0000 (19:18 +0100)]
branch: fix --verbose output column alignment

Commit f2e0873 (branch: report invalid tracking branch as gone) removed
an early return from fill_tracking_info() in the path taken when 'git
branch -v' lists a branch in sync with its upstream. This resulted in an
unconditionally added space in front of the subject line:

    $ git branch -v
    * master f5eb3da  commit pushed to upstream
      topic  f935eb6 unpublished topic

Instead, only add the trailing space if a decoration have been added.

To catch this kind of whitespace breakage in the tests, be a bit less
smart when filtering the output through sed.

Signed-off-by: Torstein Hegge <hegge@resisty.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoRevert "upload-pack: send non-HEAD symbolic refs"
Junio C Hamano [Mon, 18 Nov 2013 18:15:45 +0000 (10:15 -0800)]
Revert "upload-pack: send non-HEAD symbolic refs"

This reverts commit 5e7dcad771cb873e278a0571b46910d7c32e2f6c; there
may be unbounded number of symbolic refs in the repository, but the
capability header line in the on-wire protocol has a rather low
length limit.

7 years agoDocumentation/git-log.txt: mark-up fix and minor rephasing
Jason St. John [Wed, 13 Nov 2013 06:21:49 +0000 (01:21 -0500)]
Documentation/git-log.txt: mark-up fix and minor rephasing

 - typeset options, commands, and paths in monospace;
 - typeset references to sections with emphasis;
 - replace some double quotes with proper AsciiDoc quotes (e.g. ``foo'');
 - use title case when referring to section headings.

Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoDocumentation/git-log: update "--log-size" description
Jason St. John [Wed, 13 Nov 2013 06:21:48 +0000 (01:21 -0500)]
Documentation/git-log: update "--log-size" description

"--log-size" was added in commit 9fa3465, and the commit message
contained a satisfactory explanation; however, the man page entry
for it did not describe the actual output format, what the output
meant and what the option was meant to be used for.

Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoGit 1.8.5-rc2 v1.8.5-rc2
Junio C Hamano [Wed, 13 Nov 2013 20:59:31 +0000 (12:59 -0800)]
Git 1.8.5-rc2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge git://github.com/git-l10n/git-po
Junio C Hamano [Tue, 12 Nov 2013 19:26:11 +0000 (11:26 -0800)]
Merge git://github.com/git-l10n/git-po

* git://github.com/git-l10n/git-po:
  l10n: de.po: improve error message when pushing to unknown upstream
  l10n: de.po: translate 68 new messages
  po/TEAMS: update Thomas Rast's email address
  l10n: Update Swedish translation (2194t0f0u)
  l10n: fr.po 2194/1294 messages translated
  l10n: zh_CN.po: translate 68 messages (2194t0f0u)
  l10n: vi.po (2194t): Update and minor fix
  l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)

7 years agoCorrect word usage of "timezone" in "Documentation" directory
Jason St. John [Sat, 9 Nov 2013 00:48:52 +0000 (19:48 -0500)]
Correct word usage of "timezone" in "Documentation" directory

"timezone" is two words, not one (i.e. "time zone" is correct).

Correct this in these files:
-- date-formats.txt
-- git-blame.txt
-- git-cvsimport.txt
-- git-fast-import.txt
-- git-svn.txt
-- gitweb.conf.txt
-- rev-list-options.txt

Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agocontrib: typofixes
Masanari Iida [Tue, 12 Nov 2013 15:17:45 +0000 (00:17 +0900)]
contrib: typofixes

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoDocumentation/technical/http-protocol.txt: typofixes
Masanari Iida [Tue, 12 Nov 2013 15:17:43 +0000 (00:17 +0900)]
Documentation/technical/http-protocol.txt: typofixes

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agotypofixes: fix misspelt comments
Masanari Iida [Tue, 12 Nov 2013 15:17:42 +0000 (00:17 +0900)]
typofixes: fix misspelt comments

Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agol10n: de.po: improve error message when pushing to unknown upstream
Ralf Thielow [Fri, 8 Nov 2013 19:34:35 +0000 (20:34 +0100)]
l10n: de.po: improve error message when pushing to unknown upstream

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <tr@thomasrast.ch>
7 years agol10n: de.po: translate 68 new messages
Ralf Thielow [Sat, 2 Nov 2013 17:58:52 +0000 (18:58 +0100)]
l10n: de.po: translate 68 new messages

Translate 68 new messages came from git.pot update in 727b957
(l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <tr@thomasrast.ch>
7 years agopo/TEAMS: update Thomas Rast's email address
Ralf Thielow [Sat, 2 Nov 2013 17:56:14 +0000 (18:56 +0100)]
po/TEAMS: update Thomas Rast's email address

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <tr@thomasrast.ch>
7 years agogit-fetch-pack uses URLs like git-fetch
Torsten Bögershausen [Fri, 8 Nov 2013 17:54:05 +0000 (18:54 +0100)]
git-fetch-pack uses URLs like git-fetch

"git fetch-pack" allows [<host>:]<directory> to point out the source
repository.
Use the term <repository>, which is already used in "git fetch" or "git pull"
to describe URLs supported by Git.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge remote-tracking branch 'sv/nafmo/master'
Jiang Xin [Sun, 10 Nov 2013 00:48:23 +0000 (08:48 +0800)]
Merge remote-tracking branch 'sv/nafmo/master'

* sv/nafmo/master:
  l10n: Update Swedish translation (2194t0f0u)

7 years agol10n: Update Swedish translation (2194t0f0u)
Peter Krefting [Tue, 2 Jul 2013 12:09:37 +0000 (13:09 +0100)]
l10n: Update Swedish translation (2194t0f0u)

And fix a typo.

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
7 years agol10n: fr.po 2194/1294 messages translated
Jean-Noel Avila [Fri, 1 Nov 2013 14:35:08 +0000 (15:35 +0100)]
l10n: fr.po 2194/1294 messages translated

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Sebastien Helleu <flashcode@flashtux.org>
7 years agoSync with 1.8.4.3
Junio C Hamano [Fri, 8 Nov 2013 20:08:43 +0000 (12:08 -0800)]
Sync with 1.8.4.3

7 years agoGit 1.8.4.3 v1.8.4.3
Junio C Hamano [Fri, 8 Nov 2013 20:06:19 +0000 (12:06 -0800)]
Git 1.8.4.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'jn/test-prereq-perl-doc' into maint
Junio C Hamano [Fri, 8 Nov 2013 20:01:58 +0000 (12:01 -0800)]
Merge branch 'jn/test-prereq-perl-doc' into maint

The interaction between use of Perl in our test suite and NO_PERL
has been clarified a bit.

* jn/test-prereq-perl-doc:
  t/README: tests can use perl even with NO_PERL

7 years agoMerge branch 'ap/remote-hg-unquote-cquote' into maint
Junio C Hamano [Fri, 8 Nov 2013 20:01:13 +0000 (12:01 -0800)]
Merge branch 'ap/remote-hg-unquote-cquote' into maint

A fast-import stream expresses a pathname with funny characters by
quoting them in C style; remote-hg remote helper (in contrib/)
forgot to unquote such a path.

* ap/remote-hg-unquote-cquote:
  remote-hg: unquote C-style paths when exporting

7 years agoMerge branch 'jc/upload-pack-send-symref' into maint
Junio C Hamano [Fri, 8 Nov 2013 19:38:00 +0000 (11:38 -0800)]
Merge branch 'jc/upload-pack-send-symref' into maint

One long-standing flaw in the pack transfer protocol used by "git
clone" was that there was no way to tell the other end which branch
"HEAD" points at, and the receiving end needed to guess.  A new
capability has been defined in the pack protocol to convey this
information so that cloning from a repository with more than one
branches pointing at the same commit where the HEAD is at now
reliably sets the initial branch in the resulting repository.

* jc/upload-pack-send-symref:
  t5570: Update for clone-progress-to-stderr branch
  t5570: Update for symref capability
  clone: test the new HEAD detection logic
  connect: annotate refs with their symref information in get_remote_head()
  connect.c: make parse_feature_value() static
  upload-pack: send non-HEAD symbolic refs
  upload-pack: send symbolic ref information as capability
  upload-pack.c: do not pass confusing cb_data to mark_our_ref()
  t5505: fix "set-head --auto with ambiguous HEAD" test

7 years agoMerge branch 'jk/http-auth-redirects' into maint
Junio C Hamano [Fri, 8 Nov 2013 19:37:25 +0000 (11:37 -0800)]
Merge branch 'jk/http-auth-redirects' into maint

We did not handle cases where http transport gets redirected during
the authorization request (e.g. from http:// to https://).

* jk/http-auth-redirects:
  http.c: Spell the null pointer as NULL
  remote-curl: rewrite base url from info/refs redirects
  remote-curl: store url as a strbuf
  remote-curl: make refs_url a strbuf
  http: update base URLs when we see redirects
  http: provide effective url to callers
  http: hoist credential request out of handle_curl_result
  http: refactor options to http_get_*
  http_request: factor out curlinfo_strbuf
  http_get_file: style fixes

7 years agoSync with maint
Junio C Hamano [Thu, 7 Nov 2013 22:41:25 +0000 (14:41 -0800)]
Sync with maint

* maint:
  Start preparing for 1.8.4.3
  gitignore.txt: fix documentation of "**" patterns

7 years agoStart preparing for 1.8.4.3
Junio C Hamano [Thu, 7 Nov 2013 22:39:47 +0000 (14:39 -0800)]
Start preparing for 1.8.4.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'sc/doc-howto-dumb-http' into maint
Junio C Hamano [Thu, 7 Nov 2013 22:37:39 +0000 (14:37 -0800)]
Merge branch 'sc/doc-howto-dumb-http' into maint

An ancient How-To on serving Git repositories on an HTTP server
lacked a warning that it has been mostly superseded with more
modern way.

* sc/doc-howto-dumb-http:
  doc/howto: warn about (dumb)http server document being too old

7 years agoMerge branch 'vd/doc-unpack-objects' into maint
Junio C Hamano [Thu, 7 Nov 2013 22:37:35 +0000 (14:37 -0800)]
Merge branch 'vd/doc-unpack-objects' into maint

The synopsis section of "git unpack-objects" documentation has been
clarified a bit.

* vd/doc-unpack-objects:
  Documentation: "pack-file" is not literal in unpack-objects
  Documentation: restore a space in unpack-objects usage

7 years agoMerge branch 'jk/subtree-install-fix' into maint
Junio C Hamano [Thu, 7 Nov 2013 22:37:17 +0000 (14:37 -0800)]
Merge branch 'jk/subtree-install-fix' into maint

We did not generate HTML version of documentation to "git subtree"
in contrib/.

* jk/subtree-install-fix:
  subtree: add makefile target for html docs

7 years agoMerge branch 'hn/log-graph-color-octopus' into maint
Junio C Hamano [Thu, 7 Nov 2013 22:37:11 +0000 (14:37 -0800)]
Merge branch 'hn/log-graph-color-octopus' into maint

Coloring around octopus merges in "log --graph" output was screwy.

* hn/log-graph-color-octopus:
  graph: fix coloring around octopus merges

7 years agoMerge branch 'mm/checkout-auto-track-fix' into maint
Junio C Hamano [Thu, 7 Nov 2013 22:36:59 +0000 (14:36 -0800)]
Merge branch 'mm/checkout-auto-track-fix' into maint

"git checkout topic", when there is not yet a local "topic" branch
but there is a unique remote-tracking branch for a remote "topic"
branch, pretended as if "git checkout -t -b topic remote/$r/topic"
(for that unique remote $r) was run. This hack however was not
implemented for "git checkout topic --".

* mm/checkout-auto-track-fix:
  checkout: proper error message on 'git checkout foo bar --'
  checkout: allow dwim for branch creation for "git checkout $branch --"

7 years agoMerge branch 'sg/prompt-svn-remote-fix' into maint
Junio C Hamano [Thu, 7 Nov 2013 22:36:45 +0000 (14:36 -0800)]
Merge branch 'sg/prompt-svn-remote-fix' into maint

Bash prompting code to deal with an SVN remote as an upstream
were coded in a way not supported by older Bash versions (3.x).

* sg/prompt-svn-remote-fix:
  bash prompt: don't use '+=' operator in show upstream code path

7 years agoMerge branch 'jk/split-broken-ident' into maint
Junio C Hamano [Thu, 7 Nov 2013 22:34:51 +0000 (14:34 -0800)]
Merge branch 'jk/split-broken-ident' into maint

The fall-back parsing of commit objects with broken author or
committer lines were less robust than ideal in picking up the
timestamps.

* jk/split-broken-ident:
  split_ident: parse timestamp from end of line

7 years agoMerge branch 'jc/revision-range-unpeel' into maint
Junio C Hamano [Thu, 7 Nov 2013 22:34:14 +0000 (14:34 -0800)]
Merge branch 'jc/revision-range-unpeel' into maint

"git rev-list --objects ^v1.0^ v1.0" gave v1.0 tag itself in the
output, but "git rev-list --objects v1.0^..v1.0" did not.

* jc/revision-range-unpeel:
  revision: do not peel tags used in range notation

7 years agogitignore.txt: fix documentation of "**" patterns
Karsten Blees [Thu, 7 Nov 2013 16:30:47 +0000 (17:30 +0100)]
gitignore.txt: fix documentation of "**" patterns

"**" means bold in ASCIIDOC, so we need to escape it.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoGit 1.8.5-rc1 v1.8.5-rc1
Junio C Hamano [Wed, 6 Nov 2013 22:35:19 +0000 (14:35 -0800)]
Git 1.8.5-rc1

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'fc/trivial'
Junio C Hamano [Wed, 6 Nov 2013 22:34:43 +0000 (14:34 -0800)]
Merge branch 'fc/trivial'

A random collection of style fixes and minor doc updates.

* fc/trivial:
  setup: trivial style fixes
  run-command: trivial style fixes
  diff: trivial style fix
  revision: trivial style fixes
  pretty: trivial style fix
  describe: trivial style fixes
  transport-helper: trivial style fix
  sha1-name: trivial style cleanup
  branch: trivial style fix
  revision: add missing include
  doc/pull: clarify the illustrations
  t: replace pulls with merges
  merge: simplify ff-only option

7 years agoUpdate draft release notes to 1.8.5
Junio C Hamano [Mon, 4 Nov 2013 23:05:08 +0000 (15:05 -0800)]
Update draft release notes to 1.8.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'bw/solaris-sed-tr-test-portability'
Junio C Hamano [Mon, 4 Nov 2013 22:58:19 +0000 (14:58 -0800)]
Merge branch 'bw/solaris-sed-tr-test-portability'

* bw/solaris-sed-tr-test-portability:
  t4015: simplify sed command that is not even seen by sed
  Avoid difference in tr semantics between System V and BSD
  Change sed i\ usage to something Solaris' sed can handle

7 years agoMerge branch 'vd/doc-unpack-objects'
Junio C Hamano [Mon, 4 Nov 2013 22:58:15 +0000 (14:58 -0800)]
Merge branch 'vd/doc-unpack-objects'

* vd/doc-unpack-objects:
  Documentation: "pack-file" is not literal in unpack-objects
  Documentation: restore a space in unpack-objects usage

7 years agoMerge branch 'jk/duplicate-objects-in-packs'
Junio C Hamano [Mon, 4 Nov 2013 22:58:10 +0000 (14:58 -0800)]
Merge branch 'jk/duplicate-objects-in-packs'

Test fixup to a topic recently graduated.

* jk/duplicate-objects-in-packs:
  Fix '\%o' for printf from coreutils

7 years agoMerge branch 'jk/subtree-install-fix'
Junio C Hamano [Mon, 4 Nov 2013 22:58:08 +0000 (14:58 -0800)]
Merge branch 'jk/subtree-install-fix'

* jk/subtree-install-fix:
  subtree: add makefile target for html docs

7 years agoMerge branch 'ak/cvsserver-stabilize-use-of-hash-keys'
Junio C Hamano [Mon, 4 Nov 2013 22:58:05 +0000 (14:58 -0800)]
Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'

* ak/cvsserver-stabilize-use-of-hash-keys:
  cvsserver: Determinize output to combat Perl 5.18 hash randomization

7 years agoMerge branch 'jk/wrap-perl-used-in-tests'
Junio C Hamano [Mon, 4 Nov 2013 22:58:01 +0000 (14:58 -0800)]
Merge branch 'jk/wrap-perl-used-in-tests'

* jk/wrap-perl-used-in-tests:
  t: use perl instead of "$PERL_PATH" where applicable
  t: provide a perl() function which uses $PERL_PATH

7 years agoMerge branch 'sc/doc-howto-dumb-http'
Junio C Hamano [Mon, 4 Nov 2013 22:57:57 +0000 (14:57 -0800)]
Merge branch 'sc/doc-howto-dumb-http'

* sc/doc-howto-dumb-http:
  doc/howto: warn about (dumb)http server document being too old

7 years agoMerge branch 'jn/test-prereq-perl-doc'
Junio C Hamano [Mon, 4 Nov 2013 22:57:53 +0000 (14:57 -0800)]
Merge branch 'jn/test-prereq-perl-doc'

* jn/test-prereq-perl-doc:
  t/README: tests can use perl even with NO_PERL

7 years agot4015: simplify sed command that is not even seen by sed
Junio C Hamano [Mon, 4 Nov 2013 18:11:15 +0000 (10:11 -0800)]
t4015: simplify sed command that is not even seen by sed

Noticed by Andreas Schwab; \<LF> inside a double quotes pair is
eaten by the shell to become an empty string and is not doing
anything.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agol10n: zh_CN.po: translate 68 messages (2194t0f0u)
Jiang Xin [Tue, 17 Sep 2013 15:37:05 +0000 (23:37 +0800)]
l10n: zh_CN.po: translate 68 messages (2194t0f0u)

Translate 68 new messages came from git.pot update in 727b957
(l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
7 years agol10n: vi.po (2194t): Update and minor fix
Tran Ngoc Quan [Sat, 2 Nov 2013 06:21:55 +0000 (13:21 +0700)]
l10n: vi.po (2194t): Update and minor fix

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
7 years agol10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)
Jiang Xin [Sat, 2 Nov 2013 00:08:26 +0000 (08:08 +0800)]
l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)

Generate po/git.pot from v1.8.5-rc0-23-gaa27064 for git v1.8.5
l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
7 years agoDocumentation: "pack-file" is not literal in unpack-objects
Vivien Didelot [Fri, 1 Nov 2013 15:42:43 +0000 (11:42 -0400)]
Documentation: "pack-file" is not literal in unpack-objects

Make it clear that "pack-file" is not to be spelled as is in the
unpack-objects usage.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoUpdate draft release notes to 1.8.5
Junio C Hamano [Fri, 1 Nov 2013 15:14:52 +0000 (08:14 -0700)]
Update draft release notes to 1.8.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agoMerge branch 'sb/refs-code-cleanup'
Junio C Hamano [Fri, 1 Nov 2013 14:38:58 +0000 (07:38 -0700)]
Merge branch 'sb/refs-code-cleanup'

* sb/refs-code-cleanup:
  cache: remove unused function 'have_git_dir'
  refs: remove unused function invalidate_ref_cache

7 years agoMerge branch 'rs/web-browse-xdg-open'
Junio C Hamano [Fri, 1 Nov 2013 14:38:56 +0000 (07:38 -0700)]
Merge branch 'rs/web-browse-xdg-open'

* rs/web-browse-xdg-open:
  web--browse: Add support for xdg-open

7 years agoMerge branch 'js/tests-windows-port-fix'
Junio C Hamano [Fri, 1 Nov 2013 14:38:54 +0000 (07:38 -0700)]
Merge branch 'js/tests-windows-port-fix'

* js/tests-windows-port-fix:
  tests: undo special treatment of CRLF for Windows
  Windows: a test_cmp that is agnostic to random LF <> CRLF conversions
  t5300-pack-object: do not compare binary data using test_cmp

7 years agoMerge branch 'js/test-help-format-windows-port-fix'
Junio C Hamano [Fri, 1 Nov 2013 14:38:51 +0000 (07:38 -0700)]
Merge branch 'js/test-help-format-windows-port-fix'

* js/test-help-format-windows-port-fix:
  t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html

7 years agoMerge branch 'jk/reset-p-current-head-fix'
Junio C Hamano [Fri, 1 Nov 2013 14:38:49 +0000 (07:38 -0700)]
Merge branch 'jk/reset-p-current-head-fix'

"git reset -p HEAD" has codepath to special case it from resetting
to contents of other commits, but recent change broke it.

* jk/reset-p-current-head-fix:
  reset: pass real rev name to add--interactive
  add-interactive: handle unborn branch in patch mode

7 years agoMerge branch 'jk/pack-corruption-post-mortem'
Junio C Hamano [Fri, 1 Nov 2013 14:38:46 +0000 (07:38 -0700)]
Merge branch 'jk/pack-corruption-post-mortem'

* jk/pack-corruption-post-mortem:
  howto: add article on recovering a corrupted object

7 years agoMerge branch 'jk/for-each-ref-skip-parsing'
Junio C Hamano [Fri, 1 Nov 2013 14:38:41 +0000 (07:38 -0700)]
Merge branch 'jk/for-each-ref-skip-parsing'

* jk/for-each-ref-skip-parsing:
  for-each-ref: avoid loading objects to print %(objectname)

7 years agoMerge branch 'ap/remote-hg-unquote-cquote'
Junio C Hamano [Fri, 1 Nov 2013 14:38:35 +0000 (07:38 -0700)]
Merge branch 'ap/remote-hg-unquote-cquote'

A fast-import stream expresses a pathname with funny characters by
quoting them in C style; remote-hg remote helper forgot to unquote
such a path.

* ap/remote-hg-unquote-cquote:
  remote-hg: unquote C-style paths when exporting

7 years agoMerge branch 'jl/submodule-mv'
Junio C Hamano [Fri, 1 Nov 2013 14:38:26 +0000 (07:38 -0700)]
Merge branch 'jl/submodule-mv'

Moving a regular file in a repository with a .gitmodules file was
producing a warning 'Could not find section in .gitmodules where
path=<filename>'.

* jl/submodule-mv:
  mv: Fix spurious warning when moving a file in presence of submodules

7 years agoDocumentation: restore a space in unpack-objects usage
Vivien Didelot [Thu, 31 Oct 2013 21:41:11 +0000 (17:41 -0400)]
Documentation: restore a space in unpack-objects usage

The commit 87b7b84 removed a space in the unpack-objects usage, which
makes the synopsis a bit confusing. This patch simply restores it.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agosetup: trivial style fixes
Felipe Contreras [Thu, 31 Oct 2013 09:25:46 +0000 (03:25 -0600)]
setup: trivial style fixes

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agorun-command: trivial style fixes
Felipe Contreras [Thu, 31 Oct 2013 09:25:45 +0000 (03:25 -0600)]
run-command: trivial style fixes

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agodiff: trivial style fix
Felipe Contreras [Thu, 31 Oct 2013 09:25:44 +0000 (03:25 -0600)]
diff: trivial style fix

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agorevision: trivial style fixes
Felipe Contreras [Thu, 31 Oct 2013 09:25:43 +0000 (03:25 -0600)]
revision: trivial style fixes

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agopretty: trivial style fix
Felipe Contreras [Thu, 31 Oct 2013 09:25:42 +0000 (03:25 -0600)]
pretty: trivial style fix

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
7 years agodescribe: trivial style fixes
Felipe Contreras [Thu, 31 Oct 2013 09:25:41 +0000 (03:25 -0600)]
describe: trivial style fixes

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>