| 5512ac5 | Junio C Hamano | 17 December 2013, 19:42:12 UTC | Git 1.8.5.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2013, 19:42:12 UTC |
| 59f3e3f | Junio C Hamano | 17 December 2013, 19:38:23 UTC | Merge branch 'rs/doc-submitting-patches' into maint * rs/doc-submitting-patches: SubmittingPatches: document how to handle multiple patches | 17 December 2013, 19:38:23 UTC |
| 5169f5a | Junio C Hamano | 17 December 2013, 19:37:55 UTC | Merge branch 'tr/doc-git-cherry' into maint * tr/doc-git-cherry: Documentation: revamp git-cherry(1) | 17 December 2013, 19:37:55 UTC |
| 2126074 | Junio C Hamano | 17 December 2013, 19:36:54 UTC | Merge branch 'nd/glossary-content-pathspec-markup' into maint * nd/glossary-content-pathspec-markup: glossary-content.txt: fix documentation of "**" patterns | 17 December 2013, 19:36:54 UTC |
| c8394bb | Junio C Hamano | 17 December 2013, 19:36:38 UTC | Merge branch 'jj/doc-markup-gitcli' into maint * jj/doc-markup-gitcli: Documentation/gitcli.txt: fix double quotes | 17 December 2013, 19:36:38 UTC |
| 5712dcb | Junio C Hamano | 17 December 2013, 19:36:10 UTC | Merge branch 'jj/doc-markup-hints-in-coding-guidelines' into maint * jj/doc-markup-hints-in-coding-guidelines: State correct usage of literal examples in man pages in the coding standards | 17 December 2013, 19:36:10 UTC |
| ace08c2 | Junio C Hamano | 17 December 2013, 19:35:41 UTC | Merge branch 'jj/log-doc' into maint * jj/log-doc: Documentation/git-log.txt: mark-up fix and minor rephasing Documentation/git-log: update "--log-size" description | 17 December 2013, 19:35:41 UTC |
| 7be001d | Junio C Hamano | 17 December 2013, 19:34:41 UTC | Merge branch 'jj/rev-list-options-doc' into maint * jj/rev-list-options-doc: Documentation/rev-list-options.txt: fix some grammatical issues and typos Documentation/rev-list-options.txt: fix mark-up | 17 December 2013, 19:34:41 UTC |
| e8fcf70 | Junio C Hamano | 17 December 2013, 19:34:24 UTC | Merge branch 'tb/doc-fetch-pack-url' into maint * tb/doc-fetch-pack-url: git-fetch-pack uses URLs like git-fetch | 17 December 2013, 19:34:24 UTC |
| a4a227a | Junio C Hamano | 17 December 2013, 19:34:01 UTC | Merge branch 'mi/typofixes' into maint * mi/typofixes: contrib: typofixes Documentation/technical/http-protocol.txt: typofixes typofixes: fix misspelt comments | 17 December 2013, 19:34:01 UTC |
| a5d5653 | Junio C Hamano | 17 December 2013, 19:32:50 UTC | Merge branch 'jh/loose-object-dirs-creation-race' into maint Two processes creating loose objects at the same time could have failed unnecessarily when the name of their new objects started with the same byte value, due to a race condition. * jh/loose-object-dirs-creation-race: sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs | 17 December 2013, 19:32:50 UTC |
| 4766036 | Junio C Hamano | 17 December 2013, 19:32:04 UTC | Merge branch 'jk/two-way-merge-corner-case-fix' into maint "git am --abort" sometimes complained about not being able to write a tree with an 0{40} object in it. * jk/two-way-merge-corner-case-fix: t1005: add test for "read-tree --reset -u A B" t1005: reindent unpack-trees: fix "read-tree -u --reset A B" with conflicted index | 17 December 2013, 19:32:17 UTC |
| 66c24cd | Junio C Hamano | 17 December 2013, 19:31:18 UTC | Merge branch 'sb/sha1-loose-object-info-check-existence' into maint "git cat-file --batch-check=ok" did not check the existence of the named object. * sb/sha1-loose-object-info-check-existence: sha1_loose_object_info(): do not return success on missing object | 17 December 2013, 19:31:18 UTC |
| c8b928d | Junio C Hamano | 17 December 2013, 19:21:34 UTC | Merge branch 'nd/magic-pathspec' into maint "git diff -- ':(icase)makefile'" was unnecessarily rejected at the command line parser. * nd/magic-pathspec: diff: restrict pathspec limitations to diff b/f case only | 17 December 2013, 19:21:34 UTC |
| 3e7b066 | Michael Haggerty | 17 December 2013, 13:43:58 UTC | cmd_repack(): remove redundant local variable "nr_packs" Its value is the same as the number of entries in the "names" string_list, so just use "names.nr" in its place. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Acked-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2013, 18:54:41 UTC |
| a155a5f | Junio C Hamano | 03 December 2013, 19:16:56 UTC | Git 1.8.5.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2013, 19:16:56 UTC |
| 2951add | Nick Townsend | 25 November 2013, 23:31:09 UTC | 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> | 03 December 2013, 18:40:40 UTC |
| be38bee | Junio C Hamano | 02 December 2013, 23:34:44 UTC | Sync with 1.8.4.5 | 02 December 2013, 23:34:44 UTC |
| 2f93541 | Junio C Hamano | 02 December 2013, 23:33:30 UTC | Git 1.8.4.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2013, 23:33:30 UTC |
| ac1fbbd | Junio C Hamano | 02 December 2013, 21:31:55 UTC | 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> | 02 December 2013, 21:48:06 UTC |
| 7c801fb | Thomas Rast | 22 November 2013, 16:29:16 UTC | Documentation: revamp git-cherry(1) git-cherry(1)'s "description" section has never really managed to explain to me what the command does. It contains too much explanation of the algorithm instead of simply saying what goals it achieves, and too much terminology that we otherwise do not use (fork-point instead of merge-base). Try a much more concise approach: state what it finds out, why this is neat, and how the output is formatted, in a few short paragraphs. In return, provide much longer examples of how it fits into a "format-patch | am" based workflow, and how it compares to reading the same from git-log. Also carefully avoid using "merge" in a context where it does not mean something that comes from git-merge(1). Instead, say "apply" in an attempt to further link to patch workflow concepts. While there, also omit the language about _which_ upstream branch we treat as the default. I literally just learned that we support having several, so let's not confuse new users here, especially considering that git-config(1) does not document this. Prompted-by: a.huemer@commend.com on #git Signed-off-by: Thomas Rast <tr@thomasrast.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2013, 20:16:49 UTC |
| d2446df | Junio C Hamano | 27 November 2013, 20:14:45 UTC | Git 1.8.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2013, 20:14:45 UTC |
| 4a3fc52 | Junio C Hamano | 27 November 2013, 20:13:29 UTC | Sync with maint * maint: remote-hg: don't decode UTF-8 paths into Unicode objects | 27 November 2013, 20:13:29 UTC |
| 5c1d2e8 | Richard Hansen | 18 November 2013, 04:12:42 UTC | 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> | 27 November 2013, 20:09:50 UTC |
| eaa6c98 | René Scharfe | 27 November 2013, 00:28:39 UTC | SubmittingPatches: document how to handle multiple patches Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2013, 19:05:58 UTC |
| c302941 | Junio C Hamano | 25 November 2013, 16:20:02 UTC | 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 | 25 November 2013, 16:20:02 UTC |
| 746be68 | Nguyễn Thái Ngọc Duy | 21 November 2013, 06:44:20 UTC | 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> | 21 November 2013, 18:33:40 UTC |
| 0b7e4e0 | Jason St. John | 20 November 2013, 01:34:40 UTC | 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> | 20 November 2013, 23:18:39 UTC |
| 887c6c1 | Nguyễn Thái Ngọc Duy | 20 November 2013, 01:26:41 UTC | diff: restrict pathspec limitations to diff b/f case only builtin_diff_b_f() needs a path, not pathspec. Other modes in diff can deal with pathspec just fine. But because of the current GUARD_PATHSPEC() location, other modes also reject :(glob) and :(icase). Move GUARD_PATHSPEC(), and the "path" assignment statement, which is the reason of this GUARD_PATHSPEC(), inside builtin_diff_b_f(). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 November 2013, 23:04:51 UTC |
| 5fd09df | Junio C Hamano | 20 November 2013, 19:18:25 UTC | Git 1.8.5-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 November 2013, 19:27:26 UTC |
| 039a6d2 | Junio C Hamano | 20 November 2013, 19:26:59 UTC | Sync with 1.8.4.4 | 20 November 2013, 19:26:59 UTC |
| becb433 | Junio C Hamano | 20 November 2013, 19:26:08 UTC | Git 1.8.4.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 November 2013, 19:26:08 UTC |
| a39afc0 | Junio C Hamano | 20 November 2013, 19:15:25 UTC | Merge branch 'mb/relnotes-1.8.5-fix' * mb/relnotes-1.8.5-fix: RelNotes: spelling & grammar fixes | 20 November 2013, 19:15:25 UTC |
| 569fb49 | Marc Branchaud | 14 November 2013, 17:01:13 UTC | RelNotes: spelling & grammar fixes Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 November 2013, 22:35:55 UTC |
| c6f1b92 | Junio C Hamano | 18 November 2013, 22:31:29 UTC | 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 | 18 November 2013, 22:31:29 UTC |
| c939d24 | Richard Hansen | 18 November 2013, 04:12:42 UTC | 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> | 18 November 2013, 21:45:56 UTC |
| 19d6eb4 | Jason St. John | 15 November 2013, 01:34:02 UTC | 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> | 18 November 2013, 21:38:43 UTC |
| 4528aa1 | Jason St. John | 15 November 2013, 01:34:01 UTC | 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> | 18 November 2013, 21:33:55 UTC |
| ca03c36 | Jason St. John | 14 November 2013, 23:08:45 UTC | 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> | 18 November 2013, 21:30:51 UTC |
| 33da0c9 | Junio C Hamano | 18 November 2013, 20:25:28 UTC | 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" | 18 November 2013, 20:25:28 UTC |
| ab930f0 | Junio C Hamano | 18 November 2013, 20:24:49 UTC | 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 | 18 November 2013, 20:24:49 UTC |
| 6b364d4 | Torstein Hegge | 14 November 2013, 18:18:01 UTC | 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> | 18 November 2013, 19:24:08 UTC |
| d007dbf | Junio C Hamano | 18 November 2013, 18:15:45 UTC | 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. | 18 November 2013, 18:15:45 UTC |
| b20cc13 | Jason St. John | 13 November 2013, 06:21:49 UTC | 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> | 13 November 2013, 22:09:14 UTC |
| c20e6fb | Jason St. John | 13 November 2013, 06:21:48 UTC | 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> | 13 November 2013, 22:06:17 UTC |
| 0397305 | Junio C Hamano | 13 November 2013, 20:59:31 UTC | Git 1.8.5-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 November 2013, 20:59:31 UTC |
| 7061504 | Junio C Hamano | 12 November 2013, 19:26:11 UTC | 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) | 12 November 2013, 19:26:11 UTC |
| 0ffa154 | Jason St. John | 09 November 2013, 00:48:52 UTC | 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> | 12 November 2013, 18:47:17 UTC |
| 68840cb | Masanari Iida | 12 November 2013, 15:17:45 UTC | contrib: typofixes Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 November 2013, 17:42:21 UTC |
| 7e7cf80 | Masanari Iida | 12 November 2013, 15:17:43 UTC | Documentation/technical/http-protocol.txt: typofixes Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 November 2013, 17:42:08 UTC |
| 382d20e | Masanari Iida | 12 November 2013, 15:17:42 UTC | typofixes: fix misspelt comments Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 November 2013, 17:24:27 UTC |
| 1f6fb7f | Ralf Thielow | 08 November 2013, 19:34:35 UTC | 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> | 12 November 2013, 05:31:15 UTC |
| 1d38363 | Ralf Thielow | 02 November 2013, 17:58:52 UTC | 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> | 12 November 2013, 05:31:15 UTC |
| 1b12df5 | Ralf Thielow | 02 November 2013, 17:56:14 UTC | po/TEAMS: update Thomas Rast's email address Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Thomas Rast <tr@thomasrast.ch> | 12 November 2013, 05:31:15 UTC |
| 70cce99 | Torsten Bögershausen | 08 November 2013, 17:54:05 UTC | 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> | 11 November 2013, 20:18:05 UTC |
| 86fe7c0 | Jiang Xin | 10 November 2013, 00:48:23 UTC | Merge remote-tracking branch 'sv/nafmo/master' * sv/nafmo/master: l10n: Update Swedish translation (2194t0f0u) | 10 November 2013, 00:48:23 UTC |
| 1f32de1 | Peter Krefting | 02 July 2013, 12:09:37 UTC | l10n: Update Swedish translation (2194t0f0u) And fix a typo. Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 09 November 2013, 18:08:23 UTC |
| eadd122 | Jean-Noel Avila | 01 November 2013, 14:35:08 UTC | 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> | 08 November 2013, 22:27:57 UTC |
| 0ecd94d | Junio C Hamano | 08 November 2013, 20:08:43 UTC | Sync with 1.8.4.3 | 08 November 2013, 20:08:43 UTC |
| d7d2c87 | Junio C Hamano | 08 November 2013, 20:06:19 UTC | Git 1.8.4.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 November 2013, 20:06:19 UTC |
| cdc0c0f | Junio C Hamano | 08 November 2013, 20:01:58 UTC | 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 | 08 November 2013, 20:01:58 UTC |
| 4bc3d3f | Junio C Hamano | 08 November 2013, 20:01:13 UTC | 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 | 08 November 2013, 20:01:14 UTC |
| 9196a2f | Junio C Hamano | 08 November 2013, 19:38:00 UTC | 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 | 08 November 2013, 19:38:00 UTC |
| e5becd0 | Junio C Hamano | 08 November 2013, 19:37:25 UTC | 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 | 08 November 2013, 19:37:26 UTC |
| 867b1c1 | Junio C Hamano | 07 November 2013, 22:41:25 UTC | Sync with maint * maint: Start preparing for 1.8.4.3 gitignore.txt: fix documentation of "**" patterns | 07 November 2013, 22:41:25 UTC |
| 486b65a | Junio C Hamano | 07 November 2013, 22:39:47 UTC | Start preparing for 1.8.4.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 November 2013, 22:39:47 UTC |
| 8edf8c0 | Junio C Hamano | 07 November 2013, 22:37:39 UTC | 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 | 07 November 2013, 22:37:39 UTC |
| 5022b58 | Junio C Hamano | 07 November 2013, 22:37:35 UTC | 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 | 07 November 2013, 22:37:36 UTC |
| 4ccf2f5 | Junio C Hamano | 07 November 2013, 22:37:17 UTC | 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 | 07 November 2013, 22:37:17 UTC |
| 46992b5 | Junio C Hamano | 07 November 2013, 22:37:11 UTC | 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 | 07 November 2013, 22:37:11 UTC |
| 07c55c0 | Junio C Hamano | 07 November 2013, 22:36:59 UTC | 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 --" | 07 November 2013, 22:36:59 UTC |
| 9ad3f74 | Junio C Hamano | 07 November 2013, 22:36:45 UTC | 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 | 07 November 2013, 22:36:45 UTC |
| 0ceb753 | Junio C Hamano | 07 November 2013, 22:34:51 UTC | 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 | 07 November 2013, 22:34:51 UTC |
| 0faff47 | Junio C Hamano | 07 November 2013, 22:34:14 UTC | 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 | 07 November 2013, 22:34:14 UTC |
| 8447dc8 | Karsten Blees | 07 November 2013, 16:30:47 UTC | 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> | 07 November 2013, 18:49:52 UTC |
| 6ba01ba | Junio C Hamano | 06 November 2013, 22:35:19 UTC | Git 1.8.5-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 November 2013, 22:35:19 UTC |
| 152a9c1 | Junio C Hamano | 06 November 2013, 22:34:43 UTC | 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 | 06 November 2013, 22:34:43 UTC |
| 4ef8d1d | Junio C Hamano | 06 November 2013, 18:00:57 UTC | sha1_loose_object_info(): do not return success on missing object Since 052fe5ea (sha1_loose_object_info: make type lookup optional, 2013-07-12), sha1_loose_object_info() returns happily without checking if the object in question exists, which is not what the the caller sha1_object_info_extended() expects; the caller does not even bother checking the existence of the object itself. Noticed-by: Sven Brauch <svenbrauch@googlemail.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 November 2013, 19:03:33 UTC |
| f26f72d | Junio C Hamano | 04 November 2013, 23:05:08 UTC | Update draft release notes to 1.8.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 November 2013, 23:05:08 UTC |
| 944adac | Junio C Hamano | 04 November 2013, 22:58:19 UTC | 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 | 04 November 2013, 22:58:20 UTC |
| ea06592 | Junio C Hamano | 04 November 2013, 22:58:15 UTC | 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 | 04 November 2013, 22:58:16 UTC |
| d35a42a | Junio C Hamano | 04 November 2013, 22:58:10 UTC | 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 | 04 November 2013, 22:58:10 UTC |
| 59c21d1 | Junio C Hamano | 04 November 2013, 22:58:08 UTC | Merge branch 'jk/subtree-install-fix' * jk/subtree-install-fix: subtree: add makefile target for html docs | 04 November 2013, 22:58:08 UTC |
| ec787db | Junio C Hamano | 04 November 2013, 22:58:05 UTC | 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 | 04 November 2013, 22:58:05 UTC |
| a3a9cff | Junio C Hamano | 04 November 2013, 22:58:01 UTC | 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 | 04 November 2013, 22:58:02 UTC |
| 68d5fbe | Junio C Hamano | 04 November 2013, 22:57:57 UTC | Merge branch 'sc/doc-howto-dumb-http' * sc/doc-howto-dumb-http: doc/howto: warn about (dumb)http server document being too old | 04 November 2013, 22:57:57 UTC |
| 46466ea | Junio C Hamano | 04 November 2013, 22:57:53 UTC | Merge branch 'jn/test-prereq-perl-doc' * jn/test-prereq-perl-doc: t/README: tests can use perl even with NO_PERL | 04 November 2013, 22:57:53 UTC |
| 77b43ca | Junio C Hamano | 01 November 2013, 22:04:08 UTC | t1005: add test for "read-tree --reset -u A B" With a conflicted index, this used to give us an error. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 November 2013, 18:13:45 UTC |
| 76da5b1 | Junio C Hamano | 01 November 2013, 21:55:17 UTC | t1005: reindent Just to update the style of this ancient test script to match our house style. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 November 2013, 18:13:45 UTC |
| b018ff6 | Jeff King | 29 December 2012, 20:51:54 UTC | unpack-trees: fix "read-tree -u --reset A B" with conflicted index When we call "read-tree --reset -u HEAD ORIG_HEAD", the first thing we do with the index is to call read_cache_unmerged. Originally that would read the index, leaving aside any unmerged entries. However, as of d1a43f2 (reset --hard/read-tree --reset -u: remove unmerged new paths, 2008-10-15), it actually creates a new cache entry to serve as a placeholder, so that we later know to update the working tree. However, we later noticed that the sha1 of that unmerged entry was just copied from some higher stage, leaving you with random content in the index. That was fixed by e11d7b5 ("reset --merge": fix unmerged case, 2009-12-31), which instead puts the null sha1 into the newly created entry, and sets a CE_CONFLICTED flag. At the same time, it teaches the unpack-trees machinery to pay attention to this flag, so that oneway_merge throws away the current value. However, it did not update the code paths for twoway_merge, which is where we end up in the two-way read-tree with --reset. We notice that the HEAD and ORIG_HEAD versions are the same, and say "oh, we can just reuse the current version". But that's not true. The current version is bogus. Notice this case and make sure we do not keep the bogus entry; either we do not have that path in the tree we are moving to (i.e. remove it), or we want to have the cache entry we created for the tree we are moving to (i.e. resolve by explicitly saying the "newtree" version is what we want). [jc: this is from the almost year-old $gmane/212316] Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 November 2013, 18:13:27 UTC |
| 05e9d90 | Junio C Hamano | 04 November 2013, 18:11:15 UTC | 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> | 04 November 2013, 18:11:15 UTC |
| 9031479 | Jiang Xin | 17 September 2013, 15:37:05 UTC | 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> | 03 November 2013, 06:09:08 UTC |
| 44bb936 | Tran Ngoc Quan | 02 November 2013, 06:21:55 UTC | l10n: vi.po (2194t): Update and minor fix Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 02 November 2013, 06:21:55 UTC |
| 727b957 | Jiang Xin | 02 November 2013, 00:08:26 UTC | 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> | 02 November 2013, 00:08:26 UTC |
| 61e2e22 | Vivien Didelot | 01 November 2013, 15:42:43 UTC | 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> | 01 November 2013, 16:13:35 UTC |
| aa27064 | Junio C Hamano | 01 November 2013, 15:14:52 UTC | Update draft release notes to 1.8.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 November 2013, 15:14:52 UTC |
| e0fd1e3 | Junio C Hamano | 01 November 2013, 14:38:58 UTC | Merge branch 'sb/refs-code-cleanup' * sb/refs-code-cleanup: cache: remove unused function 'have_git_dir' refs: remove unused function invalidate_ref_cache | 01 November 2013, 14:38:58 UTC |
| c9bb7d0 | Junio C Hamano | 01 November 2013, 14:38:56 UTC | Merge branch 'rs/web-browse-xdg-open' * rs/web-browse-xdg-open: web--browse: Add support for xdg-open | 01 November 2013, 14:38:56 UTC |
| fbaa226 | Junio C Hamano | 01 November 2013, 14:38:54 UTC | 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 | 01 November 2013, 14:38:54 UTC |
| cbe59df | Junio C Hamano | 01 November 2013, 14:38:51 UTC | 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 | 01 November 2013, 14:38:51 UTC |
