| 3c3d3f6 | Junio C Hamano | 16 October 2015, 21:40:04 UTC | Git 2.6.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2015, 21:40:05 UTC |
| 119ffa3 | Junio C Hamano | 16 October 2015, 21:32:58 UTC | Merge branch 'cc/quote-comments' into maint A no-op code-health maintenance. * cc/quote-comments: quote: move comment before sq_quote_buf() quote: fix broken sq_quote_buf() related comment | 16 October 2015, 21:32:58 UTC |
| 71ae535 | Junio C Hamano | 16 October 2015, 21:32:57 UTC | Merge branch 'es/worktree-add-cleanup' into maint A no-op code-health maintenance. * es/worktree-add-cleanup: t2026: rename worktree prune test | 16 October 2015, 21:32:57 UTC |
| 0dd9e57 | Junio C Hamano | 16 October 2015, 21:32:56 UTC | Merge branch 'tk/doc-interpret-trailers-grammo' into maint * tk/doc-interpret-trailers-grammo: Documentation/interpret-trailers: Grammar fix | 16 October 2015, 21:32:56 UTC |
| 9ab7476 | Junio C Hamano | 16 October 2015, 21:32:55 UTC | Merge branch 'tk/typofix-connect-unknown-proto-error' into maint * tk/typofix-connect-unknown-proto-error: connect: fix typo in result string of prot_name() | 16 October 2015, 21:32:55 UTC |
| aa8f64d | Junio C Hamano | 16 October 2015, 21:32:53 UTC | Merge branch 'jk/asciidoctor-section-heading-markup-fix' into maint * jk/asciidoctor-section-heading-markup-fix: Documentation: fix section header mark-up | 16 October 2015, 21:32:53 UTC |
| 22f4b15 | Junio C Hamano | 16 October 2015, 21:32:52 UTC | Merge branch 'nd/ls-remote-does-not-have-u-option' into maint * nd/ls-remote-does-not-have-u-option: ls-remote.txt: delete unsupported option | 16 October 2015, 21:32:52 UTC |
| 1c7dc12 | Junio C Hamano | 16 October 2015, 21:32:50 UTC | Merge branch 'jc/fsck-dropped-errors' into maint There were some classes of errors that "git fsck" diagnosed to its standard error that did not cause it to exit with non-zero status. * jc/fsck-dropped-errors: fsck: exit with non-zero when problems are found | 16 October 2015, 21:32:50 UTC |
| 8f6f177 | Junio C Hamano | 16 October 2015, 21:32:49 UTC | Merge branch 'sb/http-flaky-test-fix' into maint A test script for the HTTP service had a timing dependent bug, which was fixed. * sb/http-flaky-test-fix: t5561: get rid of racy appending to logfile | 16 October 2015, 21:32:49 UTC |
| 2c3cb52 | Junio C Hamano | 16 October 2015, 21:32:47 UTC | Merge branch 'sb/perf-without-installed-git' into maint Performance-measurement tests did not work without an installed Git. * sb/perf-without-installed-git: t/perf: make runner work even if Git is not installed | 16 October 2015, 21:32:47 UTC |
| 15cef7c | Junio C Hamano | 16 October 2015, 21:32:46 UTC | Merge branch 'js/icase-wt-detection' into maint On a case insensitive filesystems, setting GIT_WORK_TREE variable using a random cases that does not agree with what the filesystem thinks confused Git that it wasn't inside the working tree. * js/icase-wt-detection: setup: fix "inside work tree" detection on case-insensitive filesystems | 16 October 2015, 21:32:46 UTC |
| 14f1467 | Junio C Hamano | 16 October 2015, 21:32:45 UTC | Merge branch 'pt/am-builtin' into maint When "git am" was rewritten as a built-in, it stopped paying attention to user.signingkey, which was fixed. * pt/am-builtin: am: configure gpg at startup | 16 October 2015, 21:32:45 UTC |
| df64186 | Junio C Hamano | 16 October 2015, 21:32:44 UTC | Merge branch 'mm/detach-at-HEAD-reflog' into maint After "git checkout --detach", "git status" reported a fairly useless "HEAD detached at HEAD", instead of saying at which exact commit. * mm/detach-at-HEAD-reflog: status: don't say 'HEAD detached at HEAD' t3203: test 'detached at' after checkout --detach | 16 October 2015, 21:32:44 UTC |
| 19d11d4 | Junio C Hamano | 16 October 2015, 21:32:43 UTC | Merge branch 'gr/rebase-i-drop-warn' into maint "git rebase -i" had a minor regression recently, which stopped considering a line that begins with an indented '#' in its insn sheet not a comment, which is now fixed. * gr/rebase-i-drop-warn: rebase-i: loosen over-eager check_bad_cmd check rebase-i: explicitly accept tab as separator in commands | 16 October 2015, 21:32:43 UTC |
| d5fea24 | Junio C Hamano | 16 October 2015, 21:32:42 UTC | Merge branch 'dt/log-follow-config' into maint Description of the "log.follow" configuration variable in "git log" documentation is now also copied to "git config" documentation. * dt/log-follow-config: log: Update log.follow doc and add to config.txt | 16 October 2015, 21:32:42 UTC |
| 267ebf6 | Junio C Hamano | 16 October 2015, 21:32:41 UTC | Merge branch 'ti/glibc-stdio-mutex-from-signal-handler' into maint Allocation related functions and stdio are unsafe things to call inside a signal handler, and indeed killing the pager can cause glibc to deadlock waiting on allocation mutex as our signal handler tries to free() some data structures in wait_for_pager(). Reduce these unsafe calls. * ti/glibc-stdio-mutex-from-signal-handler: pager: don't use unsafe functions in signal handlers | 16 October 2015, 21:32:41 UTC |
| f4892a3 | Junio C Hamano | 16 October 2015, 21:32:40 UTC | Merge branch 'jk/notes-dwim-doc' into maint The way how --ref/--notes to specify the notes tree reference are DWIMmed was not clearly documented. * jk/notes-dwim-doc: notes: correct documentation of DWIMery for notes references | 16 October 2015, 21:32:40 UTC |
| 47c566a | Junio C Hamano | 16 October 2015, 21:32:38 UTC | Merge branch 'jk/make-findstring-makeflags-fix' into maint Customization to change the behaviour with "make -w" and "make -s" in our Makefile was broken when they were used together. * jk/make-findstring-makeflags-fix: Makefile: fix MAKEFLAGS tests with multiple flags | 16 October 2015, 21:32:38 UTC |
| 4d2a301 | Junio C Hamano | 16 October 2015, 21:32:36 UTC | Merge branch 'jw/make-arflags-customizable' into maint The Makefile always runs the library archiver with hardcoded "crs" options, which was inconvenient for exotic platforms on which people want to use programs with totally different set of command line options. * jw/make-arflags-customizable: Makefile: allow $(ARFLAGS) specified from the command line | 16 October 2015, 21:32:36 UTC |
| a3bbfe5 | Junio C Hamano | 16 October 2015, 21:32:35 UTC | Merge branch 'jk/connect-clear-env' into maint The ssh transport, just like any other transport over the network, did not clear GIT_* environment variables, but it is possible to use SendEnv and AcceptEnv to leak them to the remote invocation of Git, which is not a good idea at all. Explicitly clear them just like we do for the local transport. * jk/connect-clear-env: git_connect: clarify conn->use_shell flag git_connect: clear GIT_* environment for ssh | 16 October 2015, 21:32:35 UTC |
| 14d5a3e | Junio C Hamano | 16 October 2015, 21:32:34 UTC | Merge branch 'jk/blame-first-parent' into maint "git blame --first-parent v1.0..v2.0" was not rejected but did not limit the blame to commits on the first parent chain. * jk/blame-first-parent: blame: handle --first-parent | 16 October 2015, 21:32:34 UTC |
| be4d6f4 | Junio C Hamano | 16 October 2015, 21:32:33 UTC | Merge branch 'mm/keyid-docs' into maint Very small number of options take a parameter that is optional (which is not a great UI element as they can only appear at the end of the command line). Add notice to documentation of each and every one of them. * mm/keyid-docs: Documentation: explain optional arguments better Documentation/grep: fix documentation of -O Documentation: use 'keyid' consistently, not 'key-id' | 16 October 2015, 21:32:33 UTC |
| c7997e5 | Junio C Hamano | 16 October 2015, 21:32:32 UTC | Merge branch 'pt/pull-builtin' into maint * pt/pull-builtin: pull: enclose <options> in brackets in the usage string merge: grammofix in please-commit-before-merge message | 16 October 2015, 21:32:32 UTC |
| e7a7401 | Alex Henrie | 16 October 2015, 02:22:13 UTC | pull: enclose <options> in brackets in the usage string All the other placeholders are already shown that way. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 October 2015, 16:38:32 UTC |
| 44cd91e | Christian Couder | 07 October 2015, 22:05:50 UTC | quote: move comment before sq_quote_buf() A big comment at the beginning of quote.c is really related to sq_quote_buf(), so let's move it in front of this function. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 October 2015, 22:12:01 UTC |
| ca9da0d | Christian Couder | 07 October 2015, 22:05:49 UTC | quote: fix broken sq_quote_buf() related comment Since 77d604c (Enhanced sq_quote(), 10 Oct 2005), the comment at the beginning of quote.c is broken. Let's fix it. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 October 2015, 22:11:54 UTC |
| a43eb67 | Tobias Klauser | 07 October 2015, 16:46:22 UTC | Documentation/interpret-trailers: Grammar fix Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 October 2015, 17:53:34 UTC |
| ba128e2 | Michael J Gruber | 06 October 2015, 10:12:21 UTC | t2026: rename worktree prune test Linked checkouts are known under the name worktree, now. Rename the test accordingly. Specifically, this avoids the confusion that t2026 is actually not about pruning in or with linked checkouts aka worktress but about pruning worktrees, i.e. about "git worktree prune" rather than "git prune". Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 October 2015, 17:39:32 UTC |
| fd8d07e | Eric N. Vander Weele | 07 October 2015, 01:14:33 UTC | log: Update log.follow doc and add to config.txt Documentation/config.txt does not include the documentation for log.follow that is in Documentation/git-log.txt. This commit adds the log.follow documentation to config.txt and also updates the wording to be consistent with the format that is followed by other boolean configuration variables. Signed-off-by: Eric N. Vander Weele <ericvw@gmail.com> Acked-by: David Turner <dturner@twopensource.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 October 2015, 17:37:48 UTC |
| 1db168e | Matthieu Moy | 01 October 2015, 08:18:42 UTC | rebase-i: loosen over-eager check_bad_cmd check 804098bb (git rebase -i: add static check for commands and SHA-1, 2015-06-29) tried to check all insns before running any in the todo list, but it did so by implementing its own parser that is a lot stricter than necessary. We used to allow lines that are indented (including comment lines), and we used to allow a whitespace between the insn and the commit object name to be HT, among other things, that are flagged as an invalid line by mistake. Fix this by using the same tokenizer that is used to parse the todo list file in the new check. Whether it's a good thing to accept indented comments is debatable (other commands like "git commit" do not accept them), but we already accepted them in the past, and some people and scripts rely on this behavior. Also, a line starting with space followed by a '#' cannot have any meaning other than being a comment, hence it doesn't harm to accept them as comments. Largely based on patch by: Junio C Hamano <gitster@pobox.com> [jc: updated test with quickfix from Torsten Bögershausen] Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 October 2015, 05:39:56 UTC |
| b744767 | Alex Henrie | 02 October 2015, 04:25:33 UTC | merge: grammofix in please-commit-before-merge message Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 October 2015, 21:29:56 UTC |
| 31bff64 | Matthieu Moy | 01 October 2015, 08:18:41 UTC | rebase-i: explicitly accept tab as separator in commands The git-rebase-todo is parsed several times with different parsers. In principle, the user input is normalized by transform_todo_ids and further parsing can be stricter. In case the user wrote pick deadbeef<TAB>commit message the parser of transform_todo_ids was considering the sha1 to be "deadbeef<TAB>commit", and was leaving the tab in the transformed sheet. In practice, this went unnoticed since the actual command interpretation was done later in do_next which did accept the tab as a separator. Make it explicit in the code of transform_todo_ids that tabs are accepted. This way, code that mimicks it will also accept tabs as separator. A similar construct appears in skip_unnecessary_picks, but this one comes after transform_todo_ids, hence reads the normalized format, so it needs not be changed. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 October 2015, 18:36:44 UTC |
| 0eb8548 | Matthieu Moy | 27 September 2015, 15:13:42 UTC | status: don't say 'HEAD detached at HEAD' After using "git checkout --detach", the reflog is left with an entry like checkout: moving from ... to HEAD This message is parsed to generate the 'HEAD detached at' message in 'git branch' and 'git status', which leads to the not-so-useful message 'HEAD detached at HEAD'. Instead, when parsing such reflog entry, resolve HEAD to the corresponding commit in the reflog, so that the message becomes 'HEAD detached at $sha1'. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 October 2015, 18:29:46 UTC |
| 9cb07d8 | Matthieu Moy | 27 September 2015, 15:13:41 UTC | t3203: test 'detached at' after checkout --detach This currently fails: the output is 'HEAD detached at HEAD'. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 October 2015, 18:29:16 UTC |
| 434c64d | Renee Margaret McConahy | 30 September 2015, 17:49:44 UTC | am: configure gpg at startup The new builtin am ignores the user.signingkey variable: gpg is being called with the committer details as the key ID, which may not be correct. git_gpg_config is responsible for handling that variable and is expected to be called on initialization by any modules that use gpg. Signed-off-by: Renee Margaret McConahy <nepella@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 September 2015, 20:02:30 UTC |
| 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 |
| 29bc480 | Nguyễn Thái Ngọc Duy | 28 September 2015, 12:30:17 UTC | ls-remote.txt: delete unsupported option -u <exec> has never been supported, but it was mentioned since 0a2bb55 (git ls-remote: make usage string match manpage - 2008-11-11). Nobody has complained about it for seven years, it's probably safe to say nobody cares. So let's remove "-u" in documents instead of adding code to support it. While at there, fix --upload-pack syntax too. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 September 2015, 18:07:04 UTC |
| 63ec5e1 | Johannes Schindelin | 28 September 2015, 16:12:18 UTC | setup: fix "inside work tree" detection on case-insensitive filesystems Git has a config variable to indicate that it is operating on a file system that is case-insensitive: core.ignoreCase. But the `dir_inside_of()` function did not respect that. As a result, if Git's idea of the current working directory disagreed in its upper/lower case with the `GIT_WORK_TREE` variable (e.g. `C:\test` vs `c:\test`) the user would be greeted by the error message fatal: git-am cannot be used without a working tree. when trying to run a rebase. This fixes https://github.com/git-for-windows/git/issues/402 (reported by Daniel Harding). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 September 2015, 17:49:06 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 |
| be510e0 | John Keeping | 25 September 2015, 12:59:35 UTC | Documentation: fix section header mark-up Asciidoctor is stricter than AsciiDoc when deciding if underlining is a section title or the start of preformatted text. Make the length of the underlining match the text to ensure that it renders correctly in all implementations. Signed-off-by: John Keeping <john@keeping.me.uk> [jc: squashed in git-bisect one noticed by Michael J Gruber] Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 September 2015, 17:47:06 UTC |
| 31cd128 | Stephan Beyer | 25 September 2015, 00:31:37 UTC | t/perf: make runner work even if Git is not installed aggregate.perl did not work when Git.pm is not installed to a directory contained in the default Perl library path list or PERLLIB. This commit prepends the Perl library path of the current Git source tree to enable this. Note that this commit adds a hard-coded relative path use lib '../../perl/blib/lib'; instead of the flexible environment-based variant use lib (split(/:/, $ENV{GITPERLLIB})); which is used in tests written in Perl. The hard-coded variant is used because the whole performance test framework does it that way (and GITPERLLIB is not set there). Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 September 2015, 17:44:59 UTC |
| 83e6bda | Tobias Klauser | 24 September 2015, 12:44:49 UTC | connect: fix typo in result string of prot_name() Replace 'unkown' with 'unknown'. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 September 2015, 17:01:07 UTC |
| 362d8b6 | Stephan Beyer | 24 September 2015, 18:12:22 UTC | t5561: get rid of racy appending to logfile The definition of log_div() appended information to the web server's logfile to make the test more readable. However, log_div() was called right after a request is served (which is done by git-http-backend); the web server waits for the git-http-backend process to exit before it writes to the log file. When the duration between serving a request and exiting was long, the log_div() output was written before the last request's log, and the test failed. (This duration could become especially long for PROFILE=GEN builds.) To get rid of this behavior, we should not change the logfile at all. This commit removes log_div() and its calls. The additional information is kept in the test (for readability reasons) but filtered out before comparing it to the actual logfile. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 September 2015, 15:45:25 UTC |
| 122f76f | Junio C Hamano | 23 September 2015, 20:46:39 UTC | fsck: exit with non-zero when problems are found After finding some problems (e.g. a ref refs/heads/X points at an object that is not a commit) and issuing an error message, the program failed to signal the fact that it found an error by a non-zero exit status. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 September 2015, 21:29:28 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 |
| e14c92e | Jacob Keller | 22 September 2015, 22:15:03 UTC | notes: correct documentation of DWIMery for notes references expand_notes_ref is used by --ref from git-notes(1) and --notes from the git log to find the full refname of a notes reference. Previously the documentation of these options was not clear about what sorts of expansions would be performed. Fix the documentation to clearly and accurately describe the behavior of the expansions. Add a test for this expansion when using git notes get-ref in order to prevent future patches from changing this behavior. Signed-off-by: Jacob Keller <jacob.keller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2015, 22:24:01 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 |
| 2b594bf | Matthieu Moy | 19 September 2015, 07:47:50 UTC | Documentation: explain optional arguments better Improve the documentation of commands taking optional arguments in two ways: * Documents the behavior of '-O' (for grep) and '-S' (for commands creating commits) when used without the optional argument. * Document the syntax of these options. For the second point, the behavior is documented in gitcli(7), but it is easy for users to miss, and hard for the same user to understand why e.g. "git status -u no" does not work. Document this explicitly in the documentation of each short option having an optional argument: they are the most error prone since there is no '=' sign between the option and its argument. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2015, 17:48:23 UTC |
| 318ca61 | Matthieu Moy | 19 September 2015, 07:47:49 UTC | Documentation/grep: fix documentation of -O Since the argument of -O, --open-file-in-pager is optional, it must be stuck to the command. Reflect this in the documentation. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2015, 17:48:21 UTC |
| 340f2c5 | Matthieu Moy | 19 September 2015, 07:47:48 UTC | Documentation: use 'keyid' consistently, not 'key-id' Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2015, 17:48:17 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 |
| 95a4fb0 | Jeff King | 15 September 2015, 10:05:39 UTC | blame: handle --first-parent The revision.c options-parser will parse "--first-parent" for us, but the blame code does not actually respect it, as we simply iterate over the whole list returned by first_scapegoat(). We can fix this by returning a truncated parent list. Note that we could technically also do so by limiting the return value of num_scapegoats(), but that is less robust. We would rely on nobody ever looking at the "next" pointer from the returned list. Combining "--reverse" with "--first-parent" is more complicated, and will probably involve cooperation from revision.c. Since the desired semantics are not even clear, let's punt on this for now, but explicitly disallow it to avoid confusing users (this is not really a regression, since it did something nonsensical before). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 September 2015, 16:59:05 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 |
