| 454cb6b | Junio C Hamano | 29 November 2016, 20:23:07 UTC | Git 2.11 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 November 2016, 20:23:07 UTC |
| 95c2b13 | Junio C Hamano | 29 November 2016, 20:22:13 UTC | Merge branch 'jk/common-main' Fix for a small regression in a topic already in 'master'. * jk/common-main: common-main: stop munging argv[0] path | 29 November 2016, 20:22:13 UTC |
| 061eeff | Junio C Hamano | 29 November 2016, 19:36:11 UTC | Merge tag 'l10n-2.11.0-rnd3.1' of git://github.com/git-l10n/git-po l10n-2.11.0-rnd3.1: update ru and ca translations * tag 'l10n-2.11.0-rnd3.1' of git://github.com/git-l10n/git-po: l10n: ru.po: update Russian translation l10n: ca.po: update translation | 29 November 2016, 19:36:11 UTC |
| 6854a8f | Jeff King | 27 November 2016, 04:31:13 UTC | common-main: stop munging argv[0] path Since 650c44925 (common-main: call git_extract_argv0_path(), 2016-07-01), the argv[0] that is seen in cmd_main() of individual programs is always the basename of the executable, as common-main strips off the full path. This can produce confusing results for git-daemon, which wants to re-exec itself. For instance, if the program was originally run as "/usr/lib/git/git-daemon", it will try just re-execing "git-daemon", which will find the first instance in $PATH. If git's exec-path has not been prepended to $PATH, we may find the git-daemon from a different version (or no git-daemon at all). Normally this isn't a problem. Git commands are run as "git daemon", the git wrapper puts the exec-path at the front of $PATH, and argv[0] is already "daemon" anyway. But running git-daemon via its full exec-path, while not really a recommended method, did work prior to 650c44925. Let's make it work again. The real goal of 650c44925 was not to munge argv[0], but to reliably set the argv0_path global. The only reason it munges at all is that one caller, the git.c wrapper, piggy-backed on that computation to find the command basename. Instead, let's leave argv[0] untouched in common-main, and have git.c do its own basename computation. While we're at it, let's drop the return value from git_extract_argv0_path(). It was only ever used in this one callsite, and its dual purposes is what led to this confusion in the first place. Note that by changing the interface, the compiler can confirm for us that there are no other callers storing the return value. But the compiler can't tell us whether any of the cmd_main() functions (besides git.c) were relying on the basename munging. However, we can observe that prior to 650c44925, no other cmd_main() functions did that munging, and no new cmd_main() functions have been introduced since then. So we can't be regressing any of those cases. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 November 2016, 19:01:48 UTC |
| 082ed8f | Jiang Xin | 29 November 2016, 13:19:43 UTC | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru * 'russian-l10n' of https://github.com/DJm00n/git-po-ru: l10n: ru.po: update Russian translation | 29 November 2016, 13:19:43 UTC |
| f8f8b45 | Dimitriy Ryazantcev | 29 November 2016, 09:33:07 UTC | l10n: ru.po: update Russian translation Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com> | 29 November 2016, 09:33:07 UTC |
| 43a970d | Alex Henrie | 29 November 2016, 03:06:25 UTC | l10n: ca.po: update translation Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> | 29 November 2016, 03:06:25 UTC |
| aeddbfd | Marc Branchaud | 24 November 2016, 16:59:00 UTC | RelNotes: spelling and phrasing fixups Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2016, 23:58:48 UTC |
| 6516e54 | Junio C Hamano | 28 November 2016, 23:28:04 UTC | Merge tag 'l10n-2.11.0-rnd3' of git://github.com/git-l10n/git-po l10n-2.11.0-rnd3 * tag 'l10n-2.11.0-rnd3' of git://github.com/git-l10n/git-po: l10n: de.po: translate 210 new messages l10n: fix unmatched single quote in error message | 28 November 2016, 23:28:04 UTC |
| 6366c34 | Ralf Thielow | 02 November 2016, 17:51:08 UTC | l10n: de.po: translate 210 new messages Translate 210 new messages came from git.pot update in fda7b09 (l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)) and c091ffb (l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 28 November 2016, 17:49:25 UTC |
| 72351d7 | Jiang Xin | 20 November 2016, 12:26:17 UTC | l10n: fix unmatched single quote in error message Translate one message introduced by commit: * 358718064b i18n: fix unmatched single quote in error message Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 25 November 2016, 15:26:34 UTC |
| e2b2d6a | Junio C Hamano | 23 November 2016, 19:24:59 UTC | Git 2.11-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 November 2016, 19:24:59 UTC |
| c34a7da | Junio C Hamano | 23 November 2016, 19:23:17 UTC | Merge branch 'jc/setup-cleanup-fix' "git archive" and "git mailinfo" stopped reading from local configuration file with a recent update. * jc/setup-cleanup-fix: archive: read local configuration mailinfo: read local configuration | 23 November 2016, 19:23:17 UTC |
| 6a2b569 | Junio C Hamano | 23 November 2016, 19:23:17 UTC | Merge branch 'jt/trailer-with-cruft' Doc update. * jt/trailer-with-cruft: doc: mention user-configured trailers | 23 November 2016, 19:23:17 UTC |
| bd53f38 | Junio C Hamano | 23 November 2016, 19:23:17 UTC | Merge branch 'js/rebase-i-commentchar-fix' "git rebase -i" did not work well with core.commentchar configuration variable for two reasons, both of which have been fixed. * js/rebase-i-commentchar-fix: rebase -i: handle core.commentChar=auto stripspace: respect repository config rebase -i: highlight problems with core.commentchar | 23 November 2016, 19:23:17 UTC |
| 48e9ad5 | Junio C Hamano | 23 November 2016, 19:23:16 UTC | Merge branch 'jc/for-each-ref-head-segfault-fix' Using a %(HEAD) placeholder in "for-each-ref --format=" option caused the command to segfault when on an unborn branch. * jc/for-each-ref-head-segfault-fix: for-each-ref: do not segv with %(HEAD) on an unborn branch | 23 November 2016, 19:23:16 UTC |
| 1e37181 | Junio C Hamano | 22 November 2016, 22:16:06 UTC | Merge tag 'l10n-2.11.0-rnd2' of git://github.com/git-l10n/git-po l10n-2.11.0-rnd2 * tag 'l10n-2.11.0-rnd2' of git://github.com/git-l10n/git-po: l10n: Fixed typo of git fetch-pack command l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed) l10n: zh_CN: for git v2.11.0 l10n round 1 l10n: pt_PT: update Portuguese translation l10n: fr.po fix grammar mistakes l10n: fr.po v2.11.0_rnd1 l10n: sv.po: Update Swedish translation (2913t0f0u) l10n: vi.po: Updated translation to v2.11.0 (2913t) l10n: ko.po: Update Korean translation l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed) l10n: ru.po: update Russian translation | 22 November 2016, 22:16:06 UTC |
| 7f1dc9f | Junio C Hamano | 22 November 2016, 22:15:38 UTC | Merge branch 'js/prepare-sequencer' Fix for an error message string. * js/prepare-sequencer: i18n: fix unmatched single quote in error message | 22 November 2016, 22:15:38 UTC |
| eb0224c | Junio C Hamano | 22 November 2016, 21:37:04 UTC | archive: read local configuration Since b9605bc4f2 ("config: only read .git/config from configured repos", 2016-09-12), we do not read from ".git/config" unless we know we are in a repository. "git archive" however didn't do the repository discovery and instead relied on the old behaviour. Teach the command to run a "gentle" version of repository discovery so that local configuration variables are honoured. [jc: stole tests from peff] Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 November 2016, 21:55:20 UTC |
| 3f0ec06 | Junio C Hamano | 22 November 2016, 21:13:16 UTC | mailinfo: read local configuration Since b9605bc4f2 ("config: only read .git/config from configured repos", 2016-09-12), we do not read from ".git/config" unless we know we are in a repository. "git mailinfo" however didn't do the repository discovery and instead relied on the old behaviour. This was mostly OK because it was merely run as a helper program by other porcelain scripts that first chdir's up to the root of the working tree. Teach the command to run a "gentle" version of repository discovery so that local configuration variables like mailinfo.scissors are honoured. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 November 2016, 21:13:16 UTC |
| 275588f | Jiang Xin | 22 November 2016, 14:24:59 UTC | l10n: Fixed typo of git fetch-pack command Git 2.11.0-rc2 introduced one small l10n update, and this commit fixed the affected translations all in one batch. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 22 November 2016, 14:24:59 UTC |
| c091ffb | Jiang Xin | 22 November 2016, 14:22:59 UTC | l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed) Generate po/git.pot from v2.11.0-rc2 for git v2.11.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 22 November 2016, 14:22:59 UTC |
| 094d6e6 | Jiang Xin | 22 November 2016, 14:08:47 UTC | Merge branch 'master' of git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.11.0 l10n round 1 l10n: pt_PT: update Portuguese translation l10n: fr.po fix grammar mistakes l10n: fr.po v2.11.0_rnd1 l10n: sv.po: Update Swedish translation (2913t0f0u) l10n: vi.po: Updated translation to v2.11.0 (2913t) l10n: ko.po: Update Korean translation l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed) l10n: ru.po: update Russian translation | 22 November 2016, 14:08:47 UTC |
| df616b1 | Jonathan Tan | 21 November 2016, 20:47:21 UTC | doc: mention user-configured trailers In commit 1462450 ("trailer: allow non-trailers in trailer block", 2016-10-21), functionality was added (and tested [1]) to allow non-trailer lines in trailer blocks, as long as those blocks contain at least one Git-generated or user-configured trailer, and consists of at least 25% trailers. The documentation was updated to mention this new functionality, but did not mention "user-configured trailer". Further update the documentation to also mention "user-configured trailer". [1] "with non-trailer lines mixed with a configured trailer" in t/t7513-interpret-trailers.sh Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2016, 20:49:57 UTC |
| 882cd23 | Johannes Schindelin | 21 November 2016, 14:18:29 UTC | rebase -i: handle core.commentChar=auto When 84c9dc2 (commit: allow core.commentChar=auto for character auto selection, 2014-05-17) extended the core.commentChar functionality to allow for the value 'auto', it forgot that rebase -i was already taught to handle core.commentChar, and in turn forgot to let rebase -i handle that new value gracefully. Reported by Taufiq Hoven. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2016, 19:00:41 UTC |
| 92068ae | Johannes Schindelin | 21 November 2016, 14:18:24 UTC | stripspace: respect repository config The way "git stripspace" reads the configuration was not quite kosher, in that the code forgot to probe for a possibly existing repository (note: stripspace is designed to be usable outside the repository as well). It read .git/config only when it was run from the top-level of the working tree by accident. A recent change b9605bc4f2 ("config: only read .git/config from configured repos", 2016-09-12) stopped reading the repository-local configuration file ".git/config" unless the repository discovery process is done, so that .git/config is never read even when run from the top-level, exposing the old bug more. When rebasing interactively with a commentChar defined in the current repository's config, the help text at the bottom of the edit script potentially used an incorrect comment character. This was not only funny-looking, but also resulted in tons of warnings like this one: Warning: the command isn't recognized in the following line - # Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2016, 19:00:38 UTC |
| 6645838 | Johannes Schindelin | 21 November 2016, 14:18:05 UTC | rebase -i: highlight problems with core.commentchar The interactive rebase does not currently play well with core.commentchar. Let's add some tests to highlight those problems that will be fixed in the remainder of the series. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2016, 19:00:17 UTC |
| 3587180 | Jiang Xin | 20 November 2016, 12:26:17 UTC | i18n: fix unmatched single quote in error message Fixed unmatched single quote introduced by commit: * f56fffef9a sequencer: teach write_message() to append an optional LF Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 November 2016, 17:30:50 UTC |
| a0b6b24 | Jiang Xin | 27 October 2016, 13:53:37 UTC | l10n: zh_CN: for git v2.11.0 l10n round 1 Update 209 translations (2913t0f0u) for git v2.11.0-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 21 November 2016, 15:24:15 UTC |
| 84679d4 | Junio C Hamano | 18 November 2016, 23:21:12 UTC | for-each-ref: do not segv with %(HEAD) on an unborn branch The code to flip between "*" and " " prefixes depending on what branch is checked out used in --format='%(HEAD)' did not consider that HEAD may resolve to an unborn branch and dereferenced a NULL. This will become a lot easier to trigger as the codepath will be used to reimplement "git branch [--list]" in the future. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 November 2016, 23:21:12 UTC |
| 1310aff | Junio C Hamano | 17 November 2016, 21:47:36 UTC | Git 2.11-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 November 2016, 21:47:36 UTC |
| 6d40812 | Junio C Hamano | 17 November 2016, 21:45:22 UTC | Merge branch 'tk/diffcore-delta-remove-unused' Code cleanup. * tk/diffcore-delta-remove-unused: diffcore-delta: remove unused parameter to diffcore_count_changes() | 17 November 2016, 21:45:22 UTC |
| 6846e87 | Junio C Hamano | 17 November 2016, 21:45:21 UTC | Merge branch 'jk/create-branch-remove-unused-param' Code clean-up. * jk/create-branch-remove-unused-param: create_branch: drop unused "head" parameter | 17 November 2016, 21:45:21 UTC |
| 166251c | Junio C Hamano | 17 November 2016, 21:45:21 UTC | Merge branch 'nd/worktree-lock' Typofix. * nd/worktree-lock: git-worktree.txt: fix typo "to"/"two", and add comma | 17 November 2016, 21:45:21 UTC |
| 974e004 | Tobias Klauser | 14 November 2016, 13:39:05 UTC | diffcore-delta: remove unused parameter to diffcore_count_changes() The delta_limit parameter to diffcore_count_changes() has been unused since commit ba23bbc8e ("diffcore-delta: make change counter to byte oriented again.", 2006-03-04). Remove the parameter and adjust all callers. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 November 2016, 17:24:04 UTC |
| 2b09082 | Ben North | 12 November 2016, 08:55:16 UTC | git-worktree.txt: fix typo "to"/"two", and add comma Signed-off-by: Ben North <ben@redfrontdoor.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 November 2016, 01:56:56 UTC |
| d1edc0d | Vasco Almeida | 06 November 2016, 13:04:01 UTC | l10n: pt_PT: update Portuguese translation Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> | 13 November 2016, 17:44:18 UTC |
| 3ab2281 | Junio C Hamano | 11 November 2016, 22:04:32 UTC | Git 2.11.0-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 November 2016, 22:04:32 UTC |
| 3718117 | Junio C Hamano | 11 November 2016, 21:56:31 UTC | Merge branch 'rt/fetch-pack-error-message-fix' An error message in fetch-pack executable that was newly marked for translation was misspelt, which has been fixed. * rt/fetch-pack-error-message-fix: fetch-pack.c: correct command at the beginning of an error message | 11 November 2016, 21:56:31 UTC |
| 12133d5 | Junio C Hamano | 11 November 2016, 21:56:31 UTC | Merge branch 'ps/common-info-doc' Doc fix. * ps/common-info-doc: doc: fix location of 'info/' with $GIT_COMMON_DIR | 11 November 2016, 21:56:31 UTC |
| 7f2a392 | Junio C Hamano | 11 November 2016, 21:56:30 UTC | Merge branch 'js/pwd-var-vs-pwd-cmd-fix' Last minute fixes to two fixups merged to 'master' recently. * js/pwd-var-vs-pwd-cmd-fix: t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variables | 11 November 2016, 21:56:30 UTC |
| 332fd56 | Junio C Hamano | 11 November 2016, 21:56:30 UTC | Merge branch 'ls/macos-update' Portability update and workaround for builds on recent Mac OS X. * ls/macos-update: travis-ci: disable GIT_TEST_HTTPD for macOS Makefile: set NO_OPENSSL on macOS by default | 11 November 2016, 21:56:30 UTC |
| 5de732f | Junio C Hamano | 11 November 2016, 21:56:30 UTC | Merge branch 'js/prepare-sequencer' Silence a clang warning introduced by a recently graduated topic. * js/prepare-sequencer: sequencer: silence -Wtautological-constant-out-of-range-compare | 11 November 2016, 21:56:30 UTC |
| b18f6a0 | Junio C Hamano | 11 November 2016, 21:56:30 UTC | Merge branch 'ls/filter-process' Test portability improvements and optimization for an already-graduated topic. * ls/filter-process: t0021: remove debugging cruft | 11 November 2016, 21:56:30 UTC |
| f5a8ad4 | Junio C Hamano | 11 November 2016, 21:56:30 UTC | Merge branch 'as/merge-attr-sleep' Fix for a racy false-positive test failure. * as/merge-attr-sleep: t6026: clarify the point of "kill $(cat sleep.pid)" t6026: ensure that long-running script really is Revert "t6026-merge-attr: don't fail if sleep exits early" Revert "t6026-merge-attr: ensure that the merge driver was called" t6026-merge-attr: ensure that the merge driver was called t6026-merge-attr: don't fail if sleep exits early | 11 November 2016, 21:56:30 UTC |
| dfbfb9f | Ralf Thielow | 11 November 2016, 17:21:00 UTC | fetch-pack.c: correct command at the beginning of an error message One error message in fetch-pack.c uses 'git fetch_pack' at the beginning which is not a git command. Use 'git fetch-pack' instead. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 November 2016, 21:28:39 UTC |
| a0d8b60 | Junio C Hamano | 11 November 2016, 21:07:37 UTC | t0021: remove debugging cruft The redirection of the standard error stream to a temporary file is a leftover cruft during debugging. Remove it. Besides, it is reported by folks on the Windows that the test is flaky with this redirection; somebody gets confused and this merely-redirected-to file gets marked as delete-pending by git.exe and makes it finish with a non-zero exit status when "git checkout" finishes. Windows folks may want to figure that one out, but for the purpose of this test, it shouldn't become a show-stopper. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 November 2016, 21:09:24 UTC |
| fdf4f6c | Johannes Sixt | 11 November 2016, 20:24:44 UTC | t6026: clarify the point of "kill $(cat sleep.pid)" We lengthened the time the leftover process sleeps in the previous commit to make sure it will be there while 'git merge' runs and finishes. It therefore needs to be killed before leaving the test. And it needs to be killed even when 'git merge' fails, so it has to be triggered via test_when_finished mechanism. Explain all that in a large comment, and move the use site of test_when_finished to immediately before 'git merge' invocation, where the process is spawned. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 November 2016, 20:53:21 UTC |
| 71dd504 | Johannes Sixt | 11 November 2016, 17:31:48 UTC | t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variables We have to use $PWD instead of $(pwd) because on Windows the latter would add a C: style path to bash's Unix-style $PATH variable, which becomes confused by the colon after the drive letter. ($PWD is a Unix-style path.) In the case of GIT_ALTERNATE_OBJECT_DIRECTORIES, bash on Windows assembles a Unix-style path list with the colon as separators. It converts the value to a Windows-style path list with the semicolon as path separator when it forwards the variable to git.exe. The same confusion happens when bash's original value is contaminated with Windows style paths. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 November 2016, 18:54:46 UTC |
| 3285b7b | Patrick Steinhardt | 11 November 2016, 11:23:32 UTC | doc: fix location of 'info/' with $GIT_COMMON_DIR With the introduction of the $GIT_COMMON_DIR variable, the repository layout manual was changed to reflect the location for many files in case the variable is set. While adding the new locations, one typo snuck in regarding the location of the 'info/' folder, which is falsely claimed to reside at "$GIT_COMMON_DIR/index". Fix the typo to point to "$GIT_COMMON_DIR/info/" instead. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 November 2016, 17:37:33 UTC |
| a7d6bcc | Johannes Schindelin | 09 November 2016, 13:51:22 UTC | t6026: ensure that long-running script really is When making sure that background tasks are cleaned up in 5babb5b (t6026-merge-attr: clean up background process at end of test case, 2016-09-07), we considered to let the background task sleep longer, just to be certain that it will still be running when we want to kill it after the test. Sadly, the assumption appears not to hold true that the test case passes quickly enough to kill the background task within a second. Simply increase it to an hour. No system can be possibly slow enough to make above-mentioned assumption incorrect. Reported by Andreas Schwab. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 November 2016, 23:57:06 UTC |
| b36b716 | Junio C Hamano | 10 November 2016, 23:55:13 UTC | Revert "t6026-merge-attr: don't fail if sleep exits early" This reverts commit 734fde2d7167e4b20d2ff6062ade3846949b0741. The point of the test is that the stray process was still running when 'git merge' did its thing through its completion, so a failure to "kill" it means we didn't give a condition to the test to trigger a possible future breakage. Appending "|| :" to the "kill" is sweeping a test-bug under the rug. | 10 November 2016, 23:55:13 UTC |
| 3b03097 | Junio C Hamano | 10 November 2016, 23:54:12 UTC | Revert "t6026-merge-attr: ensure that the merge driver was called" This reverts commit c1e0dc59bddce765761a6f863c66ee0cd4b2ca09. We are not interested in the stray process in the merge driver started; we want it to be still around. | 10 November 2016, 23:54:12 UTC |
| 0538b84 | Junio C Hamano | 10 November 2016, 21:17:30 UTC | Merge branch 'jk/alt-odb-cleanup' Fix a corner-case regression in a topic that graduated during the v2.11 cycle. * jk/alt-odb-cleanup: alternates: re-allow relative paths from environment | 10 November 2016, 21:17:30 UTC |
| 7b2c338 | Junio C Hamano | 10 November 2016, 21:17:30 UTC | Merge branch 'jk/filter-process-fix' Test portability improvements and cleanups for t0021. * jk/filter-process-fix: t0021: fix filehandle usage on older perl t0021: use $PERL_PATH for rot13-filter.pl t0021: put $TEST_ROOT in $PATH t0021: use write_script to create rot13 shell script | 10 November 2016, 21:17:30 UTC |
| 81cf0b6 | Junio C Hamano | 10 November 2016, 21:17:30 UTC | Merge branch 'ls/filter-process' Test portability improvements and optimization for an already-graduated topic. * ls/filter-process: t0021: compute file size with a single process instead of a pipeline t0021: expect more variations in the output of uniq -c | 10 November 2016, 21:17:30 UTC |
| c1e0dc5 | Andreas Schwab | 10 November 2016, 08:31:18 UTC | t6026-merge-attr: ensure that the merge driver was called Explicitly check for the existence of the pid file to test that the merge driver was actually called. Signed-off-by: Andreas Schwab <schwab@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 November 2016, 19:20:56 UTC |
| a296bc0 | Lars Schneider | 17 October 2016, 00:25:50 UTC | travis-ci: disable GIT_TEST_HTTPD for macOS TravisCI changed their default macOS image from 10.10 to 10.11 [1]. Unfortunately the HTTPD tests do not run out of the box using the pre-installed Apache web server anymore. Therefore we enable these tests only for Linux and disable them for macOS. [1] https://blog.travis-ci.com/2016-10-04-osx-73-default-image-live/ Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 November 2016, 19:13:14 UTC |
| f01fe92 | Lars Schneider | 06 November 2016, 19:35:04 UTC | Makefile: set NO_OPENSSL on macOS by default Apple removed the OpenSSL header files in macOS 10.11 and above. OpenSSL was deprecated since macOS 10.7. Set `NO_OPENSSL` and `APPLE_COMMON_CRYPTO` to `YesPlease` as default for macOS. It is possible to override this and use OpenSSL by defining `NO_APPLE_COMMON_CRYPTO`. Original-patch-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 November 2016, 19:10:36 UTC |
| 4bd488e | Jeff King | 04 November 2016, 16:30:12 UTC | create_branch: drop unused "head" parameter This function used to have the caller pass in the current value of HEAD, in order to make sure we didn't clobber HEAD. In 55c4a6730, that logic moved to validate_new_branchname(), which just resolves HEAD itself. The parameter to create_branch is now unused. Since we have to update and re-wrap the docstring describing the parameters anyway, let's take this opportunity to break it out into a list, which makes it easier to find the parameters. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 November 2016, 22:56:21 UTC |
| b8068f1 | Jiang Xin | 09 November 2016, 14:54:19 UTC | Merge branch 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git * 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git: l10n: fr.po fix grammar mistakes l10n: fr.po v2.11.0_rnd1 | 09 November 2016, 14:54:19 UTC |
| 2ae38f2 | Jeff King | 09 November 2016, 03:57:28 UTC | sequencer: silence -Wtautological-constant-out-of-range-compare When clang compiles sequencer.c, it complains: sequencer.c:632:14: warning: comparison of constant 2 with expression of type 'const enum todo_command' is always true [-Wtautological-constant-out-of-range-compare] if (command < ARRAY_SIZE(todo_command_strings)) This is because "command" is an enum that may only have two values (0 and 1) and the array in question has two elements. As it turns out, clang is actually wrong here, at least according to its own bug tracker: https://llvm.org/bugs/show_bug.cgi?id=16154 But it's still worth working around this, as the warning is present with -Wall, meaning we fail compilation with "make DEVELOPER=1". Casting the enum to size_t sufficiently unconfuses clang. As a bonus, it also catches any possible out-of-bounds access if the enum takes on a negative value (which shouldn't happen either, but again, this is a defensive check). Signed-off-by: Jeff King <peff@peff.net> | 09 November 2016, 03:59:24 UTC |
| 734fde2 | Andreas Schwab | 08 November 2016, 17:03:04 UTC | t6026-merge-attr: don't fail if sleep exits early Commit 5babb5bdb3 ("t6026-merge-attr: clean up background process at end of test case") added a kill command to clean up after the test, but this can fail if the sleep command exits before the cleanup is executed. Ignore the error from the kill command. Signed-off-by: Andreas Schwab <schwab@suse.de> Signed-off-by: Jeff King <peff@peff.net> | 08 November 2016, 20:29:24 UTC |
| 37a9586 | Jeff King | 08 November 2016, 04:50:17 UTC | alternates: re-allow relative paths from environment Commit 670c359da (link_alt_odb_entry: handle normalize_path errors, 2016-10-03) regressed the handling of relative paths in the GIT_ALTERNATE_OBJECT_DIRECTORIES variable. It's not entirely clear this was ever meant to work, but it _has_ worked for several years, so this commit restores the original behavior. When we get a path in GIT_ALTERNATE_OBJECT_DIRECTORIES, we add it the path to the list of alternate object directories as if it were found in objects/info/alternates, but with one difference: we do not provide the link_alt_odb_entry() function with a base for relative paths. That function doesn't turn it into an absolute path, and we end up feeding the relative path to the strbuf_normalize_path() function. Most relative paths break out of the top-level directory (e.g., "../foo.git/objects"), and thus normalizing fails. Prior to 670c359da, we simply ignored the error, and due to the way normalize_path_copy() was implemented it happened to return the original path in this case. We then accessed the alternate objects using this relative path. By storing the relative path in the alt_odb list, the path is relative to wherever we happen to be at the time we do an object lookup. That means we look from $GIT_DIR in a bare repository, and from the top of the worktree in a non-bare repository. If this were being designed from scratch, it would make sense to pick a stable location (probably $GIT_DIR, or even the object directory) and use that as the relative base, turning the result into an absolute path. However, given the history, at this point the minimal fix is to match the pre-670c359da behavior. We can do this simply by ignoring the error when we have no relative base and using the original value (which we now reliably have, thanks to strbuf_normalize_path()). That still leaves us with a relative path that foils our duplicate detection, and may act strangely if we ever chdir() later in the process. We could solve that by storing an absolute path based on getcwd(). That may be a good future direction; for now we'll do just the minimum to fix the regression. The new t5615 script demonstrates the fix in its final three tests. Since we didn't have any tests of the alternates environment variable at all, it also adds some tests of absolute paths. Reported-by: Bryan Turner <bturner@atlassian.com> Signed-off-by: Jeff King <peff@peff.net> | 08 November 2016, 20:28:22 UTC |
| ec2e8b3 | Johannes Sixt | 06 November 2016, 19:31:19 UTC | t0021: compute file size with a single process instead of a pipeline Avoid unwanted coding patterns (prodigal use of pipelines), and in particular a useless use of cat. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Jeff King <peff@peff.net> | 08 November 2016, 20:26:40 UTC |
| 038212c | Johannes Sixt | 03 November 2016, 20:12:13 UTC | t0021: expect more variations in the output of uniq -c Some versions of uniq -c write the count left-justified, other version write it right-justified. Be prepared for both kinds. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Jeff King <peff@peff.net> | 08 November 2016, 20:26:40 UTC |
| 73c3c10 | jfbu | 06 November 2016, 10:10:50 UTC | l10n: fr.po fix grammar mistakes Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> Signed-off-by: jfbu <jfbu@free.fr> | 06 November 2016, 19:24:55 UTC |
| 85ea5cb | Jean-Noel Avila | 05 November 2016, 20:43:53 UTC | l10n: fr.po v2.11.0_rnd1 Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 05 November 2016, 20:43:53 UTC |
| 416a48e | Peter Krefting | 05 November 2016, 15:02:45 UTC | l10n: sv.po: Update Swedish translation (2913t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 05 November 2016, 15:03:11 UTC |
| ad15a59 | Jiang Xin | 05 November 2016, 12:09:16 UTC | Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko * 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko: l10n: ko.po: Update Korean translation | 05 November 2016, 12:09:16 UTC |
| 2297360 | Tran Ngoc Quan | 04 November 2016, 01:12:04 UTC | l10n: vi.po: Updated translation to v2.11.0 (2913t) Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 04 November 2016, 01:12:04 UTC |
| de7011c | Changwoo Ryu | 03 November 2016, 15:38:23 UTC | l10n: ko.po: Update Korean translation Signed-off-by: Changwoo Ryu <cwryu@debian.org> | 03 November 2016, 15:38:23 UTC |
| 4821494 | Jeff King | 02 November 2016, 18:23:01 UTC | t0021: fix filehandle usage on older perl The rot13-filter.pl script calls methods on implicitly defined filehandles (STDOUT, and the result of an open() call). Prior to perl 5.13, these methods are not automatically loaded, and perl will complain with: Can't locate object method "flush" via package "IO::Handle" Let's explicitly load IO::File (which inherits from IO::Handle). That's more than we need for just "flush", but matches what perl has done since: http://perl5.git.perl.org/perl.git/commit/15e6cdd91beb4cefae4b65e855d68cf64766965d Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 November 2016, 02:36:29 UTC |
| f272696 | Jeff King | 02 November 2016, 18:20:22 UTC | t0021: use $PERL_PATH for rot13-filter.pl The rot13-filter.pl script hardcodes "#!/usr/bin/perl", and does not respect $PERL_PATH at all. That is a problem if the system does not have perl at that path, or if it has a perl that is too old to run a complicated script like the rot13-filter (but PERL_PATH points to a more modern one). We can fix this by using write_script() to create a new copy of the script with the correct #!-line. In theory we could move the whole script inside t0021-conversion.sh rather than having it as an auxiliary file, but it's long enough that it just makes things harder to read. As a bonus, we can stop using the full path to the script in the filter-process config we add (because the trash directory is in our PATH). Not only is this shorter, but it sidesteps any shell-quoting issues. The original was broken when $TEST_DIRECTORY contained a space, because it was interpolated in the outer script. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 November 2016, 02:36:29 UTC |
| 30030a3 | Jeff King | 02 November 2016, 18:18:25 UTC | t0021: put $TEST_ROOT in $PATH We create a rot13.sh script in the trash directory, but need to call it by its full path when we have moved our cwd to another directory. Let's just put $TEST_ROOT in our $PATH so that the script is always found. This is a minor convenience for rot13.sh, but will be a major one when we switch rot13-filter.pl to a script in the same directory, as it means we will not have to deal with shell quoting inside the filter-process config. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 November 2016, 02:36:29 UTC |
| cbb6707 | Jeff King | 02 November 2016, 18:17:51 UTC | t0021: use write_script to create rot13 shell script This avoids us fooling around with $SHELL_PATH and the executable bit ourselves. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 November 2016, 02:36:29 UTC |
| 954f127 | Jiang Xin | 02 November 2016, 14:03:05 UTC | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru * 'russian-l10n' of https://github.com/DJm00n/git-po-ru: l10n: ru.po: update Russian translation | 02 November 2016, 14:03:05 UTC |
| be5a750 | Junio C Hamano | 01 November 2016, 19:59:58 UTC | A bit of updates post -rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 November 2016, 19:59:58 UTC |
| bf2f63a | Junio C Hamano | 01 November 2016, 19:58:49 UTC | Merge branch 'cc/split-index-typofix' Typofix in a comment in code * cc/split-index-typofix: split-index: s/eith/with/ typo fix | 01 November 2016, 19:58:49 UTC |
| e828d33 | Junio C Hamano | 01 November 2016, 19:58:49 UTC | Merge branch 'jk/no-looking-at-dotgit-outside-repo' A small code cleanup. * jk/no-looking-at-dotgit-outside-repo: sha1_name: make wraparound of the index into ring-buffer explicit | 01 November 2016, 19:58:49 UTC |
| bcb4425 | Junio C Hamano | 01 November 2016, 19:58:49 UTC | Merge branch 'rs/cocci' Improve the rule to convert "unsigned char [20]" into "struct object_id *" in contrib/coccinelle/ * rs/cocci: cocci: avoid self-references in object_id transformations | 01 November 2016, 19:58:49 UTC |
| 753c451 | Christian Couder | 23 October 2016, 09:26:30 UTC | split-index: s/eith/with/ typo fix Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 November 2016, 18:48:02 UTC |
| c2bb0c1 | René Scharfe | 01 November 2016, 08:49:12 UTC | cocci: avoid self-references in object_id transformations The object_id functions oid_to_hex, oid_to_hex_r, oidclr, oidcmp, and oidcpy are defined as wrappers of their legacy counterparts sha1_to_hex, sha1_to_hex_r, hashclr, hashcmp, and hashcpy, respectively. Make sure that the Coccinelle transformations for converting legacy function calls are not applied to these wrappers themselves, which would result in tautological declarations. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 November 2016, 17:58:39 UTC |
| 3e98919 | René Scharfe | 01 November 2016, 08:49:07 UTC | sha1_name: make wraparound of the index into ring-buffer explicit Overflow is defined for unsigned integers, but not for signed ones. Wrap around explicitly for the new ring-buffer in find_unique_abbrev() as we did in bb84735c for the ones in sha1_to_hex() and get_pathname(), thus avoiding signed overflows and getting rid of the magic number 3. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 November 2016, 17:56:39 UTC |
| fda7b09 | Jiang Xin | 01 November 2016, 13:36:26 UTC | l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed) Generate po/git.pot from v2.11.0-rc0 for git v2.11.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 01 November 2016, 13:36:26 UTC |
| 1fe8f2c | Junio C Hamano | 31 October 2016, 20:19:53 UTC | Git 2.11-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2016, 20:19:53 UTC |
| ab3ad63 | Junio C Hamano | 31 October 2016, 20:15:27 UTC | Merge branch 'nd/test-helpers' Update to the test framework made in 2.9 timeframe broke running the tests under valgrind, which has been fixed. * nd/test-helpers: valgrind: support test helpers | 31 October 2016, 20:15:27 UTC |
| 590f0bf | Junio C Hamano | 31 October 2016, 20:15:26 UTC | Merge branch 'sc/fmt-merge-msg-doc-markup-fix' Documentation fix. * sc/fmt-merge-msg-doc-markup-fix: Documentation/fmt-merge-msg: fix markup in example | 31 October 2016, 20:15:26 UTC |
| da14d73 | Junio C Hamano | 31 October 2016, 20:15:25 UTC | Merge branch 'ak/sh-setup-dot-source-i18n-fix' Recent update to git-sh-setup (a library of shell functions that are used by our in-tree scripted Porcelain commands) included another shell library git-sh-i18n without specifying where it is, relying on the $PATH. This has been fixed to be more explicit by prefixing $(git --exec-path) output in front. * ak/sh-setup-dot-source-i18n-fix: git-sh-setup: be explicit where to dot-source git-sh-i18n from. | 31 October 2016, 20:15:25 UTC |
| 2f445c1 | Junio C Hamano | 31 October 2016, 20:15:25 UTC | Merge branch 'rs/commit-pptr-simplify' Code simplification. * rs/commit-pptr-simplify: commit: simplify building parents list | 31 October 2016, 20:15:25 UTC |
| 702b6a6 | Junio C Hamano | 31 October 2016, 20:15:24 UTC | Merge branch 'jk/rebase-config-insn-fmt-docfix' Documentation fix. * jk/rebase-config-insn-fmt-docfix: doc: fix missing "::" in config list | 31 October 2016, 20:15:24 UTC |
| 3d0ff88 | Junio C Hamano | 31 October 2016, 20:15:23 UTC | Merge branch 'ak/pre-receive-hook-template-modefix' A trivial clean-up to a recently graduated topic. * ak/pre-receive-hook-template-modefix: pre-receive.sample: mark it executable | 31 October 2016, 20:15:23 UTC |
| b817198 | Junio C Hamano | 31 October 2016, 20:15:23 UTC | Merge branch 'jk/common-main' A trivial clean-up to a recently graduated topic. * jk/common-main: git-compat-util: move content inside ifdef/endif guards | 31 October 2016, 20:15:23 UTC |
| 9fa1f90 | Junio C Hamano | 31 October 2016, 20:15:22 UTC | Merge branch 'aw/numbered-stash' The user always has to say "stash@{$N}" when naming a single element in the default location of the stash, i.e. reflogs in refs/stash. The "git stash" command learned to accept "git stash apply 4" as a short-hand for "git stash apply stash@{4}". * aw/numbered-stash: stash: allow stashes to be referenced by index only | 31 October 2016, 20:15:22 UTC |
| cabb79d | Junio C Hamano | 31 October 2016, 20:15:22 UTC | Merge branch 'jt/trailer-with-cruft' Update "interpret-trailers" machinery and teaches it that people in real world write all sorts of crufts in the "trailer" that was originally designed to have the neat-o "Mail-Header: like thing" and nothing else. * jt/trailer-with-cruft: trailer: support values folded to multiple lines trailer: forbid leading whitespace in trailers trailer: allow non-trailers in trailer block trailer: clarify failure modes in parse_trailer trailer: make args have their own struct trailer: streamline trailer item create and add trailer: use list.h for doubly-linked list trailer: improve const correctness | 31 October 2016, 20:15:22 UTC |
| dbaa6bd | Junio C Hamano | 31 October 2016, 20:15:21 UTC | Merge branch 'ls/filter-process' The smudge/clean filter API expect an external process is spawned to filter the contents for each path that has a filter defined. A new type of "process" filter API has been added to allow the first request to run the filter for a path to spawn a single process, and all filtering need is served by this single process for multiple paths, reducing the process creation overhead. * ls/filter-process: contrib/long-running-filter: add long running filter example convert: add filter.<driver>.process option convert: prepare filter.<driver>.process option convert: make apply_filter() adhere to standard Git error handling pkt-line: add functions to read/write flush terminated packet streams pkt-line: add packet_write_gently() pkt-line: add packet_flush_gently() pkt-line: add packet_write_fmt_gently() pkt-line: extract set_packet_header() pkt-line: rename packet_write() to packet_write_fmt() run-command: add clean_on_exit_handler run-command: move check_pipe() from write_or_die to run_command convert: modernize tests convert: quote filter names in error messages | 31 October 2016, 20:15:21 UTC |
| 906d690 | Junio C Hamano | 31 October 2016, 20:15:21 UTC | Merge branch 'ls/git-open-cloexec' Git generally does not explicitly close file descriptors that were open in the parent process when spawning a child process, but most of the time the child does not want to access them. As Windows does not allow removing or renaming a file that has a file descriptor open, a slow-to-exit child can even break the parent process by holding onto them. Use O_CLOEXEC flag to open files in various codepaths. * ls/git-open-cloexec: read-cache: make sure file handles are not inherited by child processes sha1_file: open window into packfiles with O_CLOEXEC sha1_file: rename git_open_noatime() to git_open() | 31 October 2016, 20:15:21 UTC |
| 1073094 | Anders Kaseorg | 30 October 2016, 02:10:02 UTC | git-sh-setup: be explicit where to dot-source git-sh-i18n from. d323c6b641 ("i18n: git-sh-setup.sh: mark strings for translation", 2016-06-17) started to dot-source git-sh-i18n shell script library, assuming that $PATH is already adjusted for our scripts, namely, $GIT_EXEC_PATH is at the beginning of $PATH. Old contrib scripts like contrib/convert-grafts-to-replace-refs.sh and contrib/rerere-train.sh and third-party scripts like guilt may however be using this as ". $(git --exec-path)/git-sh-setup", without satisfying that assumption. Be more explicit by specifying its path prefixed with "$(git --exec-path)/". to be safe. While we’re here, move the sourcing of git-sh-i18n below the shell portability fixes. Signed-off-by: Anders Kaseorg <andersk@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 October 2016, 23:13:49 UTC |
| de9f7fa | René Scharfe | 29 October 2016, 12:55:36 UTC | commit: simplify building parents list Push pptr down into the FROM_MERGE branch of the if/else statement, where it's actually used, and call commit_list_append() for appending elements instead of playing tricks with commit_list_insert(). Call copy_commit_list() in the amend branch instead of open-coding it. Don't bother setting pptr in the final branch as it's not used thereafter. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 October 2016, 23:03:25 UTC |
| 6d834ac | Jeff King | 30 October 2016, 18:46:33 UTC | doc: fix missing "::" in config list The rebase.instructionFormat option is missing its "::" to tell AsciiDoc that it's a list entry. As a result, the option name gets lumped into the description in one big paragraph. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 October 2016, 22:26:37 UTC |
