| c6c75c9 | Junio C Hamano | 11 January 2018, 21:20:41 UTC | Git 2.16-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 January 2018, 21:20:41 UTC |
| ba82fda | Junio C Hamano | 11 January 2018, 21:16:37 UTC | Merge branch 'jh/object-filtering' Hotfix for a topic already in 'master'. * jh/object-filtering: oidset: don't return value from oidset_init | 11 January 2018, 21:16:37 UTC |
| 453f3fe | Junio C Hamano | 11 January 2018, 21:16:36 UTC | Merge branch 'tg/worktree-create-tracking' Doc hotfix. * tg/worktree-create-tracking: Documentation/git-worktree.txt: add missing ` | 11 January 2018, 21:16:36 UTC |
| 91ec08a | Junio C Hamano | 11 January 2018, 21:16:36 UTC | Merge branch 'js/test-with-ws-in-path' Hot fix to a test. * js/test-with-ws-in-path: t3900: add some more quotes | 11 January 2018, 21:16:36 UTC |
| 50fdf7b | Ralf Thielow | 11 January 2018, 18:18:21 UTC | Documentation/git-worktree.txt: add missing ` Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 January 2018, 20:19:40 UTC |
| 36a6f49 | Beat Bolli | 10 January 2018, 09:58:32 UTC | t3900: add some more quotes In 89a70b80 ("t0302 & t3900: add forgotten quotes", 2018-01-03), quotes were added to protect against spaces in $HOME. In the test_when_finished command, two files are deleted which must be quoted individually. [jc: with \$HOME in the test_when_finished command quoted, as pointed out by j6t]. Signed-off-by: Beat Bolli <dev+git@drbeat.li> Helped-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2018, 23:07:26 UTC |
| 650b103 | Junio C Hamano | 10 January 2018, 22:01:50 UTC | RelNotes update before -rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2018, 22:01:50 UTC |
| fac9106 | Junio C Hamano | 10 January 2018, 22:01:31 UTC | Merge branch 'js/perl-path-workaround-in-tests' * js/perl-path-workaround-in-tests: mingw: handle GITPERLLIB in t0021 in a Windows-compatible way | 10 January 2018, 22:01:31 UTC |
| a466ef0 | Junio C Hamano | 10 January 2018, 22:01:25 UTC | Merge branch 'ew/empty-merge-with-dirty-index' "git merge -s recursive" did not correctly abort when the index is dirty, if the merged tree happened to be the same as the current HEAD, which has been fixed. * ew/empty-merge-with-dirty-index: merge-recursive: do not look at the index during recursive merge | 10 January 2018, 22:01:25 UTC |
| 4cc676c | Junio C Hamano | 10 January 2018, 22:01:25 UTC | Merge branch 'ma/bisect-leakfix' A hotfix for a recent update that broke 'git bisect'. * ma/bisect-leakfix: bisect: fix a regression causing a segfault | 10 January 2018, 22:01:25 UTC |
| bc4efaf | Junio C Hamano | 10 January 2018, 22:01:24 UTC | Merge branch 'js/fix-merge-arg-quoting-in-rebase-p' "git rebase -p -X<option>" did not propagate the option properly down to underlying merge strategy backend. * js/fix-merge-arg-quoting-in-rebase-p: rebase -p: fix quoting when calling `git merge` | 10 January 2018, 22:01:24 UTC |
| 3306f65 | Johannes Schindelin | 06 January 2018, 22:01:22 UTC | mingw: handle GITPERLLIB in t0021 in a Windows-compatible way Git's assumption that all path lists are colon-separated is not only wrong on Windows, it is not even an assumption that is compatible with POSIX. In the interest of time, let's not try to fix this properly but simply work around the obvious breakage on Windows, where the MSYS2 Bash used by Git for Windows to interpret the Git's Unix shell scripts will automagically convert path lists in the environment to semicolon-separated lists of Windows paths (with drive letter and the corresponding colon and all that jazz). In other words, we simply look whether there is a semicolon in GITPERLLIB and split by semicolons if found instead of colons. This is not fool-proof, of course, as the path list could consist of a single path. But that is not the case in Git for Windows' test suite, there are always two paths in GITPERLLIB. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2018, 22:00:54 UTC |
| 6366dd9 | Junio C Hamano | 09 January 2018, 22:32:57 UTC | Merge branch 'jk/doc-diff-options' Doc update. * jk/doc-diff-options: docs/diff-options: clarify scope of diff-filter types | 09 January 2018, 22:32:57 UTC |
| 4e51984 | Junio C Hamano | 09 January 2018, 22:32:56 UTC | Merge branch 'bw/protocol-v1' Test fix for a topic already in 'master'. * bw/protocol-v1: http: fix v1 protocol tests with apache httpd < 2.4 | 09 January 2018, 22:32:56 UTC |
| 14c84cd | Junio C Hamano | 09 January 2018, 22:32:55 UTC | Merge branch 'sg/travis-check-untracked' * sg/travis-check-untracked: travis-ci: check that all build artifacts are .gitignore-d travis-ci: don't store P4 and Git LFS in the working tree | 09 January 2018, 22:32:55 UTC |
| d702d5c | Junio C Hamano | 09 January 2018, 22:32:55 UTC | Merge branch 'js/test-with-ws-in-path' Test fixes. * js/test-with-ws-in-path: t0302 & t3900: add forgotten quotes Allow the test suite to pass in a directory whose name contains spaces | 09 January 2018, 22:32:55 UTC |
| e693224 | Junio C Hamano | 09 January 2018, 22:32:54 UTC | Merge branch 'bc/submitting-patches-in-asciidoc' Doc readability update. * bc/submitting-patches-in-asciidoc: doc/SubmittingPatches: improve text formatting | 09 January 2018, 22:32:54 UTC |
| a19caa7 | Junio C Hamano | 09 January 2018, 22:32:54 UTC | Merge branch 'sg/travis-skip-identical-test' Avoid repeatedly testing the same tree in TravisCI that have been tested successfully already. * sg/travis-skip-identical-test: travis-ci: record and skip successfully built trees travis-ci: create the cache directory early in the build process travis-ci: print the "tip of branch is exactly at tag" message in color | 09 January 2018, 22:32:54 UTC |
| a09a5e6 | Junio C Hamano | 09 January 2018, 22:32:53 UTC | Merge branch 'ab/dc-sha1-loose-ends' Tying loose ends for the recent integration work of collision-detecting SHA-1 implementation. * ab/dc-sha1-loose-ends: Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1 | 09 January 2018, 22:32:53 UTC |
| 2639382 | Junio C Hamano | 09 January 2018, 22:32:53 UTC | Merge branch 'sg/travis-fixes' Assorted updates for TravisCI integration. * sg/travis-fixes: travis-ci: only print test failures if there are test results available travis-ci: save prove state for the 32 bit Linux build travis-ci: don't install default addon packages for the 32 bit Linux build travis-ci: fine tune the use of 'set -x' in 'ci/*' scripts | 09 January 2018, 22:32:53 UTC |
| 02a5f25 | Junio C Hamano | 09 January 2018, 19:07:03 UTC | Merge branch 'js/misc-git-gui-stuff' of ../git-gui * 'js/misc-git-gui-stuff' of ../git-gui: git-gui: allow Ctrl+T to toggle multiple paths git-gui: fix exception when trying to stage with empty file list git-gui: avoid exception upon Ctrl+T in an empty list git gui: fix staging a second line to a 1-line file | 09 January 2018, 19:07:03 UTC |
| 76756d6 | Johannes Schindelin | 09 January 2018, 14:33:04 UTC | git-gui: allow Ctrl+T to toggle multiple paths It is possible to select multiple files in the "Unstaged Changes" and the "Staged Changes" lists. But when hitting Ctrl+T, surprisingly only one entry is handled, not all selected ones. Let's just use the same code path as for the "Stage To Commit" and the "Unstage From Commit" menu items. This fixes https://github.com/git-for-windows/git/issues/1012 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2018, 19:02:40 UTC |
| 2cd9179 | Johannes Schindelin | 09 January 2018, 14:33:01 UTC | git-gui: fix exception when trying to stage with empty file list If there is nothing to stage, there is nothing to stage. Let's not try to, even if the file list contains nothing at all. This fixes https://github.com/git-for-windows/git/issues/1075 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2018, 19:02:40 UTC |
| 2365e5b | Johannes Schindelin | 09 January 2018, 14:32:58 UTC | git-gui: avoid exception upon Ctrl+T in an empty list Previously unstaged files can be staged by clicking on them and then pressing Ctrl+T. Conveniently, the next unstaged file is selected automatically so that the unstaged files can be staged by repeatedly pressing Ctrl+T. When a user hits Ctrl+T one time too many, though, Git GUI used to throw this exception: expected number but got "" expected number but got "" while executing "expr {int([lindex [$w tag ranges in_diff] 0])}" (procedure "toggle_or_diff" line 13) invoked from within "toggle_or_diff toggle .vpane.files.workdir.list " (command bound to event) Let's just avoid that by skipping the operation when there are no more files to stage. This fixes https://github.com/git-for-windows/git/issues/1060 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2018, 19:02:40 UTC |
| 6d02c1e | Johannes Schindelin | 09 January 2018, 14:32:54 UTC | git gui: fix staging a second line to a 1-line file When a 1-line file is augmented by a second line, and the user tries to stage that single line via the "Stage Line" context menu item, we do not want to see "apply: corrupt patch at line 5". The reason for this error was that the hunk header looks like this: @@ -1 +1,2 @@ but the existing code expects the original range always to contain a comma. This problem is easily fixed by cutting the string "1 +1,2" (that Git GUI formerly mistook for the starting line) at the space. This fixes https://github.com/git-for-windows/git/issues/515 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2018, 19:02:40 UTC |
| 5b1c54a | Junio C Hamano | 09 January 2018, 18:41:37 UTC | Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index * ew/empty-merge-with-dirty-index-maint: merge-recursive: do not look at the index during recursive merge | 09 January 2018, 18:41:37 UTC |
| f309e8e | Junio C Hamano | 09 January 2018, 18:05:51 UTC | merge-recursive: do not look at the index during recursive merge When merging another branch into ours, if their tree is the same as the common ancestor's, we can declare that our tree represents the result of three-way merge. In such a case, the recursive merge backend incorrectly used to create a commit out of our index, even when the index has changes. A recent fix attempted to prevent this by adding a comparison between "our" tree and the index, but forgot that this check must be restricted only to the outermost merge. Inner merges performed by the recursive backend across merge bases are by definition made from scratch without having any local changes added to the index. The call to index_has_changes() during an inner merge is working on the index that has no relation to the merge being performed, preventing legitimate merges from getting carried out. Fix it by limiting the check to the outermost merge. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2018, 18:39:30 UTC |
| 03e7833 | Thomas Gummerer | 07 January 2018, 23:04:04 UTC | oidset: don't return value from oidset_init c3a9ad3117 ("oidset: add iterator methods to oidset", 2017-11-21) introduced a 'oidset_init()' function in oidset.h, which has void as return type, but returns an expression. This makes the solaris compiler fail with: "oidset.h", line 30: void function cannot return value As the return type is void, and even the return type of the expression we're trying to return (oidmap_init) is void just remove the return statement to fix the compiler error. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 January 2018, 23:24:35 UTC |
| 36438dc | Junio C Hamano | 05 January 2018, 21:45:17 UTC | Git 2.16-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2018, 21:45:17 UTC |
| 8c8ddbd | Junio C Hamano | 05 January 2018, 21:28:11 UTC | Merge branch 'js/sequencer-cleanups' Code cleanup. * js/sequencer-cleanups: sequencer: do not invent whitespace when transforming OIDs sequencer: report when noop has an argument sequencer: remove superfluous conditional sequencer: strip bogus LF at end of error messages rebase: do not continue when the todo list generation failed | 05 January 2018, 21:28:12 UTC |
| bc27a2e | Junio C Hamano | 05 January 2018, 21:28:11 UTC | Merge branch 'jh/memihash-opt' Squelch compiler warning. * jh/memihash-opt: t/helper/test-lazy-name-hash: fix compilation | 05 January 2018, 21:28:11 UTC |
| e82bbcb | Junio C Hamano | 05 January 2018, 21:28:11 UTC | Merge branch 'tb/test-lint-wc-l' Test update. * tb/test-lint-wc-l: check-non-portable-shell.pl: `wc -l` may have leading WS | 05 January 2018, 21:28:11 UTC |
| 0956eaa | Junio C Hamano | 05 January 2018, 21:28:10 UTC | Merge branch 'rs/use-argv-array-in-child-process' Code cleanup. * rs/use-argv-array-in-child-process: send-pack: use internal argv_array of struct child_process http: use internal argv_array of struct child_process | 05 January 2018, 21:28:10 UTC |
| a778ba1 | Junio C Hamano | 05 January 2018, 21:28:10 UTC | Merge branch 'ld/p4-multiple-shelves' "git p4" update. * ld/p4-multiple-shelves: git-p4: update multiple shelved change lists | 05 January 2018, 21:28:10 UTC |
| a741e28 | Junio C Hamano | 05 January 2018, 21:28:10 UTC | Merge branch 'jd/fix-strbuf-add-urlencode-bytes' Bytes with high-bit set were encoded incorrectly and made credential helper fail. * jd/fix-strbuf-add-urlencode-bytes: strbuf: fix urlencode format string on signed char | 05 January 2018, 21:28:10 UTC |
| 843d94b | Junio C Hamano | 05 January 2018, 21:28:09 UTC | Merge branch 'ew/empty-merge-with-dirty-index' "git merge -s recursive" did not correctly abort when the index is dirty, if the merged tree happened to be the same as the current HEAD, which has been fixed. * ew/empty-merge-with-dirty-index: merge-recursive: avoid incorporating uncommitted changes in a merge move index_has_changes() from builtin/am.c to merge.c for reuse t6044: recursive can silently incorporate dirty changes in a merge | 05 January 2018, 21:28:09 UTC |
| fa62d03 | Junio C Hamano | 05 January 2018, 21:28:09 UTC | Merge branch 'db/doc-config-section-names-with-bs' Doc update. * db/doc-config-section-names-with-bs: config.txt: document behavior of backslashes in subsections | 05 January 2018, 21:28:09 UTC |
| 07b747d | Junio C Hamano | 05 January 2018, 21:28:09 UTC | Merge branch 'jk/test-suite-tracing' Assorted fixes around running tests with "-x" tracing option. * jk/test-suite-tracing: t/Makefile: introduce TEST_SHELL_PATH test-lib: make "-x" work with "--verbose-log" t5615: avoid re-using descriptor 4 test-lib: silence "-x" cleanup under bash | 05 January 2018, 21:28:09 UTC |
| dd6fb00 | Johannes Schindelin | 04 January 2018, 21:31:52 UTC | rebase -p: fix quoting when calling `git merge` It has been reported that strategy arguments are not passed to `git merge` correctly when rebasing interactively, preserving merges. The reason is that the strategy arguments are already quoted, and then quoted again. This fixes https://github.com/git-for-windows/git/issues/1321 Original-patch-by: Kim Gybels <kgybels@infogroep.be> Also-reported-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2018, 20:26:01 UTC |
| 46af107 | Jeff King | 04 January 2018, 16:49:42 UTC | docs/diff-options: clarify scope of diff-filter types The same document for "--diff-filter" is included by many programs in the diff family. Because it mentions all possible types (added, removed, etc), this may imply to the reader that all types can be generated by a particular command. But this isn't necessarily the case; "diff-files" cannot generally produce an "Added" entry, since the diff is limited to what is already in the index. Let's make it clear that the list here is the full one, and does not imply anything about what a particular invocation may produce. Note that conditionally including items (e.g., omitting "Added" in the git-diff-files manpage) isn't the right solution here for two reasons: - The problem isn't diff-files, but doing an index to working tree diff. "git diff" can do the same diff, but also has other modes where "Added" does show up. - The direction of the diff matters. Doing "diff-files -R" can get you Added entries (but not Deleted ones). So it's best just to explain that the set of available types depends on the specific diff invocation. Reported-by: John Cheng <johnlicheng@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2018, 19:09:47 UTC |
| a812952 | Todd Zullinger | 31 December 2017, 02:32:34 UTC | http: fix v1 protocol tests with apache httpd < 2.4 The apache config used by tests was updated to use the SetEnvIf directive to set the Git-Protocol header in 19113a26b6 ("http: tell server that the client understands v1", 2017-10-16). Setting the Git-Protocol header is restricted to httpd >= 2.4, but mod_setenvif and the SetEnvIf directive work with lower versions, at least as far back as 2.0, according to the httpd documentation: https://httpd.apache.org/docs/2.0/mod/mod_setenvif.html Drop the restriction. Tested with httpd 2.2 and 2.4. Signed-off-by: Todd Zullinger <tmz@pobox.com> Acked-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2018, 18:45:57 UTC |
| 89a70b8 | Johannes Schindelin | 03 January 2018, 16:54:54 UTC | t0302 & t3900: add forgotten quotes When cleaning up files in the $HOME directory, it really makes sense to quote the path, especially in Git's test suite, where the HOME directory is *guaranteed* to contain spaces in its name. It would appear that those two tests pass even without cleaning up the files, but really more by pure chance than by design (the cleanup seems not actually to be necessary). However, if anybody would have a left-over `trash/` directory in Git's `t/` directory, these tests would fail, because they would all of a sudden try to delete that directory, but without the `-r` (recursive) flag. That is how this issue was found. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2018, 23:55:50 UTC |
| 567c53d | Johannes Schindelin | 03 January 2018, 16:54:50 UTC | Allow the test suite to pass in a directory whose name contains spaces It is totally legitimate to clone Git's source code anywhere, including into, say, directories whose name (or the name of its absolute path) contains spaces. However, a couple of tests failed to anticipate this, for lack of quoting (or in one instance, for failure to expect more than one space in the absolute path of the TEST_DIRECTORY). This can be easily verified by calling these commands in your current clone: git clone . with\ spaces cd with\ spaces make -j15 test Let's fix this. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2018, 23:55:48 UTC |
| 2e9fdc7 | Ævar Arnfjörð Bjarmason | 03 January 2018, 18:48:52 UTC | bisect: fix a regression causing a segfault In 7c117184d7 ("bisect: fix off-by-one error in `best_bisection_sorted()`", 2017-11-05) the more careful logic dealing with freeing p->next in 50e62a8e70 ("rev-list: implement --bisect-all", 2007-10-22) was removed. Restore the more careful check to avoid segfaulting. Ideally this would come with a test case, but we don't have steps to reproduce this, only a backtrace from gdb pointing to this being the issue. Reported-by: Yasushi SHOJI <yasushi.shoji@gmail.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Acked-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2018, 23:33:46 UTC |
| c9e3d47 | Todd Zullinger | 02 January 2018, 15:33:50 UTC | doc/SubmittingPatches: improve text formatting 049e64aa50 ("Documentation: convert SubmittingPatches to AsciiDoc", 2017-11-12) changed the `git blame` and `git shortlog` examples given in the section on sending your patches. In order to italicize the `$path` argument the commands are enclosed in plus characters as opposed to backticks. The difference between the quoting methods is that backtick enclosed text is not subject to further expansion. This formatting makes reading SubmittingPatches in a git clone a little more difficult. In addition to the underscores around `$path` the `--` chars in `git shortlog --no-merges` must be replaced with `{litdd}`. Use backticks to quote these commands. The italicized `$path` is lost from the html version but the commands can be read (and copied) more easily by users reading the text version. These readers are more likely to use the commands while submitting patches. Make it easier for them. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2018, 21:34:56 UTC |
| b92cb86 | SZEDER Gábor | 31 December 2017, 16:02:06 UTC | travis-ci: check that all build artifacts are .gitignore-d Every once in a while our explicit .gitignore files get out of sync when our build process learns to create new artifacts, like test helper executables, but the .gitignore files are not updated accordingly. Use Travis CI to help catch such issues earlier: check that there are no untracked files at the end of any build jobs building Git (i.e. the 64 bit Clang and GCC Linux and OSX build jobs, plus the GETTEXT_POISON and 32 bit Linux build jobs) or its documentation, and fail the build job if there are any present. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2018, 21:29:19 UTC |
| 88e00b7 | SZEDER Gábor | 31 December 2017, 16:02:05 UTC | travis-ci: don't store P4 and Git LFS in the working tree The Clang and GCC 64 bit Linux build jobs download and store the P4 and Git LFS executables under the current directory, which is the working tree that we are about to build and test. This means that Git commands like 'status' or 'ls-files' would list these files as untracked. The next commit is about to make sure that there are no untracked files present after the build, and the downloaded executables in the working tree are interfering with those upcoming checks. Therefore, let's download P4 and Git LFS in the home directory, outside of the working tree. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2018, 21:29:18 UTC |
| 9cc2c76 | SZEDER Gábor | 31 December 2017, 10:12:05 UTC | travis-ci: record and skip successfully built trees Travis CI dutifully builds and tests each new branch tip, even if its tree has previously been successfully built and tested. This happens often enough in contributors' workflows, when a work-in-progress branch is rebased changing e.g. only commit messages or the order or number of commits while leaving the resulting code intact, and is then pushed to a Travis CI-enabled GitHub fork. This is wasting Travis CI's resources and is sometimes scary-annoying when the new tip commit with a tree identical to the previous, successfully tested one is suddenly reported in red, because one of the OSX build jobs happened to exceed the time limit yet again. So extend our Travis CI build scripts to skip building commits whose trees have previously been successfully built and tested. Use the Travis CI cache feature to keep a record of the object names of trees that tested successfully, in a plain and simple flat text file, one line per tree object name. Append the current tree's object name at the end of every successful build job to this file, along with a bit of additional info about the build job (commit object name, Travis CI job number and id). Limit the size of this file to 1000 records, to prevent it from growing too large for git/git's forever living integration branches. Check, using a simple grep invocation, in each build job whether the current commit's tree is already in there, and skip the build if it is. Include a message in the skipped build job's trace log, containing the URL to the build job successfully testing that tree for the first time and instructions on how to force a re-build. Catch the case when a build job, which successfully built and tested a particular tree for the first time, is restarted and omit the URL of the previous build job's trace log, as in this case it's the same build job and the trace log has just been overwritten. Note: this won't kick in if two identical trees are on two different branches, because Travis CI caches are not shared between build jobs of different branches. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Reviewed-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2018, 19:25:58 UTC |
| b4a2fdc | SZEDER Gábor | 31 December 2017, 10:12:04 UTC | travis-ci: create the cache directory early in the build process It seems that Travis CI creates the cache directory for us anyway, even when a previous cache doesn't exist for the current build job. Alas, this behavior is not explicitly documented, therefore we don't rely on it and create the cache directory ourselves in those build jobs that read/write cached data (currently only the prove state). In the following commit we'll start to cache additional data in every build job, and will access the cache much earlier in the build process. Therefore move creating the cache directory to 'ci/lib-travisci.sh' to make sure that it exists at the very beginning of every build job. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Reviewed-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2018, 19:25:57 UTC |
| 495ea6c | SZEDER Gábor | 31 December 2017, 10:12:03 UTC | travis-ci: print the "tip of branch is exactly at tag" message in color To make this info message stand out from the regular build job trace output. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Reviewed-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 January 2018, 19:25:55 UTC |
| 1eaabe3 | Junio C Hamano | 28 December 2017, 22:12:06 UTC | Git 2.16-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2017, 22:12:06 UTC |
| 556de1a | Junio C Hamano | 28 December 2017, 22:08:50 UTC | Merge branch 'sb/describe-blob' "git describe" was taught to dig trees deeper to find a <commit-ish>:<path> that refers to a given blob object. * sb/describe-blob: builtin/describe.c: describe a blob builtin/describe.c: factor out describe_commit builtin/describe.c: print debug statements earlier builtin/describe.c: rename `oid` to avoid variable shadowing revision.h: introduce blob/tree walking in order of the commits list-objects.c: factor out traverse_trees_and_blobs t6120: fix typo in test name | 28 December 2017, 22:08:50 UTC |
| 0433d53 | Junio C Hamano | 28 December 2017, 22:08:50 UTC | Merge branch 'hi/merge-verify-sig-config' "git merge" learned to pay attention to merge.verifySignatures configuration variable and pretend as if '--verify-signatures' option was given from the command line. * hi/merge-verify-sig-config: t5573, t7612: clean up after unexpected success of 'pull' and 'merge' t: add tests for pull --verify-signatures merge: add config option for verifySignatures | 28 December 2017, 22:08:50 UTC |
| fc4a226 | Junio C Hamano | 28 December 2017, 22:08:50 UTC | Merge branch 'ws/curl-http-proxy-over-https' Git has been taught to support an https:// URL used for http.proxy when using recent versions of libcurl. * ws/curl-http-proxy-over-https: http: support CURLPROXY_HTTPS | 28 December 2017, 22:08:50 UTC |
| f53edaf | Junio C Hamano | 28 December 2017, 22:08:49 UTC | Merge branch 'ks/doc-previous-checkout' Doc update. * ks/doc-previous-checkout: Doc/check-ref-format: clarify information about @{-N} syntax | 28 December 2017, 22:08:50 UTC |
| 594672d | Junio C Hamano | 28 December 2017, 22:08:49 UTC | Merge branch 'ks/rebase-error-messages' Error messages from "git rebase" have been somewhat cleaned up. * ks/rebase-error-messages: rebase: rebasing can also be done when HEAD is detached rebase: distinguish user input by quoting it rebase: consistently use branch_name variable | 28 December 2017, 22:08:49 UTC |
| 593fdcc | Junio C Hamano | 28 December 2017, 22:08:49 UTC | Merge branch 'sr/http-sslverify-config-doc' Docfix. * sr/http-sslverify-config-doc: config: document default value of http.sslVerify | 28 December 2017, 22:08:49 UTC |
| 9368a3d | Junio C Hamano | 28 December 2017, 22:08:48 UTC | Merge branch 'nm/imap-send-quote-server-folder-name' "git imap-send" did not correctly quote the folder name when making a request to the server, which has been corrected. * nm/imap-send-quote-server-folder-name: imap-send: URI encode server folder | 28 December 2017, 22:08:48 UTC |
| 8e777af | Junio C Hamano | 28 December 2017, 22:08:48 UTC | Merge branch 'bp/fsmonitor' Test fix. * bp/fsmonitor: p7519: improve check for prerequisite WATCHMAN | 28 December 2017, 22:08:48 UTC |
| f40e83d | Junio C Hamano | 28 December 2017, 22:08:47 UTC | Merge branch 'jh/partial-clone-doc' * jh/partial-clone-doc: partial-clone: design doc | 28 December 2017, 22:08:47 UTC |
| 2546de2 | Junio C Hamano | 28 December 2017, 22:08:47 UTC | Merge branch 'jt/transport-hide-vtable' Code clean-up. * jt/transport-hide-vtable: transport: make transport vtable more private clone, fetch: remove redundant transport check | 28 December 2017, 22:08:47 UTC |
| 58d1772 | Junio C Hamano | 28 December 2017, 22:08:47 UTC | Merge branch 'js/enhanced-version-info' "git version --build-options" learned to report the host CPU and the exact commit object name the binary was built from. * js/enhanced-version-info: version --build-options: report commit, too, if possible version --build-options: also report host CPU | 28 December 2017, 22:08:47 UTC |
| deeb2fc | Junio C Hamano | 28 December 2017, 22:08:46 UTC | Merge branch 'tz/lib-git-svn-svnserve-tests' * tz/lib-git-svn-svnserve-tests: t/lib-git-svn.sh: improve svnserve tests with parallel make test t/lib-git-svn: cleanup inconsistent tab/space usage | 28 December 2017, 22:08:46 UTC |
| 63dd544 | Junio C Hamano | 28 December 2017, 22:08:46 UTC | Merge branch 'ew/svn-crlf' "git svn" has been updated to strip CRs in the commit messages, as recent versions of Subversion rejects them. * ew/svn-crlf: git-svn: convert CRLF to LF in commit message to SVN | 28 December 2017, 22:08:46 UTC |
| f427b94 | Junio C Hamano | 28 December 2017, 22:08:46 UTC | Merge branch 'cc/skip-to-optional-val' Introduce a helper to simplify code to parse a common pattern that expects either "--key" or "--key=<something>". * cc/skip-to-optional-val: t4045: reindent to make helpers readable diff: add tests for --relative without optional prefix value diff: use skip_to_optional_arg_default() in parsing --relative diff: use skip_to_optional_arg_default() diff: use skip_to_optional_arg() index-pack: use skip_to_optional_arg() git-compat-util: introduce skip_to_optional_arg() | 28 December 2017, 22:08:46 UTC |
| 5abbdbb | Junio C Hamano | 28 December 2017, 22:08:45 UTC | Merge branch 'ra/prompt-eread-fix' Update the shell prompt script (in contrib/) to strip trailing CR from strings read from various "state" files. * ra/prompt-eread-fix: git-prompt: fix reading files with windows line endings git-prompt: make __git_eread intended use explicit | 28 December 2017, 22:08:45 UTC |
| 1f24cad | Junio C Hamano | 28 December 2017, 22:08:45 UTC | Merge branch 'bw/path-doc' Doc updates. * bw/path-doc: path: document path functions | 28 December 2017, 22:08:45 UTC |
| edb6a17 | Ævar Arnfjörð Bjarmason | 28 December 2017, 14:07:41 UTC | Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1 Use the collision detecting SHA-1 implementation by default even when NO_OPENSSL is set. Setting NO_OPENSSL=UnfortunatelyYes has implied BLK_SHA1=1 ever since the former was introduced in dd53c7ab29 (Support for NO_OPENSSL, 2005-07-29). That implication should have been removed when the default SHA-1 implementation changed from OpenSSL to DC_SHA1 in e6b07da278 (Makefile: make DC_SHA1 the default, 2017-03-17). Finish what that commit started by removing the BLK_SHA1 fallback setting so the default DC_SHA1 implementation will be used. Helped-by: Jonathan Nieder <jrnieder@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2017, 19:55:56 UTC |
| c7b4d79 | Johannes Schindelin | 22 December 2017, 23:56:00 UTC | sequencer: do not invent whitespace when transforming OIDs For commands that do not have an argument, there is no need to append a trailing space at the end of the line. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2017, 20:33:38 UTC |
| 66afa24 | Johannes Schindelin | 22 December 2017, 23:55:57 UTC | sequencer: report when noop has an argument The noop command cannot accept any argument, but we never told the user about any bogus argument. Fix that. while at it, mention clearly when an argument is required but missing (for commands *other* than noop). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2017, 20:33:38 UTC |
| 5f8f927 | Johannes Schindelin | 22 December 2017, 23:55:53 UTC | sequencer: remove superfluous conditional In a conditional block that is only reached when handling a TODO_REWORD (as seen even from a 3-line context), there is absolutely no need to nest another block under the identical condition. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2017, 20:33:38 UTC |
| aee42e1 | Johannes Schindelin | 22 December 2017, 23:55:43 UTC | sequencer: strip bogus LF at end of error messages Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2017, 20:33:38 UTC |
| 9336281 | Johannes Schindelin | 22 December 2017, 23:55:38 UTC | rebase: do not continue when the todo list generation failed This is a *really* long-standing bug. As a matter of fact, this bug has been with us from the very beginning of `rebase -i`: 1b1dce4bae7 (Teach rebase an interactive mode, 2007-06-25), where the output of `rev-list` was piped to `sed` (and any failure of the `rev-list` process would go completely undetected). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2017, 20:33:38 UTC |
| 677c707 | SZEDER Gábor | 27 December 2017, 16:36:03 UTC | travis-ci: only print test failures if there are test results available When a build job running the test suite fails, our 'ci/print-test-failures.sh' script scans all 't/test-results/*.exit' files to find failed tests and prints their verbose output. However, if a build job were to fail before it ever gets to run the test suite, then there will be no files to match the above pattern and the shell will take the pattern literally, resulting in errors like this in the trace log: cat: t/test-results/*.exit: No such file or directory ------------------------------------------------------------------------ t/test-results/*.out... ------------------------------------------------------------------------ cat: t/test-results/*.out: No such file or directory Check upfront and proceed only if there are any such files present. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Reviewed-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2017, 20:15:22 UTC |
| 7e72cfc | SZEDER Gábor | 27 December 2017, 16:36:02 UTC | travis-ci: save prove state for the 32 bit Linux build This change follows suit of 6272ed319 (travis-ci: run previously failed tests first, then slowest to fastest, 2016-01-26), which did this for the Linux and OSX build jobs. Travis CI build jobs run the tests parallel, which is sligtly faster when tests are run in slowest to fastest order, shortening the overall runtime of this build job by about a minute / 10%. Note, that the 32 bit Linux build job runs the tests suite in a Docker container and we have to share the Travis CI cache directory with the container as a second volume. Otherwise we couldn't use a symlink pointing to the prove state file in the cache directory, because that's outside of the directory hierarchy accessible from within the container. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Reviewed-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2017, 20:15:05 UTC |
| 2c9a2dd | SZEDER Gábor | 27 December 2017, 16:36:01 UTC | travis-ci: don't install default addon packages for the 32 bit Linux build The 32 bit Linux build job compiles Git and runs the test suite in a Docker container, while the additional packages (apache2, git-svn, language-pack-is) are installed on the host, therefore don't have any effect and are unnecessary. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Acked-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2017, 20:14:39 UTC |
| a8b8b6b | SZEDER Gábor | 27 December 2017, 16:36:00 UTC | travis-ci: fine tune the use of 'set -x' in 'ci/*' scripts The change in commit 4f2636667 (travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing output, 2017-12-12) left a couple of rough edges: - 'ci/run-linux32-build.sh' is executed in a Docker container and therefore doesn't source 'ci/lib-travisci.sh', which would enable tracing executed commands. Enable 'set -x' in this script, too. - 'ci/print-test-failures.sh' iterates over all the files containing the exit codes of all the executed test scripts. Since there are over 800 such files, the loop produces way too much noise with tracing executed commands enabled, so disable 'set -x' for this script. - 'ci/run-windows-build.sh' busily waits in a loop for the result of the Windows build, producing too much noise with tracing executed commands enabled as well. Disable 'set -x' for the duration of that loop. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2017, 20:13:46 UTC |
| 29533fb | Junio C Hamano | 27 December 2017, 19:20:27 UTC | RelNotes: the eleventh batch Hopefully the last one before -rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2017, 19:20:27 UTC |
| dc8fb4d | Junio C Hamano | 27 December 2017, 19:16:30 UTC | Merge branch 'rb/quick-install-doc' The build procedure now allows not just the repositories but also the refs to be used to take pre-formatted manpages and html documents to install. * rb/quick-install-doc: install-doc-quick: allow specifying what ref to install | 27 December 2017, 19:16:30 UTC |
| d22114a | Junio C Hamano | 27 December 2017, 19:16:30 UTC | Merge branch 'jt/transport-no-more-rsync' Code clean-up. * jt/transport-no-more-rsync: transport: remove unused "push" in vtable | 27 December 2017, 19:16:30 UTC |
| f62b471 | Junio C Hamano | 27 December 2017, 19:16:30 UTC | Merge branch 'sg/travis-fixes' Assorted updates for TravisCI integration. * sg/travis-fixes: travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing output travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh' travis-ci: move setting environment variables to 'ci/lib-travisci.sh' travis-ci: introduce a $jobname variable for 'ci/*' scripts | 27 December 2017, 19:16:30 UTC |
| 0635812 | Junio C Hamano | 27 December 2017, 19:16:29 UTC | Merge branch 'sb/test-helper-excludes' Simplify the ignore rules for t/helper directory. * sb/test-helper-excludes: t/helper: ignore everything but sources | 27 December 2017, 19:16:29 UTC |
| 6bd396b | Junio C Hamano | 27 December 2017, 19:16:29 UTC | Merge branch 'ot/pretty' Code clean-up. * ot/pretty: format: create docs for pretty.h format: create pretty.h file | 27 December 2017, 19:16:29 UTC |
| 00c4d2b | Junio C Hamano | 27 December 2017, 19:16:28 UTC | Merge branch 'bw/submodule-sans-cache-compat' Code clean-up. * bw/submodule-sans-cache-compat: submodule: convert get_next_submodule to not rely on the_index submodule: used correct index in is_staging_gitmodules_ok submodule: convert stage_updated_gitmodules to take a struct index_state | 27 December 2017, 19:16:28 UTC |
| 237aa99 | Junio C Hamano | 27 December 2017, 19:16:28 UTC | Merge branch 'es/clone-shared-worktree' "git clone --shared" to borrow from a (secondary) worktree did not work, even though "git clone --local" did. Both are now accepted. * es/clone-shared-worktree: clone: support 'clone --shared' from a worktree | 27 December 2017, 19:16:28 UTC |
| e2e2bf2 | Junio C Hamano | 27 December 2017, 19:16:27 UTC | Merge branch 'tb/delimit-pretty-trailers-args-with-comma' Doc updates. * tb/delimit-pretty-trailers-args-with-comma: docs/pretty-formats: mention commas in %(trailers) syntax | 27 December 2017, 19:16:27 UTC |
| 54b1335 | Junio C Hamano | 27 December 2017, 19:16:26 UTC | Merge branch 'rs/fmt-merge-msg-leakfix' Leakfix. * rs/fmt-merge-msg-leakfix: transport-helper: plug strbuf and string_list leaks | 27 December 2017, 19:16:26 UTC |
| eacf669 | Junio C Hamano | 27 December 2017, 19:16:26 UTC | Merge branch 'jt/decorate-api' A few structures and variables that are implementation details of the decorate API have been renamed and then the API got documented better. * jt/decorate-api: decorate: clean up and document API | 27 December 2017, 19:16:26 UTC |
| 6ae1868 | Junio C Hamano | 27 December 2017, 19:16:26 UTC | Merge branch 'jk/cvsimport-quoting' Typo/Logico fix. * jk/cvsimport-quoting: cvsimport: apply shell-quoting regex globally | 27 December 2017, 19:16:26 UTC |
| f7bbca1 | Junio C Hamano | 27 December 2017, 19:16:25 UTC | Merge branch 'db/doc-workflows-neuter-the-maintainer' Docfix. * db/doc-workflows-neuter-the-maintainer: doc: reword gitworkflows.txt for neutrality | 27 December 2017, 19:16:25 UTC |
| 0faff98 | Junio C Hamano | 27 December 2017, 19:16:25 UTC | Merge branch 'ks/branch-cleanup' Code clean-up. * ks/branch-cleanup: builtin/branch: strip refs/heads/ using skip_prefix branch: update warning message shown when copying a misnamed branch branch: group related arguments of create_branch() branch: improve documentation and naming of create_branch() parameters | 27 December 2017, 19:16:25 UTC |
| a13e45f | Junio C Hamano | 27 December 2017, 19:16:24 UTC | Merge branch 'rs/strbuf-read-once-reset-length' Leakfix. * rs/strbuf-read-once-reset-length: strbuf: release memory on read error in strbuf_read_once() | 27 December 2017, 19:16:24 UTC |
| 1f9ce78 | Junio C Hamano | 27 December 2017, 19:16:23 UTC | Merge branch 'rs/fmt-merge-msg-string-leak-fix' Leakfix. * rs/fmt-merge-msg-string-leak-fix: fmt-merge-msg: avoid leaking strbuf in shortlog() | 27 December 2017, 19:16:23 UTC |
| 5c14bd6 | Junio C Hamano | 27 December 2017, 19:16:22 UTC | Merge branch 'rs/am-builtin-leakfix' Leakfix. * rs/am-builtin-leakfix: am: release strbuf after use in split_mail_mbox() | 27 December 2017, 19:16:23 UTC |
| e87f9fc | Junio C Hamano | 27 December 2017, 19:16:21 UTC | Merge branch 'es/worktree-checkout-hook' "git worktree add" learned to run the post-checkout hook, just like "git checkout" does, after the initial checkout. * es/worktree-checkout-hook: worktree: invoke post-checkout hook (unless --no-checkout) | 27 December 2017, 19:16:21 UTC |
| 0da2ba4 | Junio C Hamano | 27 December 2017, 19:16:21 UTC | Merge branch 'lb/rebase-i-short-command-names' With a configuration variable rebase.abbreviateCommands set, "git rebase -i" produces the todo list with a single-letter command names. * lb/rebase-i-short-command-names: sequencer.c: drop 'const' from function return type t3404: add test case for abbreviated commands rebase -i: learn to abbreviate command names rebase -i -x: add exec commands via the rebase--helper rebase -i: update functions to use a flags parameter rebase -i: replace reference to sha1 with oid rebase -i: refactor transform_todo_ids rebase -i: set commit to null in exec commands Documentation: use preferred name for the 'todo list' script Documentation: move rebase.* configs to new file | 27 December 2017, 19:16:21 UTC |
| 720b176 | Junio C Hamano | 27 December 2017, 19:16:21 UTC | Merge branch 'tb/check-crlf-for-safe-crlf' The "safe crlf" check incorrectly triggered for contents that does not use CRLF as line endings, which has been corrected. * tb/check-crlf-for-safe-crlf: t0027: Adapt the new MIX tests to Windows convert: tighten the safe autocrlf handling | 27 December 2017, 19:16:21 UTC |
| 61061ab | Junio C Hamano | 27 December 2017, 19:16:20 UTC | Merge branch 'jh/object-filtering' In preparation for implementing narrow/partial clone, the object walking machinery has been taught a way to tell it to "filter" some objects from enumeration. * jh/object-filtering: rev-list: support --no-filter argument list-objects-filter-options: support --no-filter list-objects-filter-options: fix 'keword' typo in comment pack-objects: add list-objects filtering rev-list: add list-objects filtering support list-objects: filter objects in traverse_commit_list oidset: add iterator methods to oidset oidmap: add oidmap iterator methods dir: allow exclusions from blob in addition to file | 27 December 2017, 19:16:21 UTC |
| ee5462d | Junio C Hamano | 27 December 2017, 19:12:45 UTC | sequencer.c: drop 'const' from function return type With -Werror=ignored-qualifiers, a function that claims to return "const char" gets this error: CC sequencer.o sequencer.c:798:19: error: type qualifiers ignored on function return type [-Werror=ignored-qualifiers] static const char command_to_char(const enum todo_command command) ^ Reported-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2017, 19:12:45 UTC |
| 4c267f2 | Julien Dusser | 22 December 2017, 17:24:37 UTC | strbuf: fix urlencode format string on signed char Git credential fails with special char in password with remote: Invalid username or password. fatal: Authentication failed for File ~/.git-credential contains badly urlencoded characters %ffffffXX%ffffffYY instead of %XX%YY. Add a cast to an unsigned char to fix urlencode use of %02x on a char. Signed-off-by: Julien Dusser <julien.dusser@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2017, 21:43:19 UTC |
