| 1f5d429 | Junio C Hamano | 06 July 2016, 20:06:39 UTC | Merge branch 'jk/avoid-unbounded-alloca' into maint A codepath that used alloca(3) to place an unbounded amount of data on the stack has been updated to avoid doing so. * jk/avoid-unbounded-alloca: tree-diff: avoid alloca for large allocations | 06 July 2016, 20:06:39 UTC |
| c014445 | Junio C Hamano | 06 July 2016, 20:06:38 UTC | Merge branch 'rj/compat-regex-size-max-fix' into maint A compilation fix. * rj/compat-regex-size-max-fix: regex: fix a SIZE_MAX macro redefinition warning | 06 July 2016, 20:06:38 UTC |
| 8162401 | Junio C Hamano | 06 July 2016, 20:06:38 UTC | Merge branch 'vs/prompt-avoid-unset-variable' into maint The git-prompt scriptlet (in contrib/) was not friendly with those who uses "set -u", which has been fixed. * vs/prompt-avoid-unset-variable: git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha | 06 July 2016, 20:06:38 UTC |
| 7949837 | Junio C Hamano | 06 July 2016, 20:06:37 UTC | Merge branch 'sg/reflog-past-root' into maint "git reflog" stopped upon seeing an entry that denotes a branch creation event (aka "unborn"), which made it appear as if the reflog was truncated. * sg/reflog-past-root: reflog: continue walking the reflog past root commits | 06 July 2016, 20:06:37 UTC |
| 17eb7a7 | Junio C Hamano | 06 July 2016, 20:06:36 UTC | Merge branch 'dn/gpg-doc' into maint The documentation tries to consistently spell "GPG"; when referring to the specific program name, "gpg" is used. * dn/gpg-doc: Documentation: GPG capitalization | 06 July 2016, 20:06:36 UTC |
| 7f223b1 | Junio C Hamano | 06 July 2016, 20:06:35 UTC | Merge branch 'ap/git-svn-propset-doc' into maint "git svn propset" subcommand that was added in 2.3 days is documented now. * ap/git-svn-propset-doc: git-svn: document the 'git svn propset' command | 06 July 2016, 20:06:35 UTC |
| 073d0b0 | Junio C Hamano | 06 July 2016, 20:06:34 UTC | Merge branch 'tr/doc-tt' into maint The documentation set has been updated so that literal commands, configuration variables and environment variables are consistently typeset in fixed-width font and bold in manpages. * tr/doc-tt: doc: change configuration variables format doc: more consistency in environment variables format doc: change environment variables format doc: clearer rule about formatting literals | 06 July 2016, 20:06:34 UTC |
| c578a09 | Armin Kunaschik | 02 July 2016, 19:01:51 UTC | t7610: test for mktemp before test execution mktemp is not available on all platforms, so the test 'temporary filenames are used with mergetool.writeToTemp' fails there. This patch does not replace mktemp but just disables the test that otherwise would fail. mergetool checks itself before executing mktemp and reports an error. Signed-off-by: Armin Kunaschik <megabreit@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2016, 19:18:09 UTC |
| 4df7c8a | Jeff King | 01 July 2016, 07:59:44 UTC | Makefile: use VCSSVN_LIB to refer to svn library We have an abstracted variable; let's use it consistently. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2016, 18:51:03 UTC |
| 1be36b6 | Jeff King | 01 July 2016, 07:56:52 UTC | Makefile: drop extra dependencies for test helpers A few test-helpers have Makefile dependencies on specific object files. But since these files are part of libgit.a (which all of the helpers link against), the inclusion is simply redundant. These were once necessary, but became redundant due to 5c5ba73 (Makefile: Use generic rule to build test programs, 2007-05-31), which added the $(GITLIBS) dependency (but didn't prune the extra dependency lines). Later commits then cargo-culted the practice (e.g., b4285c7). Note that we _do_ need to leave the dependencies on the svn library, as that is not part of the usual link command. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2016, 18:50:48 UTC |
| a199a7c | David Turner | 04 July 2016, 06:05:24 UTC | mailmap: use main email address for dturner Signed-off-by: David Turner <novalis@novalis.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2016, 17:57:01 UTC |
| 03c39b3 | Jeff King | 24 June 2016, 19:45:12 UTC | t/lib-git-daemon: use test_match_signal When git-daemon exits, we expect it to be with the SIGTERM we just sent it. If we see anything else, we'll complain. But our check against exit code "143" is not portable. For example: $ ksh93 t5570-git-daemon.sh [...] error: git daemon exited with status: 271 We can fix this by using test_match_signal. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2016, 14:44:25 UTC |
| 2472448 | Jeff King | 24 June 2016, 19:45:04 UTC | test_must_fail: use test_match_signal In 8bf4bec (add "ok=sigpipe" to test_must_fail and use it to fix flaky tests, 2015-11-27), test_must_fail learned to recognize "141" as a sigpipe failure. However, testing for a signal is more complicated than that; we should use test_match_signal to implement more portable checking. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2016, 14:44:25 UTC |
| 6f5f9d7 | Jeff King | 24 June 2016, 19:44:50 UTC | t0005: use test_match_signal as appropriate The first test already uses this more portable construct (that was where it was factored from initially), but the later tests do a raw comparison against 141 to look for SIGPIPE, which can fail on some shells and platforms. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2016, 14:44:25 UTC |
| 9b67c99 | Jeff King | 30 June 2016, 08:16:18 UTC | tests: factor portable signal check out of t0005 In POSIX shells, a program which exits due to a signal generally has an exit code of 128 plus the signal number. However, ksh uses 256 plus the signal number. We've accounted for that in t0005, but not in other tests. Let's pull out the logic so we can use it elsewhere. It would be nice for debugging if this additionally printed errors to stderr, like our other test_* helpers. But we're going to need to use it in other places besides the innards of a test_expect block. So let's leave it as generic as possible. Note that we also leave the magic "3" for Windows out of the generic helper. This is an artifact of the way we use raise() to kill ourselves in test-sigchain.c, and will not necessarily apply to all programs. So it's better to keep it out of the helper, to reduce the chance of confusing it with a real call to exit(3). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 July 2016, 14:43:29 UTC |
| b8e47d1 | Charles Bailey | 30 June 2016, 10:13:48 UTC | grep: fix grepping for "intent to add" files This reverts commit 4d5520053 (grep: make it clear i-t-a entries are ignored, 2015-12-27) and adds an alternative fix to maintain the -L --cached behavior. 4d5520053 caused 'git grep' to no longer find matches in new files in the working tree where the corresponding index entry had the "intent to add" bit set, despite the fact that these files are tracked. The content in the index of a file for which the "intent to add" bit is set is considered indeterminate and not empty. For most grep queries we want these to behave the same, however for -L --cached (files without a match) we don't want to respond positively for "intent to add" files as their contents are indeterminate. This is in contrast to files with empty contents in the index (no lines implies no matches for any grep query expression) which should be reported in the output of a grep -L --cached invocation. Add tests to cover this case and a few related cases which previously lacked coverage. Helped-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Charles Bailey <cbailey32@bloomberg.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 July 2016, 20:27:41 UTC |
| 89e6410 | Charles Bailey | 30 June 2016, 10:13:47 UTC | t7810-grep.sh: fix a whitespace inconsistency Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 July 2016, 20:27:38 UTC |
| 878452b | Charles Bailey | 30 June 2016, 10:13:46 UTC | t7810-grep.sh: fix duplicated test name Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 July 2016, 20:26:30 UTC |
| 5e5be9e | Lukas Fleischer | 28 June 2016, 04:35:26 UTC | sideband.c: refactor recv_sideband() We used character buffer manipulations to split messages from the sideband at line breaks and insert "remote: " at the beginning of each line, using the packet size to determine the end of a message. However, since it is safe to assume that diagnostic messages from the sideband never contain NUL characters, we can also NUL-terminate the buffer, use strpbrk() for splitting lines and use format strings to insert the prefix, to make the code easier to read and maintain. A strbuf is used for accumulating the output which is then printed using a single write(2) call to ensure the atomicity of the output. See 9ac13ec (atomic write for sideband remote messages, 2006-10-11) for details. Helped-by: Jeff King <peff@peff.net> Helped-by: Junio C Hamano <gitster@pobox.com> Helped-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Lukas Fleischer <lfleischer@lfos.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 July 2016, 20:09:37 UTC |
| 695f95b | Nguyễn Thái Ngọc Duy | 25 June 2016, 05:22:38 UTC | grep.c: reuse "icase" variable Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 July 2016, 19:44:57 UTC |
| b51a9c1 | Nguyễn Thái Ngọc Duy | 25 June 2016, 05:22:37 UTC | diffcore-pickaxe: support case insensitive match on non-ascii Similar to the "grep -F -i" case, we can't use kws on icase search outside ascii range, so we quote the string and pass it to regcomp as a basic regexp and let regex engine deal with case sensitivity. The new test is put in t7812 instead of t4209-log-pickaxe because lib-gettext.sh might cause problems elsewhere, probably. Noticed-by: Plamen Totev <plamen.totev@abv.bg> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 July 2016, 19:44:57 UTC |
| 3d5b23a | Nguyễn Thái Ngọc Duy | 25 June 2016, 05:22:36 UTC | diffcore-pickaxe: Add regcomp_or_die() There's another regcomp code block coming in this function that needs the same error handling. This function can help avoid duplicating error handling code. Helped-by: Jeff King <peff@peff.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 July 2016, 19:44:57 UTC |
| 18547aa | Nguyễn Thái Ngọc Duy | 25 June 2016, 05:22:35 UTC | grep/pcre: support utf-8 In the previous change in this function, we add locale support for single-byte encodings only. It looks like pcre only supports utf-* as multibyte encodings, the others are left in the cold (which is fine). We need to enable PCRE_UTF8 so pcre can find character boundary correctly. It's needed for case folding (when --ignore-case is used) or '*', '+' or similar syntax is used. The "has_non_ascii()" check is to be on the conservative side. If there's non-ascii in the pattern, the searched content could still be in utf-8, but we can treat it just like a byte stream and everything should work. If we force utf-8 based on locale only and pcre validates utf-8 and the file content is in non-utf8 encoding, things break. Noticed-by: Plamen Totev <plamen.totev@abv.bg> Helped-by: Plamen Totev <plamen.totev@abv.bg> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 July 2016, 19:44:57 UTC |
| e8c1672 | Nguyễn Thái Ngọc Duy | 25 June 2016, 05:22:34 UTC | gettext: add is_utf8_locale() This function returns true if git is running under an UTF-8 locale. pcre in the next patch will need this. is_encoding_utf8() is used instead of strcmp() to catch both "utf-8" and "utf8" suffixes. When built with no gettext support, we peek in several env variables to detect UTF-8. pcre library might support utf-8 even if libc is built without locale support.. The peeking code is a copy from compat/regex/regcomp.c Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 July 2016, 19:44:57 UTC |
| 9d9babb | Nguyễn Thái Ngọc Duy | 25 June 2016, 05:22:33 UTC | grep/pcre: prepare locale-dependent tables for icase matching The default tables are usually built with C locale and only suitable for LANG=C or similar. This should make case insensitive search work correctly for all single-byte charsets. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 July 2016, 19:44:57 UTC |
| e944d9d | Nguyễn Thái Ngọc Duy | 25 June 2016, 05:22:32 UTC | grep: rewrite an if/else condition to avoid duplicate expression "!icase || ascii_only" is repeated twice in this if/else chain as this series evolves. Rewrite it (and basically revert the first if condition back to before the "grep: break down an "if" stmt..." commit). Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 July 2016, 19:44:57 UTC |
| 793dc67 | Nguyễn Thái Ngọc Duy | 25 June 2016, 05:22:31 UTC | grep/icase: avoid kwsset when -F is specified Similar to the previous commit, we can't use kws on icase search outside ascii range. But we can't simply pass the pattern to regcomp/pcre like the previous commit because it may contain regex special characters, so we need to quote the regex first. To avoid misquote traps that could lead to undefined behavior, we always stick to basic regex engine in this case. We don't need fancy features for grepping a literal string anyway. basic_regex_quote_buf() assumes that if the pattern is in a multibyte encoding, ascii chars must be unambiguously encoded as single bytes. This is true at least for UTF-8. For others, let's wait until people yell up. Chances are nobody uses multibyte, non utf-8 charsets anymore. Noticed-by: Plamen Totev <plamen.totev@abv.bg> Helped-by: René Scharfe <l.s.r@web.de> Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 July 2016, 19:44:30 UTC |
| 3324dd8 | Johannes Schindelin | 29 June 2016, 14:14:54 UTC | commit -S: avoid invalid pointer with empty message While it is not recommended, fsck.c says: Not having a body is not a crime [...] ... which means that we cannot assume that the commit buffer contains an empty line to separate header from body. A commit object with only a header without any body, not even without a blank line after the header, is valid. So let's tread carefully here. strstr("\n\n") may find nothing and return NULL. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 June 2016, 22:07:02 UTC |
| 054a5ae | Johannes Schindelin | 29 June 2016, 14:14:50 UTC | reset --hard: skip blank lines when reporting the commit subject When there are blank lines at the beginning of a commit message, the pretty printing machinery already skips them when showing a commit subject (or the complete commit message). We shall henceforth do the same when reporting the commit subject after the user called git reset --hard <commit> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 June 2016, 22:03:36 UTC |
| 88ef402 | Johannes Schindelin | 29 June 2016, 14:14:46 UTC | sequencer: use skip_blank_lines() to find the commit subject Just like we already taught the find_commit_subject() function (to make it consistent with the code in pretty.c), we now simply skip leading blank lines of the commit message. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 June 2016, 22:03:06 UTC |
| 84e213a | Johannes Schindelin | 29 June 2016, 14:14:42 UTC | commit -C: skip blank lines at the beginning of the message Consistent with the pretty-printing machinery, we skip leading blank lines (if any) of existing commit messages. While Git itself only produces commit objects with a single empty line between commit header and commit message, it is legal to have more than one blank line (i.e. lines containing only white space, or no characters) at the beginning of the commit message, and the pretty-printing code already handles that. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 June 2016, 21:56:37 UTC |
| fa90ab4 | Johannes Schindelin | 29 June 2016, 14:31:03 UTC | t3404: fix a grammo (commands are ran -> commands are run) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 June 2016, 19:43:44 UTC |
| 33ba9c6 | Patrick Steinhardt | 29 June 2016, 06:21:27 UTC | rebase -i: restore autostash on abort When we abort an interactive rebase we do so by calling `die_abort`, which cleans up after us by removing the rebase state directory. If the user has requested to use the autostash feature, though, the state directory may also contain a reference to the autostash, which will now be deleted. Fix the issue by trying to re-apply the autostash in `die_abort`. This will also handle the case where the autostash does not apply cleanly anymore by recording it in a user-visible stash. Reported-by: Daniel Hahler <git@thequod.de> Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 June 2016, 16:51:00 UTC |
| 5f35900 | David A. Greene | 28 June 2016, 10:54:02 UTC | contrib/subtree: Add a test for subtree rebase that loses commits This test merges an external tree in as a subtree, makes some commits on top of it and splits it back out. In the process the added commits are lost or the rebase aborts with an internal error. The tests are marked to expect failure so that we don't forget to fix it. Signed-off-by: David A. Greene <greened@obbligato.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2016, 16:21:28 UTC |
| 3d0a833 | Johannes Schindelin | 28 June 2016, 10:02:49 UTC | color.h: remove obsolete comment about limitations on Windows Originally, ANSI color sequences were supported on Windows only by overriding the printf() and fprintf() functions, as mentioned in e7821d7 (Add a notice that only certain functions can print color escape codes, 2009-11-27). As of eac14f8 (Win32: Thread-safe windows console output, 2012-01-14), however, this is no longer the case, as the ANSI color sequence support code needed to be replaced with a thread-safe version, one side effect being that stdout and stderr handled no matter which function is used to write to it. So let's just remove the comment that is now obsolete. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2016, 16:18:50 UTC |
| 661c3e9 | Matthieu Moy | 28 June 2016, 11:40:15 UTC | doc: typeset HEAD and variants as literal This is an application of the newly added CodingGuidelines to HEAD and variants like FETCH_HEAD. It was obtained with: perl -pi -e "s/'([A-Z_]*HEAD)'/\`\$1\`/g" *.txt Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2016, 15:36:45 UTC |
| 57103db | Matthieu Moy | 28 June 2016, 11:40:14 UTC | CodingGuidelines: formatting HEAD in documentation The current practice is: git/Documentation$ git grep "'HEAD'" | wc -l 24 git/Documentation$ git grep "\`HEAD\`" | wc -l 66 Let's adopt the majority as a guideline. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2016, 15:36:45 UTC |
| bb72e10 | Matthieu Moy | 28 June 2016, 11:40:13 UTC | doc: typeset long options with argument as literal We previously reformatted '--option' to `--option`. This patch reformats '--option <arg>' to `--option <arg>`. Obtained with: perl -pi -e "s/'(--[a-z][a-z=<>-]* <[^>]*>)'/\`\$1\`/g" *.txt Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2016, 15:36:45 UTC |
| 04b125d | Matthieu Moy | 28 June 2016, 11:40:12 UTC | doc: typeset '--' as literal This was obtained with: perl -pi -e "s/'--'/\`--\`/g" *.txt Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2016, 15:36:45 UTC |
| bcf9626 | Matthieu Moy | 28 June 2016, 11:40:11 UTC | doc: typeset long command-line options as literal Similarly to the previous commit, use backquotes instead of forward-quotes, for long options. This was obtained with: perl -pi -e "s/'(--[a-z][a-z=<>-]*)'/\`\$1\`/g" *.txt and manual tweak to remove false positive in ascii-art (o'--o'--o' to describe rewritten history). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2016, 15:36:45 UTC |
| 23f8239 | Matthieu Moy | 28 June 2016, 11:40:10 UTC | doc: typeset short command-line options as literal It was common in our documentation to surround short option names with forward quotes, which renders as italic in HTML. Instead, use backquotes which renders as monospace. This is one more step toward conformance to Documentation/CodingGuidelines. This was obtained with: perl -pi -e "s/'(-[a-z])'/\`\$1\`/g" *.txt Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2016, 15:20:52 UTC |
| 46e22b7 | Matthieu Moy | 28 June 2016, 11:40:09 UTC | Documentation/git-mv.txt: fix whitespace indentation Replace spaces with tabs to avoid a warning when further patches change these lines. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 June 2016, 15:20:52 UTC |
| 2ff7dff | Junio C Hamano | 27 June 2016, 16:59:51 UTC | Start preparing for 2.9.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2016, 16:59:51 UTC |
| fda65fa | Junio C Hamano | 27 June 2016, 16:56:24 UTC | Merge branch 'rs/xdiff-hunk-with-func-line' into maint "git show -W" (extend hunks to cover the entire function, delimited by lines that match the "funcname" pattern) used to show the entire file when a change added an entire function at the end of the file, which has been fixed. * rs/xdiff-hunk-with-func-line: xdiff: fix merging of appended hunk with -W grep: -W: don't extend context to trailing empty lines t7810: add test for grep -W and trailing empty context lines xdiff: don't trim common tail with -W xdiff: -W: don't include common trailing empty lines in context xdiff: ignore empty lines before added functions with -W xdiff: handle appended chunks better with -W xdiff: factor out match_func_rec() t4051: rewrite, add more tests | 27 June 2016, 16:56:24 UTC |
| df5a925 | Junio C Hamano | 27 June 2016, 16:56:24 UTC | Merge branch 'jk/rev-list-count-with-bitmap' into maint "git rev-list --count" whose walk-length is limited with "-n" option did not work well with the counting optimized to look at the bitmap index. * jk/rev-list-count-with-bitmap: rev-list: disable bitmaps when "-n" is used with listing objects rev-list: "adjust" results of "--count --use-bitmap-index -n" | 27 June 2016, 16:56:24 UTC |
| fbb4138 | Junio C Hamano | 27 June 2016, 16:56:23 UTC | Merge branch 'et/pretty-format-c-auto' into maint The commands in `git log` family take %C(auto) in a custom format string. This unconditionally turned the color on, ignoring --no-color or with --color=auto when the output is not connected to a tty; this was corrected to make the format truly behave as "auto". * et/pretty-format-c-auto: format_commit_message: honor `color=auto` for `%C(auto)` | 27 June 2016, 16:56:23 UTC |
| 0a20325 | Junio C Hamano | 27 June 2016, 16:56:22 UTC | Merge branch 'ew/daemon-socket-keepalive' into maint When "git daemon" is run without --[init-]timeout specified, a connection from a client that silently goes offline can hang around for a long time, wasting resources. The socket-level KEEPALIVE has been enabled to allow the OS to notice such failed connections. * ew/daemon-socket-keepalive: daemon: enable SO_KEEPALIVE for all sockets | 27 June 2016, 16:56:22 UTC |
| ef1cf01 | Eric Wong | 26 June 2016, 23:21:12 UTC | xwrite: poll on non-blocking FDs write(2) can hit the same EAGAIN/EWOULDBLOCK errors as read(2), so busy-looping on a non-blocking FD is a waste of resources. Currently, I do not know of a way for this happen: * the NonBlocking directive in systemd does not apply to stdin, stdout, or stderr. * xinetd provides no way to set the non-blocking flag at all But theoretically, it's possible a careless C10K HTTP server could use pipe2(..., O_NONBLOCK) to setup a pipe for git-http-backend with only the intent to use non-blocking reads; but accidentally leave non-blocking set on the write end passed as stdout to git-upload-pack. Followup-to: 1079c4be0b720 ("xread: poll on non blocking fds") Signed-off-by: Eric Wong <e@80x24.org> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2016, 15:34:15 UTC |
| c22f620 | Eric Wong | 27 June 2016, 03:56:35 UTC | xread: retry after poll on EAGAIN/EWOULDBLOCK We should continue to loop after EAGAIN/EWOULDBLOCK as the intent of xread is to try until there is available data, EOF, or an unrecoverable error. Fixes: 1079c4be0b720 ("xread: poll on non blocking fds") Signed-off-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2016, 15:33:21 UTC |
| c2691e2 | Alex Henrie | 25 June 2016, 06:34:04 UTC | unpack-trees: fix English grammar in do-this-before-that messages Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2016, 15:29:36 UTC |
| 5f4e3bf | Eric Wong | 25 June 2016, 06:46:47 UTC | gc: fix off-by-one error with gc.autoPackLimit This matches the documentation and allows gc.autoPackLimit=1 to maintain a single pack without attempting a repack on every "git gc --auto" invocation. Signed-off-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2016, 15:28:47 UTC |
| 5c1ebcc | Nguyễn Thái Ngọc Duy | 25 June 2016, 05:22:30 UTC | grep/icase: avoid kwsset on literal non-ascii strings When we detect the pattern is just a literal string, we avoid heavy regex engine and use fast substring search implemented in kwsset.c. But kws uses git-ctype which is locale-independent so it does not know how to fold case properly outside ascii range. Let regcomp or pcre take care of this case instead. Slower, but accurate. Noticed-by: Plamen Totev <plamen.totev@abv.bg> Helped-by: René Scharfe <l.s.r@web.de> Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2016, 14:31:35 UTC |
| d8acfe1 | Nguyễn Thái Ngọc Duy | 25 June 2016, 05:22:29 UTC | test-regex: expose full regcomp() to the command line Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2016, 14:31:35 UTC |
| 949782d | Nguyễn Thái Ngọc Duy | 25 June 2016, 05:22:28 UTC | test-regex: isolate the bug test code This is in preparation to turn test-regex into some generic regex testing command. Helped-by: Eric Sunshine <sunshine@sunshineco.com> Helped-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2016, 14:31:35 UTC |
| 60452a3 | Nguyễn Thái Ngọc Duy | 25 June 2016, 05:22:27 UTC | grep: break down an "if" stmt in preparation for next changes Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2016, 14:31:35 UTC |
| 82f6178 | Nguyễn Thái Ngọc Duy | 25 June 2016, 13:55:14 UTC | new-command.txt: correct the command description file It has always been command-list.txt even at the time this new-command.txt document is added. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 June 2016, 13:11:57 UTC |
| 412b9a1 | Johannes Schindelin | 18 June 2016, 10:49:11 UTC | t2300: "git --exec-path" is not usable in $PATH on Windows as-is The "git" command prepends the exec-path to the PATH environment variable for processes it spawns. That is how ". git-sh-setup" in our scripted Porcelains can find the dot-sourced file in the exec-path location that is not usually on user's PATH. When t2300 runs, because it is not spawned by the "git" command, the scriptlet being tested did not run with a realistic setting of PATH environment. It lacked the exec-path on the PATH, and failed to find the dot-sourced file. A recent update to t2300 attempted to fix this, with "PATH=$(git --exec-path):$PATH", which has been the recommended way around v1.6.0 days (a script whose original was written before that release that survives to this day is likely to have such a line). However, the "git --exec-path" command outputs C:\path\to\exec\dir (not /c/path/to/exec/dir) on Windows; the recent update failed to consider the problem that comes from it. Even though Git itself, when doing the equivalent internally, does so in a platform native way (i.e. on Windows, C:\path\to\exec\dir is prepended to the existing value of %PATH% using ';' as a component separator), the result is further massaged by bash and gets turned into $PATH that uses /c/path/to/exec/dir with ':' separating the components, which is the form understood by bash, so scripted Porcelains find commands from PATH correctly. An end user script written in shell, however, cannot prepend "C:\path\to\exec\dir:" to the existing value of $PATH and expect bash to magically turn it into the form it understands. In other words, "PATH=$(git --exec-path):$PATH" does not work as an emulation of what "Git" internally does to the PATH on Windows. To correctly emulate how exec-path is prepended to the PATH environment internally on Windows, we'd need to convert C:\git-sdk-64\usr\src\git to at least /c\git-sdk-64\usr\src\git ourselves before prepending it to PATH. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 June 2016, 21:47:36 UTC |
| 4e1b06d | Johannes Schindelin | 22 June 2016, 20:20:20 UTC | commit.c: make find_commit_subject() more robust Just like the pretty printing machinery, we should simply ignore blank lines at the beginning of the commit messages. This discrepancy was noticed when an early version of the rebase--helper produced commit objects with more than one empty line between the header and the commit message. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 June 2016, 20:24:17 UTC |
| 7735612 | Johannes Schindelin | 22 June 2016, 20:20:16 UTC | pretty: make the skip_blank_lines() function public This function will be used also in the find_commit_subject() function. While at it, rename the function to reflect that it skips not only empty lines, but any lines consisting of only whitespace, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 June 2016, 20:23:56 UTC |
| f793582 | Jonathan Nieder | 22 June 2016, 17:38:25 UTC | doc: git-htmldocs.googlecode.com is no more http://git-htmldocs.googlecode.com/git/git.html says There was no service found for the uri requested. Link to the rendered documentation on Jekyll instead. Reported-by: Andrea Stacchiotti <andreastacchiotti@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 June 2016, 19:37:33 UTC |
| 09667d0 | Andrew Oakley | 22 June 2016, 09:26:11 UTC | git-p4: correct hasBranchPrefix verbose output The logic here was inverted, you got a message saying the file is ignored for each file that is not ignored. Signed-off-by: Andrew Oakley <aoakley@roku.com> Acked-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 June 2016, 16:45:15 UTC |
| fe0537a | Charles Bailey | 21 June 2016, 21:14:11 UTC | t7810: fix duplicated test title Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 June 2016, 22:33:34 UTC |
| 5819c2e | Stefan Beller | 20 June 2016, 17:21:18 UTC | t5614: don't use subshells Using a subshell for just one git command is both a waste in compute overhead (create a new process) as well as in line count. Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 June 2016, 19:08:38 UTC |
| d2addc3 | Armin Kunaschik | 31 May 2016, 00:26:12 UTC | t7800: readlink may not be available The readlink(1) command is not available on all platforms (notably not on AIX and HP-UX) and can be replaced in this test with the "workaround" ls -ld <name> | sed -e 's/.* -> //' This is no universal readlink replacement but works in the controlled test environment well enough. Signed-off-by: Armin Kunaschik <megabreit@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 June 2016, 18:41:31 UTC |
| e3efa94 | Johannes Schindelin | 21 June 2016, 13:53:43 UTC | perf: accommodate for MacOSX As this developer has no access to MacOSX developer setups anymore, Travis becomes the best bet to run performance tests on that OS. However, on MacOSX /usr/bin/time is that good old BSD executable that no Linux user cares about, as demonstrated by the perf-lib.sh's use of GNU-ish extensions. And by the hard-coded path. Let's just work around this issue by using gtime on MacOSX, the Homebrew-provided GNU implementation onto which pretty much every MacOSX power user falls back anyway. To help other developers use Travis to run performance tests on MacOSX, the .travis.yml file now sports a commented-out line that installs GNU time via Homebrew. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 June 2016, 18:18:17 UTC |
| bab7483 | Jeff King | 20 June 2016, 21:14:14 UTC | local_tzoffset: detect errors from tm_to_time_t When we want to know the local timezone offset at a given timestamp, we compute it by asking for localtime() at the given time, and comparing the offset to GMT at that time. However, there's some juggling between time_t and "struct tm" which happens, which involves calling our own tm_to_time_t(). If that function returns an error (e.g., because it only handles dates up to the year 2099), it returns "-1", which we treat as a time_t, and is clearly bogus, leading to bizarre timestamps (that seem to always adjust the time back to (time_t)(uint32_t)-1, in the year 2106). It's not a good idea for local_tzoffset() to simply die here; it would make it hard to run "git log" on a repository with funny timestamps. Instead, let's just treat such cases as "zero offset". Reported-by: Norbert Kiesel <nkiesel@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 June 2016, 22:08:07 UTC |
| 36d6792 | Jeff King | 20 June 2016, 21:11:59 UTC | t0006: test various date formats We ended up testing some of these date formats throughout the rest of the suite (e.g., via for-each-ref's "$(authordate:...)" format), but we never did so systematically. t0006 is the right place for unit-testing of our date-handling code. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 June 2016, 22:08:07 UTC |
| fdba2cd | Jeff King | 20 June 2016, 21:10:29 UTC | t0006: rename test-date's "show" to "relative" The "show" tests are really only checking relative formats; we should make that more clear. This also frees up the "show" name to later check other formats. We could later fold "relative" into a more generic "show" command, but it's not worth it. Relative times are a special case already because we have to munge the concept of "now" in our tests. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 June 2016, 22:08:07 UTC |
| 0767172 | Johannes Schindelin | 18 June 2016, 12:38:36 UTC | mingw: let the build succeed with DEVELOPER=1 The recently introduced developer flags identified a couple of old-style function declarations in the Windows-specific code where the parameter list was left empty instead of specifying "void" explicitly. Let's just fix them. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 June 2016, 19:12:12 UTC |
| 18a74a0 | Junio C Hamano | 19 June 2016, 20:51:56 UTC | clone: do not let --depth imply --shallow-submodules In v2.9.0, we prematurely flipped the default to force cloning submodules shallowly, when the superproject is getting cloned shallowly. This is likely to fail when the upstream repositories submodules are cloned from a repository that is not prepared to serve histories that ends at a commit that is not at the tip of a branch, and we know the world is not yet ready. Use a safer default to clone the submodules fully, unless the user tells us that she knows that the upstream repository of the submodules are willing to cooperate with "--shallow-submodules" option. Noticed-by: Vadim Eisenberg <VADIME@il.ibm.com> Helped-by: Jeff King <peff@peff.net> Helped-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 June 2016, 18:35:28 UTC |
| 01247e0 | LE Manh Cuong | 18 June 2016, 20:26:03 UTC | sh-setup: enclose setting of ${VAR=default} in double-quotes We often make sure an environment variable is set to something, either set by the user (in which case we do not molest it) or set it to our default value (otherwise), with : ${VAR=default value} i.e. running the no-op command ":" with ${VAR} as its parameters (or the default value we supply), relying on that ":" is a no-op. This pattern, even though it is no-op from correctness point of view, still can be expensive if the existing value in VAR has shell glob (because they will be expanded against filesystem entities) and IFS whitespaces (because the value need to be split into multiple parameters). Our invocation of ":" command does not care if the parameter given to it is after the value in VAR goes through these processing. Enclosing the whole thing in double-quote, i.e. : "${VAR=default value}" avoids paying the unnecessary cost, so let's do so. Signed-off-by: LE Manh Cuong <cuong.manhle.vn@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 June 2016, 21:07:04 UTC |
| cc6ee97 | Michael J Gruber | 17 June 2016, 07:46:11 UTC | Documentation/technical: signed merge tag format Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 June 2016, 19:10:48 UTC |
| eda2f11 | Michael J Gruber | 17 June 2016, 07:46:10 UTC | Documentation/technical: signed commit format Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 June 2016, 19:10:30 UTC |
| 5f1abfe | Michael J Gruber | 17 June 2016, 07:46:09 UTC | Documentation/technical: signed tag format Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 June 2016, 18:40:58 UTC |
| 76f9d8b | Michael J Gruber | 17 June 2016, 07:46:08 UTC | Documentation/technical: describe signature formats We use different types of signature formats in different places. Set up the infrastructure and overview to describe them systematically in our technical documentation. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 June 2016, 18:39:05 UTC |
| 9b35cad | Ed Maste | 17 June 2016, 15:33:29 UTC | rebase: update comment about FreeBSD /bin/sh Commit 9f50d32 introduced a fix for FreeBSD /bin/sh misbehaviour when dot-sourcing a file containing "return" statements outside of any function, from a function in another shell script. That issue affects FreeBSD 9.x, and is not present in the /bin/sh in FreeBSD 10.3 and later. Update the comment to clarify this. The example from 9f50d32's commit message produces the expected output on FreeBSD 10.3 and -CURRENT (the upcoming 11.0): % sh script1.sh only this line should show % Signed-off-by: Ed Maste <emaste@freebsd.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 June 2016, 18:04:38 UTC |
| bc91316 | Dave Nicolson | 16 June 2016, 22:15:44 UTC | Documentation: GPG capitalization When "GPG" is used in a sentence it is now consistently capitalized. When referring to the binary it is left as "gpg". Signed-off-by: David Nicolson <david.nicolson@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 June 2016, 00:32:28 UTC |
| 43ec550 | Jeff King | 16 June 2016, 23:37:20 UTC | bisect: always call setup_revisions after init_revisions init_revisions() initializes the rev_info struct to default values, and setup_revisions() parses any command-line arguments and finalizes the struct. In e22278c (bisect: display first bad commit without forking a new process, 2009-05-28), a show_diff_tree() was added that calls the former but not the latter. It doesn't have any arguments to parse, but it still should do the finalizing step. This may have caused other minor bugs over the years, but it became much more prominent after fe37a9c (pretty: allow tweaking tabwidth in --expand-tabs, 2016-03-29). That leaves the expected tab width as "-1", rather than the true default of "8". When we see a commit with tabs to be expanded, we end up trying to add (size_t)-1 spaces to a strbuf, which complains about the integer overflow. The fix is easy: just call setup_revisions() with no arguments. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 June 2016, 00:21:48 UTC |
| 066790d | Nguyễn Thái Ngọc Duy | 16 June 2016, 13:18:38 UTC | pretty.c: support <direction>|(<negative number>) forms %>|(num), %><|(num) and %<|(num), where num is a positive number, sets a fixed column from the screen's left border. There is no way for us to specifiy a column relative to the right border, which is useful when you want to make use of all terminal space (on big screens). Use negative num for that. Inspired by Go's array syntax (*). (*) I know Python has this first (or before Go, at least) but the idea didn't occur to me until I learned Go. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 June 2016, 18:43:37 UTC |
| 3ad87c8 | Josef Kufner | 16 June 2016, 13:18:37 UTC | pretty: pass graph width to pretty formatting for use in '%>|(N)' Pass graph width to pretty formatting, to make N in '%>|(N)' include columns consumed by graph rendered when --graph option is in use. For example, in the output of git log --all --graph --pretty='format: [%>|(20)%h] %ar%d' this change will make all commit hashes align at 20th column from the edge of the terminal, not from the edge of the graph. Signed-off-by: Josef Kufner <josef@kufner.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 June 2016, 18:43:36 UTC |
| fcf0fe9 | Lukas Fleischer | 14 June 2016, 14:49:17 UTC | upload-pack.c: make send_client_data() return void The send_client_data() function uses write_or_die() for writing data which immediately terminates the process on errors. If no such error occurred, send_client_data() always returned the value that was passed as third parameter prior to this commit. This value is already known to the caller in any case, so let's turn send_client_data() into a void function instead. Signed-off-by: Lukas Fleischer <lfleischer@lfos.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 June 2016, 18:40:31 UTC |
| 4c4b7d1 | Lukas Fleischer | 14 June 2016, 14:49:16 UTC | sideband.c: make send_sideband() return void The send_sideband() function uses write_or_die() for writing data which immediately terminates the process on errors. If no such error occurred, send_sideband() always returned the value that was passed as fourth parameter prior to this commit. This value is already known to the caller in any case, so let's turn send_sideband() into a void function instead. Signed-off-by: Lukas Fleischer <lfleischer@lfos.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 June 2016, 18:40:19 UTC |
| 46e3d17 | Jeff King | 16 June 2016, 12:27:29 UTC | add--interactive: respect diff.compactionHeuristic We use plumbing to generate the diff, so it doesn't automatically pick up UI config like compactionHeuristic. Let's forward it on, since interactive adding is porcelain. Note that we only need to handle the "true" case. There's no point in passing --no-compaction-heuristic when the variable is false, since nothing else could have turned it on. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 June 2016, 18:38:58 UTC |
| 19a7f24 | Alfred Perlstein | 15 June 2016, 05:19:50 UTC | git-svn: document the 'git svn propset' command Add example usage to the git-svn documentation. Reported-by: Joseph Pecoraro <pecoraro@apple.com> Signed-off-by: Alfred Perlstein <alfred@freebsd.org> Reviewed-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 June 2016, 20:21:11 UTC |
| 31da121 | Junio C Hamano | 14 June 2016, 20:38:14 UTC | blame, line-log: do not loop around deref_tag() These callers appear to expect that deref_tag() is to peel one layer of a tag, but the function does not work that way; it has its own loop to unwrap tags until an object that is not a tag appears. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 June 2016, 20:38:14 UTC |
| 3cddb00 | Heiko Becker | 14 June 2016, 11:27:05 UTC | gnome-keyring: Don't hard-code pkg-config executable Helpful if your pkg-config executable has a prefix based on the architecture, for example. Signed-off-by: Heiko Becker <heirecka@exherbo.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 June 2016, 20:06:10 UTC |
| b7410f6 | Keith McGuigan | 14 June 2016, 18:28:56 UTC | builtin/fetch.c: don't free remote->name after fetch Make fetch's string_list of remote names own all of its string items (strdup'ing when necessary) so that it can deallocate them safely when clearing. Signed-off-by: Keith McGuigan <kmcguigan@twopensource.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 June 2016, 18:58:05 UTC |
| ed008d7 | Pranit Bauva | 14 June 2016, 06:14:11 UTC | strbuf: describe the return value of strbuf_read_file Mentored-by: Lars Schneider <larsxschneider@gmail.com> Mentored-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 June 2016, 17:57:21 UTC |
| 9e70233 | Jeff King | 13 June 2016, 23:58:51 UTC | fetch: document that pruning happens before fetching This was changed in 10a6cc8 (fetch --prune: Run prune before fetching, 2014-01-02), but it seems that nobody in that discussion realized we were advertising the "after" explicitly. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 June 2016, 17:56:27 UTC |
| 05219a1 | Junio C Hamano | 13 June 2016, 17:42:13 UTC | Git 2.9 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 June 2016, 17:42:13 UTC |
| 25c7aeb | Junio C Hamano | 13 June 2016, 01:00:57 UTC | Merge tag 'l10n-2.9.0-rc0' of git://github.com/git-l10n/git-po l10n-2.9.0-rc0 * tag 'l10n-2.9.0-rc0' of git://github.com/git-l10n/git-po: l10n: ko.po: Update Korean translation l10n: ru.po: update Russian translation l10n: de.po: translate 104 new messages l10n: zh_CN: review for git v2.9.0 l10n round 1 l10n: zh_CN: for git v2.9.0 l10n round 1 l10n: pt_PT: update Portuguese translation l10n: pt_PT: update according to git-gui glossary l10n: pt_PT: merge git.pot file l10n: Updated Bulgarian translation of git (2597t,0f,0u) l10n: sv.po: Update Swedish translation (2597t0f0u) l10n: fr.po v2.9.0rnd1 l10n: Updated Vietnamese translation (2597t) l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed) l10n: fr.po Fixed grammar mistake | 13 June 2016, 01:00:57 UTC |
| ad583eb | Changwoo Ryu | 11 June 2016, 16:25:58 UTC | l10n: ko.po: Update Korean translation | 11 June 2016, 16:25:58 UTC |
| 091a8f7 | Jiang Xin | 11 June 2016, 12:21:52 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 | 11 June 2016, 12:21:52 UTC |
| 92c2852 | Dimitriy Ryazantcev | 11 June 2016, 09:53:43 UTC | l10n: ru.po: update Russian translation Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com> | 11 June 2016, 09:53:43 UTC |
| a28705d | Junio C Hamano | 10 June 2016, 22:30:19 UTC | Hopefully the final last-minute update before 2.9 final Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 June 2016, 22:30:19 UTC |
| e5f7675 | Junio C Hamano | 10 June 2016, 22:26:06 UTC | Merge branch 'jk/diff-compact-heuristic' It turns out that the earlier effort to update the heuristics may want to use a bit more time to mature. Turn it off by default. * jk/diff-compact-heuristic: diff: disable compaction heuristic for now | 10 June 2016, 22:26:06 UTC |
| 45c0c21 | Junio C Hamano | 10 June 2016, 22:26:04 UTC | Merge branch 'jk/shell-portability' test fixes. * jk/shell-portability: t5500 & t7403: lose bash-ism "local" test-lib: add in-shell "env" replacement | 10 June 2016, 22:26:05 UTC |
| 8ffc9d2 | Junio C Hamano | 10 June 2016, 22:26:04 UTC | Merge branch 'jc/t2300-setup' A test fix. * jc/t2300-setup: t2300: run git-sh-setup in an environment that better mimics the real life | 10 June 2016, 22:26:04 UTC |
| 3a39f61 | Peter Colberg | 10 June 2016, 19:05:26 UTC | config.c: fix misspelt "occurred" in an error message Signed-off-by: Peter Colberg <peter@colberg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 June 2016, 21:53:39 UTC |
| dc72b50 | Peter Colberg | 10 June 2016, 19:05:26 UTC | refs.h: fix misspelt "occurred" in a comment Signed-off-by: Peter Colberg <peter@colberg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 June 2016, 21:53:32 UTC |
