| 22f698c | Junio C Hamano | 29 September 2015, 02:19:27 UTC | Git 2.6.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 September 2015, 02:19:34 UTC |
| 3adc4ec | Junio C Hamano | 29 September 2015, 02:16:54 UTC | Sync with v2.5.4 | 29 September 2015, 02:16:54 UTC |
| 2435856 | Junio C Hamano | 28 September 2015, 22:26:49 UTC | Git 2.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 September 2015, 22:34:28 UTC |
| 11a458b | Junio C Hamano | 28 September 2015, 22:33:56 UTC | Sync with 2.4.10 | 28 September 2015, 22:33:56 UTC |
| a2558fb | Junio C Hamano | 28 September 2015, 22:29:54 UTC | Git 2.4.10 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 September 2015, 22:30:30 UTC |
| 6343e2f | Junio C Hamano | 28 September 2015, 22:28:26 UTC | Sync with 2.3.10 | 28 September 2015, 22:28:31 UTC |
| 18b58f7 | Junio C Hamano | 28 September 2015, 22:00:37 UTC | Git 2.3.10 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 September 2015, 22:26:52 UTC |
| 92cdfd2 | Junio C Hamano | 28 September 2015, 21:59:28 UTC | Merge branch 'jk/xdiff-memory-limits' into maint-2.3 | 28 September 2015, 21:59:28 UTC |
| 83c4d38 | Jeff King | 25 September 2015, 21:58:09 UTC | merge-file: enforce MAX_XDIFF_SIZE on incoming files The previous commit enforces MAX_XDIFF_SIZE at the interfaces to xdiff: xdi_diff (which calls xdl_diff) and ll_xdl_merge (which calls xdl_merge). But we have another direct call to xdl_merge in merge-file.c. If it were written today, this probably would just use the ll_merge machinery. But it predates that code, and uses slightly different options to xdl_merge (e.g., ZEALOUS_ALNUM). We could try to abstract out an xdi_merge to match the existing xdi_diff, but even that is difficult. Rather than simply report error, we try to treat large files as binary, and that distinction would happen outside of xdi_merge. The simplest fix is to just replicate the MAX_XDIFF_SIZE check in merge-file.c. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 September 2015, 21:58:13 UTC |
| dcd1742 | Jeff King | 24 September 2015, 23:12:45 UTC | xdiff: reject files larger than ~1GB The xdiff code is not prepared to handle extremely large files. It uses "int" in many places, which can overflow if we have a very large number of lines or even bytes in our input files. This can cause us to produce incorrect diffs, with no indication that the output is wrong. Or worse, we may even underallocate a buffer whose size is the result of an overflowing addition. We're much better off to tell the user that we cannot diff or merge such a large file. This patch covers both cases, but in slightly different ways: 1. For merging, we notice the large file and cleanly fall back to a binary merge (which is effectively "we cannot merge this"). 2. For diffing, we make the binary/text distinction much earlier, and in many different places. For this case, we'll use the xdi_diff as our choke point, and reject any diff there before it hits the xdiff code. This means in most cases we'll die() immediately after. That's not ideal, but in practice we shouldn't generally hit this code path unless the user is trying to do something tricky. We already consider files larger than core.bigfilethreshold to be binary, so this code would only kick in when that is circumvented (either by bumping that value, or by using a .gitattribute to mark a file as diffable). In other words, we can avoid being "nice" here, because there is already nice code that tries to do the right thing. We are adding the suspenders to the nice code's belt, so notice when it has been worked around (both to protect the user from malicious inputs, and because it is better to die() than generate bogus output). The maximum size was chosen after experimenting with feeding large files to the xdiff code. It's just under a gigabyte, which leaves room for two obvious cases: - a diff3 merge conflict result on files of maximum size X could be 3*X plus the size of the markers, which would still be only about 3G, which fits in a 32-bit int. - some of the diff code allocates arrays of one int per record. Even if each file consists only of blank lines, then a file smaller than 1G will have fewer than 1G records, and therefore the int array will fit in 4G. Since the limit is arbitrary anyway, I chose to go under a gigabyte, to leave a safety margin (e.g., we would not want to overflow by allocating "(records + 1) * sizeof(int)" or similar. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 September 2015, 21:57:23 UTC |
| 3efb988 | Jeff King | 24 September 2015, 23:12:23 UTC | react to errors in xdi_diff When we call into xdiff to perform a diff, we generally lose the return code completely. Typically by ignoring the return of our xdi_diff wrapper, but sometimes we even propagate that return value up and then ignore it later. This can lead to us silently producing incorrect diffs (e.g., "git log" might produce no output at all, not even a diff header, for a content-level diff). In practice this does not happen very often, because the typical reason for xdiff to report failure is that it malloc() failed (it uses straight malloc, and not our xmalloc wrapper). But it could also happen when xdiff triggers one our callbacks, which returns an error (e.g., outf() in builtin/rerere.c tries to report a write failure in this way). And the next patch also plans to add more failure modes. Let's notice an error return from xdiff and react appropriately. In most of the diff.c code, we can simply die(), which matches the surrounding code (e.g., that is what we do if we fail to load a file for diffing in the first place). This is not that elegant, but we are probably better off dying to let the user know there was a problem, rather than simply generating bogus output. We could also just die() directly in xdi_diff, but the callers typically have a bit more context, and can provide a better message (and if we do later decide to pass errors up, we're one step closer to doing so). There is one interesting case, which is in diff_grep(). Here if we cannot generate the diff, there is nothing to match, and we silently return "no hits". This is actually what the existing code does already, but we make it a little more explicit. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 September 2015, 21:57:10 UTC |
| f2df310 | Junio C Hamano | 28 September 2015, 21:46:05 UTC | Merge branch 'jk/transfer-limit-redirection' into maint-2.3 | 28 September 2015, 21:46:05 UTC |
| df37727 | Junio C Hamano | 28 September 2015, 21:33:27 UTC | Merge branch 'jk/transfer-limit-protocol' into maint-2.3 | 28 September 2015, 21:33:27 UTC |
| be08dee | Junio C Hamano | 28 September 2015, 20:18:01 UTC | Git 2.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 September 2015, 20:18:19 UTC |
| b258116 | Blake Burkhart | 22 September 2015, 22:06:20 UTC | http: limit redirection depth By default, libcurl will follow circular http redirects forever. Let's put a cap on this so that somebody who can trigger an automated fetch of an arbitrary repository (e.g., for CI) cannot convince git to loop infinitely. The value chosen is 20, which is the same default that Firefox uses. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 September 2015, 22:32:28 UTC |
| f4113ca | Blake Burkhart | 22 September 2015, 22:06:04 UTC | http: limit redirection to protocol-whitelist Previously, libcurl would follow redirection to any protocol it was compiled for support with. This is desirable to allow redirection from HTTP to HTTPS. However, it would even successfully allow redirection from HTTP to SFTP, a protocol that git does not otherwise support at all. Furthermore git's new protocol-whitelisting could be bypassed by following a redirect within the remote helper, as it was only enforced at transport selection time. This patch limits redirects within libcurl to HTTP, HTTPS, FTP and FTPS. If there is a protocol-whitelist present, this list is limited to those also allowed by the whitelist. As redirection happens from within libcurl, it is impossible for an HTTP redirect to a protocol implemented within another remote helper. When the curl version git was compiled with is too old to support restrictions on protocol redirection, we warn the user if GIT_ALLOW_PROTOCOL restrictions were requested. This is a little inaccurate, as even without that variable in the environment, we would still restrict SFTP, etc, and we do not warn in that case. But anything else means we would literally warn every time git accesses an http remote. This commit includes a test, but it is not as robust as we would hope. It redirects an http request to ftp, and checks that curl complained about the protocol, which means that we are relying on curl's specific error message to know what happened. Ideally we would redirect to a working ftp server and confirm that we can clone without protocol restrictions, and not with them. But we do not have a portable way of providing an ftp server, nor any other protocol that curl supports (https is the closest, but we would have to deal with certificates). [jk: added test and version warning] Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 September 2015, 22:30:39 UTC |
| 5088d3b | Jeff King | 22 September 2015, 22:03:49 UTC | transport: refactor protocol whitelist code The current callers only want to die when their transport is prohibited. But future callers want to query the mechanism without dying. Let's break out a few query functions, and also save the results in a static list so we don't have to re-parse for each query. Based-on-a-patch-by: Blake Burkhart <bburky@bburky.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 September 2015, 22:28:36 UTC |
| 33cfccb | Jeff King | 16 September 2015, 17:13:12 UTC | submodule: allow only certain protocols for submodule fetches Some protocols (like git-remote-ext) can execute arbitrary code found in the URL. The URLs that submodules use may come from arbitrary sources (e.g., .gitmodules files in a remote repository). Let's restrict submodules to fetching from a known-good subset of protocols. Note that we apply this restriction to all submodule commands, whether the URL comes from .gitmodules or not. This is more restrictive than we need to be; for example, in the tests we run: git submodule add ext::... which should be trusted, as the URL comes directly from the command line provided by the user. But doing it this way is simpler, and makes it much less likely that we would miss a case. And since such protocols should be an exception (especially because nobody who clones from them will be able to update the submodules!), it's not likely to inconvenience anyone in practice. Reported-by: Blake Burkhart <bburky@bburky.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 September 2015, 18:35:48 UTC |
| a5adace | Jeff King | 16 September 2015, 17:12:52 UTC | transport: add a protocol-whitelist environment variable If we are cloning an untrusted remote repository into a sandbox, we may also want to fetch remote submodules in order to get the complete view as intended by the other side. However, that opens us up to attacks where a malicious user gets us to clone something they would not otherwise have access to (this is not necessarily a problem by itself, but we may then act on the cloned contents in a way that exposes them to the attacker). Ideally such a setup would sandbox git entirely away from high-value items, but this is not always practical or easy to set up (e.g., OS network controls may block multiple protocols, and we would want to enable some but not others). We can help this case by providing a way to restrict particular protocols. We use a whitelist in the environment. This is more annoying to set up than a blacklist, but defaults to safety if the set of protocols git supports grows). If no whitelist is specified, we continue to default to allowing all protocols (this is an "unsafe" default, but since the minority of users will want this sandboxing effect, it is the only sensible one). A note on the tests: ideally these would all be in a single test file, but the git-daemon and httpd test infrastructure is an all-or-nothing proposition rather than a test-by-test prerequisite. By putting them all together, we would be unable to test the file-local code on machines without apache. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 September 2015, 18:35:48 UTC |
| 8d530c4 | Junio C Hamano | 21 September 2015, 20:26:13 UTC | Git 2.6-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2015, 20:26:13 UTC |
| 74a844a | Junio C Hamano | 21 September 2015, 19:58:35 UTC | Merge branch 'rj/mailmap-ramsay' * rj/mailmap-ramsay: mailmap: update my entry with new email address | 21 September 2015, 19:58:35 UTC |
| b6bd2d0 | Junio C Hamano | 21 September 2015, 19:27:15 UTC | Merge branch 'bn/send-email-smtp-auth-error-message-fix' Fix a minor regression brought in to "git send-email" by a recent addition of the "--smtp-auth" option. * bn/send-email-smtp-auth-error-message-fix: send-email: fix uninitialized var warning for $smtp_auth | 21 September 2015, 19:27:15 UTC |
| e646ab9 | Junio C Hamano | 21 September 2015, 17:54:07 UTC | Merge tag 'l10n-2.6.0-rnd2+de' of git://github.com/git-l10n/git-po l10n-2.6.0-rnd2 plus de * tag 'l10n-2.6.0-rnd2+de' of git://github.com/git-l10n/git-po: (25 commits) l10n: de.po: better language for one string l10n: de.po: translate 2 messages l10n: Update and review Vietnamese translation (2440t) l10n: fr.po v2.6.0 round 2 (2440t) l10n: zh_CN: for git v2.6.0 l10n round 2 l10n: ca.po: update translation l10n: git.pot: v2.6.0 round 2 (3 improvements) l10n: de.po: translate 123 new messages l10n: fr.po v2.6.0 round 1 (2441t) l10n: sv.po: Update Swedish translation (2441t0f0u) l10n: zh_CN: for git v2.6.0 l10n round 1 l10n: Updated Vietnamese translation (2441t) l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed) l10n: zh_CN: Update Git Glossary: "commit message" l10n: zh_CN: Update Git Glossary: pickaxe l10n: zh_CN: Update Git Glossary: fork l10n: zh_CN: Update Git Glossary: tag l10n: zh_CN: Update Git Glossary: "dumb", "smart" l10n: zh_CN: Update Git Glossary: SHA-1 l10n: zh_CN: Add Surrounding Spaces ... | 21 September 2015, 17:54:07 UTC |
| 904f6e7 | Brian Norris | 18 September 2015, 22:12:50 UTC | send-email: fix uninitialized var warning for $smtp_auth On the latest version of git-send-email, I see this error just before running SMTP auth (I didn't provide any --smtp-auth= parameter): Use of uninitialized value $smtp_auth in pattern match (m//) at \ /home/briannorris/git/git/git-send-email.perl line 1139. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2015, 17:51:19 UTC |
| 18a21c1 | Phillip Sz | 17 September 2015, 15:50:32 UTC | l10n: de.po: better language for one string Just one string I think we could translate better. Signed-off-by: Phillip Sz <phillip.szelat@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 20 September 2015, 16:49:09 UTC |
| 2e0f366 | Ralf Thielow | 16 September 2015, 17:28:07 UTC | l10n: de.po: translate 2 messages Translate 2 messages came from git.pot update in e447091 (l10n: git.pot: v2.6.0 round 2 (3 improvements)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com> | 20 September 2015, 16:49:09 UTC |
| 5fc31c1 | Tran Ngoc Quan | 15 September 2015, 00:17:53 UTC | l10n: Update and review Vietnamese translation (2440t) Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 20 September 2015, 16:44:47 UTC |
| 84486b1 | Jean-Noel Avila | 15 September 2015, 18:22:52 UTC | l10n: fr.po v2.6.0 round 2 (2440t) Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 20 September 2015, 16:44:47 UTC |
| 03ea332 | Jiang Xin | 15 September 2015, 13:51:26 UTC | l10n: zh_CN: for git v2.6.0 l10n round 2 Update 2 translations (2440t0f0u) for git v2.6.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 20 September 2015, 16:44:47 UTC |
| 3ffa1ab | Alex Henrie | 15 September 2015, 03:05:50 UTC | l10n: ca.po: update translation Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> | 20 September 2015, 16:44:47 UTC |
| 80d1b48 | Jiang Xin | 14 September 2015, 22:57:19 UTC | l10n: git.pot: v2.6.0 round 2 (3 improvements) Introduce three i18n improvements from the following commits: * tag, update-ref: improve description of option "create-reflog" * pull: don't mark values for option "rebase" for translation * show-ref: place angle brackets around variables in usage string Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 20 September 2015, 16:44:46 UTC |
| 070d108 | Jiang Xin | 14 September 2015, 22:45:32 UTC | Merge branch 'master' of git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: de.po: translate 123 new messages l10n: fr.po v2.6.0 round 1 (2441t) l10n: sv.po: Update Swedish translation (2441t0f0u) l10n: zh_CN: for git v2.6.0 l10n round 1 l10n: Updated Vietnamese translation (2441t) l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed) l10n: zh_CN: Update Git Glossary: "commit message" l10n: zh_CN: Update Git Glossary: pickaxe l10n: zh_CN: Update Git Glossary: fork l10n: zh_CN: Update Git Glossary: tag l10n: zh_CN: Update Git Glossary: "dumb", "smart" l10n: zh_CN: Update Git Glossary: SHA-1 l10n: zh_CN: Add Surrounding Spaces l10n: zh_CN: Add translations for Git glossary l10n: TEAMS: stash inactive zh_CN team members l10n: zh_CN: Update Translation of "tag" l10n: zh_CN: Unify Translation of "packfile" l10n: zh_CN: Update Translation: "tag object" Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 20 September 2015, 16:44:07 UTC |
| e6e86ed | Ralf Thielow | 08 September 2015, 07:31:34 UTC | l10n: de.po: translate 123 new messages Translate 123 new messages came from git.pot update in df0617b (l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com> Acked-by: Matthias Rüster <matthias.ruester@gmail.com> | 20 September 2015, 16:35:49 UTC |
| 7a43c95 | Jean-Noel Avila | 09 September 2015, 20:55:10 UTC | l10n: fr.po v2.6.0 round 1 (2441t) Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 20 September 2015, 16:35:42 UTC |
| 0e57679 | Junio C Hamano | 17 September 2015, 19:32:58 UTC | Update RelNotes to 2.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 September 2015, 19:33:24 UTC |
| 4d80024 | Junio C Hamano | 17 September 2015, 19:29:49 UTC | Sync with 2.5.3 * maint: Git 2.5.3 | 17 September 2015, 19:29:49 UTC |
| a265435 | Junio C Hamano | 17 September 2015, 19:29:03 UTC | Merge branch 'po/doc-branch-desc' The branch descriptions that are set with "git branch --edit-description" option were used in many places but they weren't clearly documented. * po/doc-branch-desc: doc: show usage of branch description | 17 September 2015, 19:29:03 UTC |
| 8d45eef | Junio C Hamano | 17 September 2015, 19:29:02 UTC | Merge branch 'et/win32-poll-timeout' * et/win32-poll-timeout: poll: honor the timeout on Win32 | 17 September 2015, 19:29:02 UTC |
| 1c1fee7 | Junio C Hamano | 17 September 2015, 19:29:01 UTC | Merge branch 'as/config-doc-markup-fix' * as/config-doc-markup-fix: Documentation/config: fix formatting for branch.*.rebase and pull.rebase | 17 September 2015, 19:29:01 UTC |
| ee6ad5f | Junio C Hamano | 17 September 2015, 19:16:10 UTC | Git 2.5.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 September 2015, 19:16:17 UTC |
| 8833ccd | Junio C Hamano | 17 September 2015, 19:12:29 UTC | Merge branch 'dt/untracked-subdir' into maint The experimental untracked-cache feature were buggy when paths with a few levels of subdirectories are involved. * dt/untracked-subdir: untracked cache: fix entry invalidation untracked-cache: fix subdirectory handling t7063: use --force-untracked-cache to speed up a bit untracked-cache: support sparse checkout | 17 September 2015, 19:12:29 UTC |
| d6579d9 | Junio C Hamano | 17 September 2015, 19:11:46 UTC | Merge branch 'br/svn-doc-include-paths-config' into maint * br/svn-doc-include-paths-config: git-svn doc: mention "svn-remote.<name>.include-paths" | 17 September 2015, 19:11:46 UTC |
| cfc3e0e | Junio C Hamano | 17 September 2015, 19:11:06 UTC | Merge branch 'ah/submodule-typofix-in-error' into maint Error string fix. * ah/submodule-typofix-in-error: git-submodule: remove extraneous space from error message | 17 September 2015, 19:11:08 UTC |
| 02dad26 | Junio C Hamano | 17 September 2015, 19:03:02 UTC | Merge branch 'js/maint-am-skip-performance-regression' into maint * js/maint-am-skip-performance-regression: am --skip/--abort: merge HEAD/ORIG_HEAD tree into index | 17 September 2015, 19:03:02 UTC |
| dafc047 | Ramsay Jones | 01 September 2015, 15:50:06 UTC | mailmap: update my entry with new email address My 'demon' email address is no longer functional since, after 16+ years with demon, I have had to change my ISP. :( Also, take the opportunity to remove my middle name, which I only use on official documents (or in the GECOS field when creating a user account on unix). Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2015, 16:08:48 UTC |
| f4d9753 | Junio C Hamano | 14 September 2015, 22:00:41 UTC | Update RelNotes to 2.6 to describe leftover bits since -rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2015, 22:00:41 UTC |
| cf2094c | Junio C Hamano | 14 September 2015, 21:59:07 UTC | Merge branch 'js/maint-am-skip-performance-regression' Recent versions of scripted "git am" has a performance regression in "git am --skip" codepath, which no longer exists in the built-in version on the 'master' front. Fix the regression in the last scripted version that appear in 2.5.x maintenance track and older. * js/maint-am-skip-performance-regression: am --skip/--abort: merge HEAD/ORIG_HEAD tree into index | 14 September 2015, 21:59:13 UTC |
| b8367d1 | Junio C Hamano | 14 September 2015, 21:59:06 UTC | Merge branch 'ah/show-ref-usage-string' Both "git show-ref -h" and "git show-ref --help" illustrated that the "--exclude-existing" option makes the command read list of refs from its standard input. Change only the "show-ref -h" output to have a pair of "<>" around the placeholder that designate an input file, i.e. "git show-ref --exclude-existing < <ref-list>". * ah/show-ref-usage-string: show-ref: place angle brackets around variables in usage string | 14 September 2015, 21:59:06 UTC |
| a9400b0 | Junio C Hamano | 14 September 2015, 21:59:05 UTC | Merge branch 'sg/help-group' * sg/help-group: Makefile: use SHELL_PATH when running generate-cmdlist.sh | 14 September 2015, 21:59:05 UTC |
| 153ec92 | Junio C Hamano | 14 September 2015, 21:59:04 UTC | Merge branch 'rt/help-strings-fix' * rt/help-strings-fix: tag, update-ref: improve description of option "create-reflog" pull: don't mark values for option "rebase" for translation | 14 September 2015, 21:59:04 UTC |
| 45733fa | Junio C Hamano | 14 September 2015, 20:17:56 UTC | Git 2.6-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2015, 20:17:56 UTC |
| ef8b53e | Edward Thomson | 12 September 2015, 17:50:26 UTC | poll: honor the timeout on Win32 Ensure that when passing a pipe, the gnulib poll replacement will not return 0 before the timeout has passed. Not obeying the timeout (and merely returning 0) causes pathological behavior when preparing a packfile for a repository and taking a long time to do so. If poll were to return 0 immediately, this would cause keep-alives to get sent as quickly as possible until the packfile was created. Such deviance from the standard would cause megabytes (or more) of keep-alive packets to be sent. GetTickCount is used as it is efficient, stable and monotonically increasing. (Neither GetSystemTime nor QueryPerformanceCounter have all three of these properties.) Signed-off-by: Edward Thomson <ethomson@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2015, 19:53:48 UTC |
| 561d2b7 | Philip Oakley | 14 September 2015, 14:10:53 UTC | doc: show usage of branch description The branch description will be included in 'git format-patch --cover-letter' and in 'git pull-request' emails. It can also be used in the automatic merge message. Tell the reader. While here, clarify that the description may be a multi-line explanation of the purpose of the branch's patch series. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2015, 19:50:33 UTC |
| 3f26fe7 | Junio C Hamano | 14 September 2015, 18:50:21 UTC | Merge git://ozlabs.org/~paulus/gitk * git://ozlabs.org/~paulus/gitk: gitk: Accelerators for the main menu gitk: Adjust the menu line numbers to compensate for the new entry gitk: Add a "Copy commit summary" command gitk: Update Bulgarian translation (307t) gitk: Update .po files gitk: Update Bulgarian translation (304t) gitk: Use translated version of "Command line" in getcommitlines gitk: Make it easier to go quickly to a specific commit gitk: Show the current view's name in the window title gitk: Add mouse right-click options to copy path and branch name gitk: Remove mc parameter from proc show_error gitk: Fix error when changing colors after closing "List references" window gitk: Replace catch {unset foo} with unset -nocomplain foo gitk: Rearrange window title to be more conventional gitk: sv.po: Update Swedish translation (305t0f0u) gitk: Fix bad English grammar "Matches none Commit Info" | 14 September 2015, 18:50:21 UTC |
| 4be6af6 | Junio C Hamano | 14 September 2015, 18:46:59 UTC | Merge branch 'jk/pack-protocol-doc' Streamline documentation of the pkt-line protocol. * jk/pack-protocol-doc: pack-protocol: clarify LF-handling in PKT-LINE() | 14 September 2015, 18:46:59 UTC |
| 971f9ea | Junio C Hamano | 14 September 2015, 18:46:28 UTC | Merge branch 'mp/t7060-diff-index-test' Fix an old test that was doing the same thing as another one. * mp/t7060-diff-index-test: t7060: actually test "git diff-index --cached -M" | 14 September 2015, 18:46:31 UTC |
| e0eeba2 | Junio C Hamano | 14 September 2015, 18:44:43 UTC | Merge branch 'gb/apply-comment-typofix' * gb/apply-comment-typofix: apply: comment grammar fix | 14 September 2015, 18:44:44 UTC |
| d99b4b0 | Giuseppe Bilotta | 09 September 2015, 13:20:53 UTC | gitk: Accelerators for the main menu This allows fast, keyboard-only usage of the menu (e.g. Alt+V, N to open a new view). Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 13 September 2015, 05:05:24 UTC |
| b6f92a8 | Beat Bolli | 07 September 2015, 23:16:37 UTC | gitk: Adjust the menu line numbers to compensate for the new entry Commit d835dbb9 ("gitk: Add a "Copy commit summary" command", 2015-08-13) in the upstream gitk repo added a new context menu entry. Therefore, the line numbers of the entries below the new one need to be adjusted when their text or state is changed. Signed-off-by: Beat Bolli <dev+git@drbeat.li> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 13 September 2015, 05:00:30 UTC |
| d238710 | Andreas Schwab | 12 September 2015, 14:26:53 UTC | Documentation/config: fix formatting for branch.*.rebase and pull.rebase Don't format the second paragraph as a literal block. Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 September 2015, 01:09:24 UTC |
| 98c32bd | Ralf Thielow | 11 September 2015, 16:04:13 UTC | tag, update-ref: improve description of option "create-reflog" The description of option "create-reflog" is "create_reflog", which is neither a good description, nor a sensible string to translate. Change it to a more meaningful message. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2015, 16:50:02 UTC |
| 7306b39 | Ralf Thielow | 11 September 2015, 15:53:17 UTC | pull: don't mark values for option "rebase" for translation "false|true|preserve" are actual values for option "rebase" of the "git-pull" command and should therefore not be marked for translation. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2015, 16:50:00 UTC |
| 57cee8a | Alejandro R. Sedeño | 10 September 2015, 23:37:07 UTC | Makefile: use SHELL_PATH when running generate-cmdlist.sh Non-POSIX shells, such as /bin/sh on SunOS, do not support $((...)) arithmetic expansion or $(...) command substitution needed by generate-cmdlist.sh. Make sure that we use a POSIX compliant shell $(SHELL_PATH) when running generate-cmdlist.sh. Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu> Acked-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2015, 00:49:00 UTC |
| 1962994 | Junio C Hamano | 10 September 2015, 21:06:58 UTC | Merge git://bogomips.org/git-svn * git://bogomips.org/git-svn: git-svn: parse authors file more leniently | 10 September 2015, 21:06:58 UTC |
| f7c6de0 | Michael J Gruber | 10 September 2015, 12:32:13 UTC | git-svn: parse authors file more leniently Currently, git-svn parses an authors file using the perl regex /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/ in order to extract svn user name, real name and e-mail. This does not match an empty e-mail field like "<>". On the other hand, the output of an authors-prog is parsed with the perl regex /^\s*(.+?)\s*<(.*)>\s*$/ in order to extract real name and e-mail. So, specifying a trivial file grep such as grep "$1" /tmp/authors | head -n 1 | cut -d'=' -f2 | cut -c'2-' as the authors prog gives different results compared to specifying /tmp/authors as the authors file directly. Instead, make git svn uses the perl regex /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.*)>\s*$/ for parsing the authors file so that the same (slightly more lenient) regex is used in both cases. Reported-by: Till Schäfer <till2.schaefer@tu-dortmund.de> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Eric Wong <normalperson@yhbt.net> | 10 September 2015, 17:59:38 UTC |
| 61d93a2 | Jiang Xin | 10 September 2015, 15:14:16 UTC | Merge branch 'master' of github.com:jiangxin/git * 'master' of github.com:jiangxin/git: l10n: zh_CN: for git v2.6.0 l10n round 1 l10n: zh_CN: Update Git Glossary: "commit message" l10n: zh_CN: Update Git Glossary: pickaxe l10n: zh_CN: Update Git Glossary: fork l10n: zh_CN: Update Git Glossary: tag l10n: zh_CN: Update Git Glossary: "dumb", "smart" l10n: zh_CN: Update Git Glossary: SHA-1 l10n: zh_CN: Add Surrounding Spaces l10n: zh_CN: Add translations for Git glossary l10n: TEAMS: stash inactive zh_CN team members l10n: zh_CN: Update Translation of "tag" l10n: zh_CN: Unify Translation of "packfile" l10n: zh_CN: Update Translation: "tag object" | 10 September 2015, 15:14:16 UTC |
| f0bc854 | Junio C Hamano | 09 September 2015, 21:30:35 UTC | Sync with 2.5.2 | 09 September 2015, 21:30:35 UTC |
| b9d6689 | Johannes Schindelin | 09 September 2015, 09:10:07 UTC | am --skip/--abort: merge HEAD/ORIG_HEAD tree into index f8da6801 (am --skip: support skipping while on unborn branch, 2015-06-06) introduced a performance regression to "git am --skip", where it used "read-tree" to reconstruct the index from scratch without reusing the cached stat information. This is a backport of the corresponding patch to the builtin am in 2.6: 3ecc704 (am --skip/--abort: merge HEAD/ORIG_HEAD tree into index, 2015-08-19). Reportedly, it can make a huge difference on Windows, in one case a `git rebase --skip` took 1m40s without, and 5s with, this patch. cf. https://github.com/git-for-windows/git/issues/365 Reported-and-suggested-by: Kim Gybels <kgybels@infogroep.be> Acked-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 September 2015, 21:22:56 UTC |
| d8455d1 | Peter Krefting | 09 September 2015, 20:46:35 UTC | l10n: sv.po: Update Swedish translation (2441t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 09 September 2015, 20:47:09 UTC |
| 7a2c4af | Junio C Hamano | 09 September 2015, 17:34:35 UTC | Release Notes: typofix Thanks to Andreas Schwab for careful reading. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 September 2015, 17:34:35 UTC |
| 5fcadc3 | Giuseppe Bilotta | 09 September 2015, 13:33:18 UTC | apply: comment grammar fix Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 September 2015, 17:21:43 UTC |
| 689efb7 | Junio C Hamano | 08 September 2015, 22:38:43 UTC | Git 2.6-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 September 2015, 22:38:43 UTC |
| d6a2b05 | Junio C Hamano | 08 September 2015, 22:34:57 UTC | Merge branch 'jc/builtin-am-signoff-regression-fix' Recent "git am" had regression when adding a Signed-off-by line with its "-s" option by an unintended tightening of how an existing trailer block is detected. * jc/builtin-am-signoff-regression-fix: am: match --signoff to the original scripted version | 08 September 2015, 22:35:05 UTC |
| 1b7f4a3 | Jiang Xin | 23 August 2015, 07:23:21 UTC | l10n: zh_CN: for git v2.6.0 l10n round 1 Update 123 translations (2441t0f0u) for git v2.6.0-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Reviewed-by: Ray Chen <oldsharp@gmail.com> | 08 September 2015, 15:07:20 UTC |
| aab8454 | Junio C Hamano | 06 September 2015, 02:56:20 UTC | am: match --signoff to the original scripted version Linus noticed that the recently reimplemented "git am -s" defines the trailer block too rigidly, resulting in an unnecessary blank line between the existing sign-offs and his new sign-off. An e-mail submission sent to Linus in real life ends with mixture of sign-offs and commentaries, e.g. title here message here Signed-off-by: Original Author <original@auth.or> [rv: tweaked frotz and nitfol] Signed-off-by: Re Viewer <rv@ew.er> Signed-off-by: Other Reviewer <other@rev.ewer> --- patch here Because the reimplementation reused append_signoff() helper that is used by other codepaths, which is unaware that people intermix such comments with their sign-offs in the trailer block, such a message was judged to end with a non-trailer, resulting in an extra blank line before adding a new sign-off. The original scripted version of "git am" used a lot looser definition, i.e. "if and only if there is no line that begins with Signed-off-by:, add a blank line before adding a new sign-off". For the upcoming release, stop using the append_signoff() in "git am" and reimplement the looser definition used by the scripted version to use only in "git am" to fix this regression in "am" while avoiding new regressions to other users of append_signoff(). In the longer term, we should look into loosening append_signoff() so that other codepaths that add a new sign-off behave the same way as "git am -s", but that is a task for post-release. Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 September 2015, 02:59:40 UTC |
| f299388 | Tran Ngoc Quan | 07 September 2015, 01:54:05 UTC | l10n: Updated Vietnamese translation (2441t) Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 07 September 2015, 01:54:05 UTC |
| 9049ba7 | Jiang Xin | 05 September 2015, 01:23:31 UTC | Merge branch 'master' of github.com:jiangxin/git into master * 'master' of github.com:jiangxin/git: l10n: zh_CN: Update Git Glossary: "commit message" l10n: zh_CN: Update Git Glossary: pickaxe l10n: zh_CN: Update Git Glossary: fork l10n: zh_CN: Update Git Glossary: tag l10n: zh_CN: Update Git Glossary: "dumb", "smart" l10n: zh_CN: Update Git Glossary: SHA-1 l10n: zh_CN: Add Surrounding Spaces l10n: zh_CN: Add translations for Git glossary l10n: TEAMS: stash inactive zh_CN team members l10n: zh_CN: Update Translation of "tag" l10n: zh_CN: Unify Translation of "packfile" l10n: zh_CN: Update Translation: "tag object" Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 05 September 2015, 01:26:26 UTC |
| df0617b | Jiang Xin | 05 September 2015, 01:21:10 UTC | l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed) Generate po/git.pot from v2.6.0-rc0-24-gec371ff for git v2.6.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 05 September 2015, 01:21:10 UTC |
| ec371ff | Junio C Hamano | 04 September 2015, 21:34:57 UTC | Sync with maint * maint: | 04 September 2015, 21:34:57 UTC |
| 27ea6f8 | Junio C Hamano | 04 September 2015, 17:46:00 UTC | Git 2.5.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 September 2015, 17:46:07 UTC |
| 3d3caf0 | Junio C Hamano | 04 September 2015, 17:43:23 UTC | Sync with 2.4.9 | 04 September 2015, 17:43:23 UTC |
| 74b6763 | Junio C Hamano | 04 September 2015, 17:36:00 UTC | Git 2.4.9 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 September 2015, 17:36:14 UTC |
| ef0e938 | Junio C Hamano | 04 September 2015, 17:34:19 UTC | Sync with 2.3.9 | 04 September 2015, 17:34:19 UTC |
| ecad27c | Junio C Hamano | 04 September 2015, 17:31:34 UTC | Git 2.3.9 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 September 2015, 17:32:15 UTC |
| 8267cd1 | Junio C Hamano | 04 September 2015, 17:29:28 UTC | Sync with 2.2.3 | 04 September 2015, 17:29:28 UTC |
| 441c4a4 | Junio C Hamano | 04 September 2015, 17:25:47 UTC | Git 2.2.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 September 2015, 17:26:23 UTC |
| f54cb05 | Junio C Hamano | 04 September 2015, 17:25:23 UTC | Merge branch 'jk/long-paths' into maint-2.2 | 04 September 2015, 17:25:23 UTC |
| 78f23bd | Jeff King | 19 August 2015, 18:12:48 UTC | show-branch: use a strbuf for reflog descriptions When we show "branch@{0}", we format into a fixed-size buffer using sprintf. This can overflow if you have long branch names. We can fix it by using a temporary strbuf. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 September 2015, 16:48:26 UTC |
| 5015f01 | Jeff King | 19 August 2015, 18:12:45 UTC | read_info_alternates: handle paths larger than PATH_MAX This function assumes that the relative_base path passed into it is no larger than PATH_MAX, and writes into a fixed-size buffer. However, this path may not have actually come from the filesystem; for example, add_submodule_odb generates a path using a strbuf and passes it in. This is hard to trigger in practice, though, because the long submodule directory would have to exist on disk before we would try to open its info/alternates file. We can easily avoid the bug, though, by simply creating the filename on the heap. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 September 2015, 16:36:51 UTC |
| c29edfe | Jeff King | 19 August 2015, 18:12:41 UTC | notes: use a strbuf in add_non_note When we are loading a notes tree into our internal hash table, we also collect any files that are clearly non-notes. We format the name of the file into a PATH_MAX buffer, but unlike true notes (which cannot be larger than a fanned-out sha1 hash), these tree entries can be arbitrarily long, overflowing our buffer. We can fix this by switching to a strbuf. It doesn't even cost us an extra allocation, as we can simply hand ownership of the buffer over to the non-note struct. This is of moderate security interest, as you might fetch notes trees from an untrusted remote. However, we do not do so by default, so you would have to manually fetch into the notes namespace. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 September 2015, 16:36:28 UTC |
| f514ef9 | Jeff King | 19 August 2015, 18:12:37 UTC | verify_absent: allow filenames longer than PATH_MAX When unpack-trees wants to know whether a path will overwrite anything in the working tree, we use lstat() to see if there is anything there. But if we are going to write "foo/bar", we can't just lstat("foo/bar"); we need to look for leading prefixes (e.g., "foo"). So we use the lstat cache to find the length of the leading prefix, and copy the filename up to that length into a temporary buffer (since the original name is const, we cannot just stick a NUL in it). The copy we make goes into a PATH_MAX-sized buffer, which will overflow if the prefix is longer than PATH_MAX. How this happens is a little tricky, since in theory PATH_MAX is the biggest path we will have read from the filesystem. But this can happen if: - the compiled-in PATH_MAX does not accurately reflect what the filesystem is capable of - the leading prefix is not _quite_ what is on disk; it contains the next element from the name we are checking. So if we want to write "aaa/bbb/ccc/ddd" and "aaa/bbb" exists, the prefix of interest is "aaa/bbb/ccc". If "aaa/bbb" approaches PATH_MAX, then "ccc" can overflow it. So this can be triggered, but it's hard to do. In particular, you cannot just "git clone" a bogus repo. The verify_absent checks happen before unpack-trees writes anything to the filesystem, so there are never any leading prefixes during the initial checkout, and the bug doesn't trigger. And by definition, these files are larger than PATH_MAX, so writing them will fail, and clone will complain (though it may write a partial path, which will cause a subsequent "git checkout" to hit the bug). We can fix it by creating the temporary path on the heap. The extra malloc overhead is not important, as we are already making at least one stat() call (and probably more for the prefix discovery). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 September 2015, 15:50:50 UTC |
| fb8880d | Junio C Hamano | 04 September 2015, 02:18:05 UTC | Merge branch 'ee/clean-test-fixes' into maint * ee/clean-test-fixes: t7300: fix broken && chains | 04 September 2015, 02:18:05 UTC |
| 5af77d1 | Junio C Hamano | 04 September 2015, 02:18:03 UTC | Merge branch 'jk/log-missing-default-HEAD' into maint "git init empty && git -C empty log" said "bad default revision 'HEAD'", which was found to be a bit confusing to new users. * jk/log-missing-default-HEAD: log: diagnose empty HEAD more clearly | 04 September 2015, 02:18:04 UTC |
| 9d93988 | Junio C Hamano | 04 September 2015, 02:18:03 UTC | Merge branch 'cc/trailers-corner-case-fix' into maint The "interpret-trailers" helper mistook a multi-paragraph title of a commit log message with a colon in it as the end of the trailer block. * cc/trailers-corner-case-fix: trailer: support multiline title trailer: retitle a test and correct an in-comment message trailer: ignore first line of message | 04 September 2015, 02:18:03 UTC |
| 311e5ce | Junio C Hamano | 04 September 2015, 02:18:02 UTC | Merge branch 'dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update' into maint When re-priming the cache-tree opportunistically while committing the in-core index as-is, we mistakenly invalidated the in-core index too aggressively, causing the experimental split-index code to unnecessarily rewrite the on-disk index file(s). * dt/commit-preserve-base-index-upon-opportunistic-cache-tree-update: commit: don't rewrite shared index unnecessarily | 04 September 2015, 02:18:02 UTC |
| 1c82039 | Junio C Hamano | 04 September 2015, 02:18:01 UTC | Merge branch 'rs/archive-zip-many' into maint "git archive" did not use zip64 extension when creating an archive with more than 64k entries, which nobody should need, right ;-)? * rs/archive-zip-many: archive-zip: support more than 65535 entries archive-zip: use a local variable to store the creator version t5004: test ZIP archives with many entries | 04 September 2015, 02:18:01 UTC |
| ae6ac84 | Junio C Hamano | 04 September 2015, 02:18:00 UTC | Merge branch 'jc/calloc-pathspec' into maint Minor code cleanup. * jc/calloc-pathspec: ps_matched: xcalloc() takes nmemb and then element size | 04 September 2015, 02:18:00 UTC |
| 8136099 | Junio C Hamano | 04 September 2015, 02:17:59 UTC | Merge branch 'ss/fix-config-fd-leak' into maint * ss/fix-config-fd-leak: config: close config file handle in case of error | 04 September 2015, 02:17:59 UTC |
| dc4e7b0 | Junio C Hamano | 04 September 2015, 02:17:57 UTC | Merge branch 'sg/wt-status-header-inclusion' into maint * sg/wt-status-header-inclusion: wt-status: move #include "pathspec.h" to the header | 04 September 2015, 02:17:57 UTC |
| 659227b | Junio C Hamano | 04 September 2015, 02:17:56 UTC | Merge branch 'po/po-readme' into maint Doc updates for i18n. * po/po-readme: po/README: Update directions for l10n contributors | 04 September 2015, 02:17:56 UTC |
