| 4224916 | Junio C Hamano | 13 January 2014, 19:28:26 UTC | Git 1.8.5.3 | 13 January 2014, 19:28:26 UTC |
| 7fd90e0 | Junio C Hamano | 13 January 2014, 19:23:07 UTC | Merge branch 'nd/daemon-informative-errors-typofix' into maint The "--[no-]informative-errors" options to "git daemon" were parsed a bit too loosely, allowing any other string after these option names. * nd/daemon-informative-errors-typofix: daemon: be strict at parsing parameters --[no-]informative-errors | 13 January 2014, 19:23:07 UTC |
| 3b72885 | Junio C Hamano | 13 January 2014, 19:23:04 UTC | Merge branch 'km/gc-eperm' into maint A "gc" process running as a different user should be able to stop a new "gc" process from starting. * km/gc-eperm: gc: notice gc processes run by other users | 13 January 2014, 19:23:04 UTC |
| f5678f1 | Junio C Hamano | 13 January 2014, 19:23:01 UTC | Merge branch 'jk/credential-plug-leak' into maint An earlier "clean-up" introduced an unnecessary memory leak. * jk/credential-plug-leak: Revert "prompt: clean up strbuf usage" | 13 January 2014, 19:23:01 UTC |
| ada6ebb | Junio C Hamano | 13 January 2014, 19:22:48 UTC | Merge branch 'mm/mv-file-to-no-such-dir-with-slash' into maint "git mv A B/", when B does not exist as a directory, should error out, but it didn't. * mm/mv-file-to-no-such-dir-with-slash: mv: let 'git mv file no-such-dir/' error out on Windows, too mv: let 'git mv file no-such-dir/' error out | 13 January 2014, 19:22:48 UTC |
| be941a2 | Junio C Hamano | 13 January 2014, 19:22:38 UTC | Merge branch 'jk/rev-parse-double-dashes' into maint "git rev-parse <revs> -- <paths>" did not implement the usual disambiguation rules the commands in the "git log" family used in the same way. * jk/rev-parse-double-dashes: rev-parse: be more careful with munging arguments rev-parse: correctly diagnose revision errors before "--" | 13 January 2014, 19:22:38 UTC |
| 6845e8a | Junio C Hamano | 13 January 2014, 19:22:21 UTC | Merge branch 'jk/cat-file-regression-fix' into maint "git cat-file --batch=", an admittedly useless command, did not behave very well. * jk/cat-file-regression-fix: cat-file: handle --batch format with missing type/size cat-file: pass expand_data to print_object_or_die | 13 January 2014, 19:22:21 UTC |
| ebba6c0 | Thomas Ackermann | 11 January 2014, 16:28:25 UTC | pack-heuristics.txt: mark up the file header properly AsciiDoc wants these header-lines left-aligned. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2014, 19:18:34 UTC |
| a893346 | Johannes Sixt | 08 January 2014, 16:33:44 UTC | mv: let 'git mv file no-such-dir/' error out on Windows, too The previous commit c57f628 (mv: let 'git mv file no-such-dir/' error out) relies on that rename("file", "no-such-dir/") fails if the directory does not exist (note the trailing slash). This does not work as expected on Windows: This rename() call does not fail, but renames "file" to "no-such-dir" (not to "no-such-dir/file"). Insert an explicit check for this case to force an error. This changes the error message from $ git mv file no-such-dir/ fatal: renaming 'file' failed: Not a directory to $ git mv file no-such-dir/ fatal: destination directory does not exist, source=file, destination=no-such-dir/ Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2014, 19:28:12 UTC |
| c90d3db | Junio C Hamano | 06 January 2014, 17:10:09 UTC | Merge branch 'maint' of git://github.com/git-l10n/git-po into maint * 'maint' of git://github.com/git-l10n/git-po: l10n: de.po: fix translation of 'prefix' | 06 January 2014, 17:10:09 UTC |
| 43fda94 | W. Trevor King | 03 January 2014, 18:31:22 UTC | Documentation/gitmodules: Only 'update' and 'url' are required Descriptions for all the settings fell under the initial "Each submodule section also contains the following required keys:". The example shows sections with just 'path' and 'url' entries, which are indeed required, but we should still make the required/optional distinction explicit to clarify that the rest of them are optional. Signed-off-by: W. Trevor King <wking@tremily.us> Reviewed-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2014, 17:08:18 UTC |
| cb05536 | Ralf Thielow | 03 January 2014, 17:05:43 UTC | l10n: de.po: fix translation of 'prefix' The word 'prefix' is currently translated as 'Prefix' which is not a German word. It should be translated as 'Präfix'. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 03 January 2014, 17:21:38 UTC |
| ed7eda8 | Kyle J. McKay | 31 December 2013, 12:07:39 UTC | gc: notice gc processes run by other users Since 64a99eb4 git gc refuses to run without the --force option if another gc process on the same repository is already running. However, if the repository is shared and user A runs git gc on the repository and while that gc is still running user B runs git gc on the same repository the gc process run by user A will not be noticed and the gc run by user B will go ahead and run. The problem is that the kill(pid, 0) test fails with an EPERM error since user B is not allowed to signal processes owned by user A (unless user B is root). Update the test to recognize an EPERM error as meaning the process exists and another gc should not be run (unless --force is given). Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2014, 00:15:29 UTC |
| e1c1a32 | Jeff King | 02 January 2014, 03:03:30 UTC | Revert "prompt: clean up strbuf usage" This reverts commit 31b49d9b653803e7c7fd18b21c8bdd86e3421668. That commit taught do_askpass to hand ownership of our buffer back to the caller rather than simply return a pointer into our internal strbuf. What it failed to notice, though, was that our internal strbuf is static, because we are trying to emulate the getpass() interface. By handing off ownership, we created a memory leak that cannot be solved. Sometimes git_prompt returns a static buffer from getpass() (or our smarter git_terminal_prompt wrapper), and sometimes it returns an allocated string from do_askpass. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2014, 18:21:40 UTC |
| b9cf14d | Ramkumar Ramachandra | 30 December 2013, 16:28:55 UTC | for-each-ref: remove unused variable No code ever used this symbol since the command was introduced at 9f613ddd (Add git-for-each-ref: helper for language bindings, 2006-09-15). Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 December 2013, 20:23:51 UTC |
| 82246b7 | Nguyễn Thái Ngọc Duy | 20 December 2013, 10:53:52 UTC | daemon: be strict at parsing parameters --[no-]informative-errors Use strcmp() instead of starts_with()/!prefixcmp() to stop accepting --informative-errors-just-a-little Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2013, 22:05:07 UTC |
| 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 |
| 6554dfa | Jeff King | 11 December 2013, 23:15:50 UTC | cat-file: handle --batch format with missing type/size Commit 98e2092 taught cat-file to stream blobs with --batch, which requires that we look up the object type before loading it into memory. As a result, we now print the object header from information in sha1_object_info, and the actual contents from the read_sha1_file. We double-check that the information we printed in the header matches the content we are about to show. Later, commit 93d2a60 allowed custom header lines for --batch, and commit 5b08640 made type lookups optional. As a result, specifying a header line without the type or size means that we will not look up those items at all. This causes our double-checking to erroneously die with an error; we think the type or size has changed, when in fact it was simply left at "0". For the size, we can fix this by only doing the consistency double-check when we have retrieved the size via sha1_object_info. In the case that we have not retrieved the value, that means we also did not print it, so there is nothing for us to check that we are consistent with. We could do the same for the type. However, besides our consistency check, we also care about the type in deciding whether to stream or not. So instead of handling the case where we do not know the type, this patch instead makes sure that we always trigger a type lookup when we are printing, so that even a format without the type will stream as we would in the normal case. Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2013, 19:31:25 UTC |
| 370c926 | Jeff King | 11 December 2013, 23:01:42 UTC | cat-file: pass expand_data to print_object_or_die We currently individually pass the sha1, type, and size fields calculated by sha1_object_info. However, if we pass the whole struct, the called function can make more intelligent decisions about which fields were actually filled by sha1_object_info. This patch takes that first refactoring step, passing the whole struct, so further patches can make those decisions with less noise in their diffs. There should be no functional change to this patch (aside from a minor typo fix in the error message). As a side effect, we can rename the local variables in the function to "type" and "size", since the names are no longer taken. Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2013, 19:27:21 UTC |
| 62f162f | Jeff King | 06 December 2013, 22:07:52 UTC | rev-parse: be more careful with munging arguments When rev-parse looks at whether an argument like "foo..bar" or "foobar^@" is a difference or parent-shorthand, it internally munges the arguments so that it can pass the individual rev arguments to get_sha1(). However, we do not consistently un-munge the result. For cases where we do not match (e.g., "doesnotexist..HEAD"), we would then want to try to treat the argument as a filename. try_difference gets() this right, and always unmunges in this case. However, try_parent_shorthand() never unmunges, leading to incorrect error messages, or even incorrect results: $ git rev-parse foobar^@ foobar fatal: ambiguous argument 'foobar': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' $ >foobar $ git rev-parse foobar^@ foobar For cases where we do match, neither function unmunges. This does not currently matter, since we are done with the argument. However, a future patch will do further processing, and this prepares for it. In addition, it's simply a confusing interface for some cases to modify the const argument, and others not to. Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2013, 22:39:16 UTC |
| 1418567 | Jeff King | 06 December 2013, 22:05:48 UTC | rev-parse: correctly diagnose revision errors before "--" Rev-parse understands that a "--" may separate revisions and filenames, and that anything after the "--" is taken as-is. However, it does not understand that anything before the token must be a revision (which is the usual rule implemented by the setup_revisions parser). Since rev-parse prefers revisions to files when parsing before the "--", we end up with the correct result (if such an argument is a revision, we parse it as one, and if it is not, it is an error either way). However, we misdiagnose the errors: $ git rev-parse foobar -- >/dev/null fatal: ambiguous argument 'foobar': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' $ >foobar $ git rev-parse foobar -- >/dev/null fatal: bad flag '--' used after filename In both cases, we should know that the real error is that "foobar" is meant to be a revision, but could not be resolved. Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2013, 19:01:23 UTC |
| c57f628 | Matthieu Moy | 03 December 2013, 08:32:04 UTC | mv: let 'git mv file no-such-dir/' error out Git used to trim the trailing slash, and make the command equivalent to 'git mv file no-such-dir', which created the file no-such-dir (while the trailing slash explicitly stated that it could only be a directory). This patch skips the trailing slash removal for the destination path. The path with its trailing slash is passed to rename(2), which errors out with the appropriate message: $ git mv file no-such-dir/ fatal: renaming 'file' failed: Not a directory Original-patch-by: Duy Nguyen <pclouds@gmail.com> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2013, 19:49:15 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 |
