| 110a642 | Junio C Hamano | 18 October 2017, 05:19:10 UTC | Merge branch 'jk/system-path-cleanup' into maint Code clean-up. * jk/system-path-cleanup: git_extract_argv0_path: do nothing without RUNTIME_PREFIX system_path: move RUNTIME_PREFIX to a sub-function | 18 October 2017, 05:19:10 UTC |
| 28a925b | Junio C Hamano | 18 October 2017, 05:19:09 UTC | Merge branch 'bb/doc-eol-dirty' into maint Doc update. * bb/doc-eol-dirty: Documentation: mention that `eol` can change the dirty status of paths | 18 October 2017, 05:19:09 UTC |
| 0445bd7 | Junio C Hamano | 18 October 2017, 05:19:09 UTC | Merge branch 'mg/timestamp-t-fix' into maint A mismerge fix. * mg/timestamp-t-fix: name-rev: change ULONG_MAX to TIME_MAX | 18 October 2017, 05:19:09 UTC |
| 6da2d14 | Junio C Hamano | 18 October 2017, 05:19:08 UTC | Merge branch 'ma/pkt-line-leakfix' into maint A leakfix. * ma/pkt-line-leakfix: pkt-line: re-'static'-ify buffer in packet_write_fmt_1() | 18 October 2017, 05:19:08 UTC |
| 96d14cb | Junio C Hamano | 18 October 2017, 05:19:07 UTC | Merge branch 'jk/config-lockfile-leak-fix' into maint A leakfix. * jk/config-lockfile-leak-fix: config: use a static lock_file struct | 18 October 2017, 05:19:08 UTC |
| f77196e | Junio C Hamano | 18 October 2017, 05:19:07 UTC | Merge branch 'dw/diff-highlight-makefile-fix' into maint Build clean-up. * dw/diff-highlight-makefile-fix: diff-highlight: add clean target to Makefile | 18 October 2017, 05:19:07 UTC |
| 7c9375d | Junio C Hamano | 18 October 2017, 05:19:06 UTC | Merge branch 'jk/drop-sha1-entry-pos' into maint Code clean-up. * jk/drop-sha1-entry-pos: sha1-lookup: remove sha1_entry_pos() from header file sha1_file: drop experimental GIT_USE_LOOKUP search | 18 October 2017, 05:19:06 UTC |
| d9e8586 | Junio C Hamano | 18 October 2017, 05:19:06 UTC | Merge branch 'tb/ref-filter-empty-modifier' into maint In the "--format=..." option of the "git for-each-ref" command (and its friends, i.e. the listing mode of "git branch/tag"), "%(atom:)" (e.g. "%(refname:)", "%(body:)" used to error out. Instead, treat them as if the colon and an empty string that follows it were not there. * tb/ref-filter-empty-modifier: ref-filter.c: pass empty-string as NULL to atom parsers | 18 October 2017, 05:19:06 UTC |
| 96d4b17 | Junio C Hamano | 18 October 2017, 05:19:05 UTC | Merge branch 'rb/compat-poll-fix' into maint Backports a moral equivalent of 2015 fix to the poll emulation from the upstream gnulib to fix occasional breakages on HPE NonStop. * rb/compat-poll-fix: poll.c: always set revents, even if to zero | 18 October 2017, 05:19:05 UTC |
| dd5c88a | Junio C Hamano | 18 October 2017, 05:19:04 UTC | Merge branch 'tg/memfixes' into maint Fixes for a handful memory access issues identified by valgrind. * tg/memfixes: sub-process: use child_process.args instead of child_process.argv http-push: fix construction of hex value from path path.c: fix uninitialized memory access | 18 October 2017, 05:19:05 UTC |
| d9f5ea4 | Junio C Hamano | 18 October 2017, 05:19:04 UTC | Merge branch 'ar/request-pull-phrasofix' into maint Spell the name of our system as "Git" in the output from request-pull script. * ar/request-pull-phrasofix: request-pull: capitalise "Git" to make it a proper noun | 18 October 2017, 05:19:04 UTC |
| 77cdf8c | Junio C Hamano | 18 October 2017, 05:19:03 UTC | Merge branch 'jc/merge-x-theirs-docfix' into maint The documentation for '-X<option>' for merges was misleadingly written to suggest that "-s theirs" exists, which is not the case. * jc/merge-x-theirs-docfix: merge-strategies: avoid implying that "-s theirs" exists | 18 October 2017, 05:19:03 UTC |
| 01ae81e | Junio C Hamano | 18 October 2017, 05:19:03 UTC | Merge branch 'rs/mailinfo-qp-decode-fix' into maint "git mailinfo" was loose in decoding quoted printable and produced garbage when the two letters after the equal sign are not hexadecimal. This has been fixed. * rs/mailinfo-qp-decode-fix: mailinfo: don't decode invalid =XY quoted-printable sequences | 18 October 2017, 05:19:03 UTC |
| b8a4e89 | Junio C Hamano | 18 October 2017, 05:19:02 UTC | Merge branch 'ik/userdiff-html-h-element-fix' into maint The built-in pattern to detect the "function header" for HTML did not match <H1>..<H6> elements without any attributes, which has been fixed. * ik/userdiff-html-h-element-fix: userdiff: fix HTML hunk header regexp | 18 October 2017, 05:19:02 UTC |
| 16ba0f4 | Junio C Hamano | 18 October 2017, 05:19:01 UTC | Merge branch 'jk/diff-blob' into maint "git cat-file --textconv" started segfaulting recently, which has been corrected. * jk/diff-blob: cat-file: handle NULL object_context.path | 18 October 2017, 05:19:01 UTC |
| 501ec0d | Junio C Hamano | 18 October 2017, 05:19:01 UTC | Merge branch 'jk/describe-omit-some-refs' into maint "git describe --match" learned to take multiple patterns in v2.13 series, but the feature ignored the patterns after the first one and did not work at all. This has been fixed. * jk/describe-omit-some-refs: describe: fix matching to actually match all patterns | 18 October 2017, 05:19:01 UTC |
| 8dc1d0b | Junio C Hamano | 18 October 2017, 05:19:00 UTC | Merge branch 'mh/for-each-string-list-item-empty-fix' into maint Code cmp.std.c nitpick. * mh/for-each-string-list-item-empty-fix: for_each_string_list_item: avoid undefined behavior for empty list | 18 October 2017, 05:19:00 UTC |
| 181f145 | Junio C Hamano | 18 October 2017, 05:18:59 UTC | Merge branch 'tb/test-lint-echo-e' into maint The test linter has been taught that we do not like "echo -e". * tb/test-lint-echo-e: test-lint: echo -e (or -E) is not portable | 18 October 2017, 05:19:00 UTC |
| 14431c7 | Junio C Hamano | 18 October 2017, 05:18:59 UTC | Merge branch 'aw/gc-lockfile-fscanf-fix' into maint "git gc" tries to avoid running two instances at the same time by reading and writing pid/host from and to a lock file; it used to use an incorrect fscanf() format when reading, which has been corrected. * aw/gc-lockfile-fscanf-fix: gc: call fscanf() with %<len>s, not %<len>c, when reading hostname | 18 October 2017, 05:18:59 UTC |
| 0f21375 | Junio C Hamano | 18 October 2017, 05:18:58 UTC | Merge branch 'tg/refs-allowed-flags' into maint API error-proofing which happens to also squelch warnings from GCC. * tg/refs-allowed-flags: refs: strip out not allowed flags from ref_transaction_update | 18 October 2017, 05:18:59 UTC |
| 550e41c | Junio C Hamano | 18 October 2017, 05:18:58 UTC | Merge branch 'rs/archive-excluded-directory' into maint "git archive", especially when used with pathspec, stored an empty directory in its output, even though Git itself never does so. This has been fixed. * rs/archive-excluded-directory: archive: don't add empty directories to archives | 18 October 2017, 05:18:58 UTC |
| aec2eb8 | Junio C Hamano | 18 October 2017, 05:18:58 UTC | Merge branch 'rk/commit-tree-make-F-verbatim' into maint Unlike "git commit-tree < file", "git commit-tree -F file" did not pass the contents of the file verbatim and instead completed an incomplete line at the end, if exists. The latter has been updated to match the behaviour of the former. * rk/commit-tree-make-F-verbatim: commit-tree: do not complete line in -F input | 18 October 2017, 05:18:58 UTC |
| 6b89503 | Junio C Hamano | 18 October 2017, 05:18:58 UTC | Merge branch 'mh/packed-ref-store-prep' into maint Fix regression to "gitk --bisect" by a recent update. * mh/packed-ref-store-prep: rev-parse: don't trim bisect refnames | 18 October 2017, 05:18:58 UTC |
| 05e408d | Junio C Hamano | 18 October 2017, 05:18:58 UTC | Merge branch 'mm/send-email-cc-cruft' into maint In addition to "cc: <a@dd.re.ss> # cruft", "cc: a@dd.re.ss # cruft" was taught to "git send-email" as a valid way to tell it that it needs to also send a carbon copy to <a@dd.re.ss> in the trailer section. * mm/send-email-cc-cruft: send-email: don't use Mail::Address, even if available send-email: fix garbage removal after address | 18 October 2017, 05:18:58 UTC |
| 6c9d195 | Junio C Hamano | 18 October 2017, 05:18:57 UTC | Merge branch 'rs/strbuf-getwholeline-fix' into maint A helper function to read a single whole line into strbuf mistakenly triggered OOM error at EOF under certain conditions, which has been fixed. * rs/strbuf-getwholeline-fix: strbuf: clear errno before calling getdelim(3) | 18 October 2017, 05:18:58 UTC |
| bea4dbe | Taylor Blau | 02 October 2017, 16:10:34 UTC | ref-filter.c: pass empty-string as NULL to atom parsers Peff points out that different atom parsers handle the empty "sub-argument" list differently. An example of this is the format "%(refname:)". Since callers often use `string_list_split` (which splits the empty string with any delimiter as a 1-ary string_list containing the empty string), this makes handling empty sub-argument strings non-ergonomic. Let's fix this by declaring that atom parser implementations must not care about distinguishing between the empty string "%(refname:)" and no sub-arguments "%(refname)". Current code aborts, either with "unrecognised arg" (e.g. "refname:") or "does not take args" (e.g. "body:") as an error message. Signed-off-by: Taylor Blau <me@ttaylorr.com> Reviewed-by: Jeff King <peff@peff.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 October 2017, 01:41:57 UTC |
| 2944a94 | Johannes Sixt | 03 October 2017, 20:24:57 UTC | sub-process: use child_process.args instead of child_process.argv Currently the argv is only allocated on the stack, and then assigned to process->argv. When the start_subprocess function goes out of scope, the local argv variable is eliminated from the stack, but the pointer is still kept around in process->argv. Much later when we try to access the same process->argv in finish_command, this leads us to access a memory location that no longer contains what we want. As argv0 is only used for printing errors, this is not easily noticed in normal git operations. However when running t0021-conversion.sh through valgrind, valgrind rightfully complains: ==21024== Invalid read of size 8 ==21024== at 0x2ACF64: finish_command (run-command.c:869) ==21024== by 0x2D6B18: subprocess_exit_handler (sub-process.c:72) ==21024== by 0x2AB41E: cleanup_children (run-command.c:45) ==21024== by 0x2AB526: cleanup_children_on_exit (run-command.c:81) ==21024== by 0x54AD487: __run_exit_handlers (in /usr/lib/libc-2.26.so) ==21024== by 0x54AD4D9: exit (in /usr/lib/libc-2.26.so) ==21024== by 0x11A9EF: handle_builtin (git.c:550) ==21024== by 0x11ABCC: run_argv (git.c:602) ==21024== by 0x11AD8E: cmd_main (git.c:679) ==21024== by 0x1BF125: main (common-main.c:43) ==21024== Address 0x1ffeffec00 is on thread 1's stack ==21024== 1504 bytes below stack pointer ==21024== These days, the child_process structure has its own args array, and the standard way to set up its argv[] is to use that one, instead of assigning to process->argv to point at an array that is outside. Use that facility automatically fixes this issue. Reported-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 October 2017, 04:58:15 UTC |
| 51bfb73 | Thomas Gummerer | 03 October 2017, 19:57:12 UTC | http-push: fix construction of hex value from path The get_oid_hex_from_objpath takes care of creating a oid from a pathname. It does this by memcpy'ing the first two bytes of the path to the "hex" string, then skipping the '/', and then copying the rest of the path to the "hex" string. Currently it fails to increase the pointer to the hex string, so the second memcpy invocation just mashes over what was copied in the first one, and leaves the last two bytes in the string uninitialized. This breaks valgrind in t5540, although the test passes without valgrind: ==5490== Use of uninitialised value of size 8 ==5490== at 0x13C6B5: hexval (cache.h:1238) ==5490== by 0x13C6DB: hex2chr (cache.h:1247) ==5490== by 0x13C734: get_sha1_hex (hex.c:42) ==5490== by 0x13C78E: get_oid_hex (hex.c:53) ==5490== by 0x118BDA: get_oid_hex_from_objpath (http-push.c:1023) ==5490== by 0x118C92: process_ls_object (http-push.c:1038) ==5490== by 0x118E5B: handle_remote_ls_ctx (http-push.c:1077) ==5490== by 0x118227: xml_end_tag (http-push.c:815) ==5490== by 0x50C1448: ??? (in /usr/lib/libexpat.so.1.6.6) ==5490== by 0x50C221B: ??? (in /usr/lib/libexpat.so.1.6.6) ==5490== by 0x50BFBF2: ??? (in /usr/lib/libexpat.so.1.6.6) ==5490== by 0x50C0B24: ??? (in /usr/lib/libexpat.so.1.6.6) ==5490== Uninitialised value was created by a stack allocation ==5490== at 0x118B63: get_oid_hex_from_objpath (http-push.c:1012) ==5490== Fix this by correctly incrementing the pointer to the "hex" variable, so the first two bytes are left untouched by the memcpy call, and the last two bytes are correctly initialized. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 October 2017, 04:48:35 UTC |
| 8262715 | Jeff King | 03 October 2017, 23:30:40 UTC | path.c: fix uninitialized memory access In cleanup_path we're passing in a char array, run a memcmp on it, and run through it without ever checking if something is in the array in the first place. This can lead us to access uninitialized memory, for example in t5541-http-push-smart.sh test 7, when run under valgrind: ==4423== Conditional jump or move depends on uninitialised value(s) ==4423== at 0x242FA9: cleanup_path (path.c:35) ==4423== by 0x242FA9: mkpath (path.c:456) ==4423== by 0x256CC7: refname_match (refs.c:364) ==4423== by 0x26C181: count_refspec_match (remote.c:1015) ==4423== by 0x26C181: match_explicit_lhs (remote.c:1126) ==4423== by 0x26C181: check_push_refs (remote.c:1409) ==4423== by 0x2ABB4D: transport_push (transport.c:870) ==4423== by 0x186703: push_with_options (push.c:332) ==4423== by 0x18746D: do_push (push.c:409) ==4423== by 0x18746D: cmd_push (push.c:566) ==4423== by 0x1183E0: run_builtin (git.c:352) ==4423== by 0x11973E: handle_builtin (git.c:539) ==4423== by 0x11973E: run_argv (git.c:593) ==4423== by 0x11973E: main (git.c:698) ==4423== Uninitialised value was created by a heap allocation ==4423== at 0x4C2CD8F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==4423== by 0x4C2F195: realloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==4423== by 0x2C196B: xrealloc (wrapper.c:137) ==4423== by 0x29A30B: strbuf_grow (strbuf.c:66) ==4423== by 0x29A30B: strbuf_vaddf (strbuf.c:277) ==4423== by 0x242F9F: mkpath (path.c:454) ==4423== by 0x256CC7: refname_match (refs.c:364) ==4423== by 0x26C181: count_refspec_match (remote.c:1015) ==4423== by 0x26C181: match_explicit_lhs (remote.c:1126) ==4423== by 0x26C181: check_push_refs (remote.c:1409) ==4423== by 0x2ABB4D: transport_push (transport.c:870) ==4423== by 0x186703: push_with_options (push.c:332) ==4423== by 0x18746D: do_push (push.c:409) ==4423== by 0x18746D: cmd_push (push.c:566) ==4423== by 0x1183E0: run_builtin (git.c:352) ==4423== by 0x11973E: handle_builtin (git.c:539) ==4423== by 0x11973E: run_argv (git.c:593) ==4423== by 0x11973E: main (git.c:698) ==4423== Avoid this by using skip_prefix(), which knows not to go beyond the end of the string. Reported-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 October 2017, 04:47:16 UTC |
| e66d7c3 | Ann T Ropea | 03 October 2017, 00:08:38 UTC | request-pull: capitalise "Git" to make it a proper noun Of the many ways to spell the three-letter word, the variant "Git" should be used when referring to a repository in a description; or, in general, when it is used as a proper noun. We thus change the pull-request template message so that it reads "...in the Git repository at:" Besides, this brings us in line with the documentation, see Documentation/howto/using-signed-tag-in-pull-request.txt Signed-off-by: Ann T Ropea <bedhanger@gmx.de> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 October 2017, 04:11:57 UTC |
| 61b2a1a | Randall S. Becker | 28 September 2017, 22:47:17 UTC | poll.c: always set revents, even if to zero Match what is done to pfd[i].revents when compute_revents() returns 0 to the upstream gnulib's commit d42461c3 ("poll: fixes for large fds", 2015-02-20). The revents field is set to 0, without incrementing the value rc to be returned from the function. The original code left the field to whatever random value the field was initialized to. This fixes occasional hangs in git-upload-pack on HPE NonStop. Signed-off-by: Randall S. Becker <randall.becker@nexbridge.ca> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 September 2017, 09:33:22 UTC |
| c25d98b | Junio C Hamano | 25 September 2017, 05:34:23 UTC | merge-strategies: avoid implying that "-s theirs" exists The description of `-Xours` merge option has a parenthetical note that tells the readers that it is very different from `-s ours`, which is correct, but the description of `-Xtheirs` that follows it carelessly says "this is the opposite of `ours`", giving a false impression that the readers also need to be warned that it is very different from `-s theirs`, which in reality does not even exist. Clarify it a bit to avoid misleading readers. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 September 2017, 05:34:23 UTC |
| c8cf423 | René Scharfe | 23 September 2017, 18:04:40 UTC | mailinfo: don't decode invalid =XY quoted-printable sequences Decode =XY in quoted-printable segments only if X and Y are hexadecimal digits, otherwise just copy them. That's at least better than interpreting negative results from hexval() as a character. Reported-by: Jeff King <peff@peff.net> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 September 2017, 01:29:19 UTC |
| 9c03cac | Ilya Kantor | 23 September 2017, 07:53:47 UTC | userdiff: fix HTML hunk header regexp Current HTML header regexp doesn't match headers without attributes. So it fails to match <h1>...</h1>, while <h1 class="smth">...</h1> matches. Make attributes optional to fix this. The regexp is still far from perfect, but now it at least handles the common case. Signed-off-by: Ilya Kantor <iliakan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 September 2017, 01:13:28 UTC |
| 4010f1d | Junio C Hamano | 22 September 2017, 05:51:37 UTC | Git 2.14.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2017, 05:51:37 UTC |
| cef9271 | Junio C Hamano | 22 September 2017, 05:50:02 UTC | Sync with 2.13.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2017, 05:50:02 UTC |
| 42e6fde | Junio C Hamano | 22 September 2017, 05:49:24 UTC | Git 2.13.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2017, 05:49:24 UTC |
| 1df0306 | Junio C Hamano | 22 September 2017, 05:48:08 UTC | Sync with 2.12.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2017, 05:48:08 UTC |
| 9752ad0 | Junio C Hamano | 22 September 2017, 05:47:41 UTC | Git 2.12.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2017, 05:47:41 UTC |
| 65c9d4b | Junio C Hamano | 22 September 2017, 05:45:30 UTC | Sync with 2.11.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2017, 05:45:30 UTC |
| 39aaab1 | Junio C Hamano | 22 September 2017, 05:44:45 UTC | Git 2.11.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2017, 05:44:45 UTC |
| 0a4986d | Junio C Hamano | 22 September 2017, 05:43:13 UTC | Sync with 2.10.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2017, 05:43:17 UTC |
| 27dea46 | Junio C Hamano | 22 September 2017, 05:42:22 UTC | Git 2.10.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2017, 05:42:22 UTC |
| dca89d4 | Junio C Hamano | 22 September 2017, 05:34:34 UTC | Merge branch 'jk/safe-pipe-capture' into maint-2.10 | 22 September 2017, 05:34:34 UTC |
| 6d6e2f8 | Junio C Hamano | 22 September 2017, 05:34:34 UTC | Merge branch 'jk/cvsimport-quoting' into maint-2.10 | 22 September 2017, 05:34:34 UTC |
| 31add46 | Junio C Hamano | 22 September 2017, 05:34:34 UTC | Merge branch 'jc/cvsserver' into maint-2.10 | 22 September 2017, 05:34:34 UTC |
| 985f59c | Junio C Hamano | 22 September 2017, 05:34:34 UTC | Merge branch 'jk/git-shell-drop-cvsserver' into maint-2.10 | 22 September 2017, 05:34:34 UTC |
| cc0ea7c | Jeff King | 21 September 2017, 06:21:40 UTC | cat-file: handle NULL object_context.path Commit dc944b65f1 (get_sha1_with_context: dynamically allocate oc->path, 2017-05-19) changed the rules that callers must follow for seeing if we parsed a path in the object name. The rules switched from "check if the oc.path buffer is empty" to "check if the oc.path pointer is NULL". But that commit forgot to update some sites in cat_one_file(), meaning we might dereference a NULL pointer. You can see this by making a path-aware request like --textconv without specifying --path, and giving an object name that doesn't have a path in it. Like: git cat-file --textconv HEAD which will reliably segfault. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 September 2017, 03:49:28 UTC |
| 1a6d468 | Torsten Bögershausen | 17 September 2017, 05:43:18 UTC | test-lint: echo -e (or -E) is not portable Some implementations of `echo` support the '-e' option to enable backslash interpretation of the following string. As an addition, they support '-E' to turn it off. However, none of these are portable, POSIX doesn't even mention them, and many implementations don't support them. A check for '-n' is already done in check-non-portable-shell.pl, extend it to cover '-n', '-e' or '-E'. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 September 2017, 01:13:47 UTC |
| ac7da78 | Michael Haggerty | 20 September 2017, 05:27:05 UTC | for_each_string_list_item: avoid undefined behavior for empty list If you pass a newly initialized or newly cleared `string_list` to `for_each_string_list_item()`, then the latter does for ( item = (list)->items; /* NULL */ item < (list)->items + (list)->nr; /* NULL + 0 */ ++item) Even though this probably works almost everywhere, it is undefined behavior, and it could plausibly cause highly-optimizing compilers to misbehave. C99 section 6.5.6 paragraph 8 explains: If both the pointer operand and the result point to elements of the same array object, or one past the last element of the array object, the evaluation shall not produce an overflow; otherwise, the behavior is undefined. and (6.3.2.3.3) a null pointer does not point to anything. Guard the loop with a NULL check to make the intent crystal clear to even the most pedantic compiler. A suitably clever compiler could let the NULL check only run in the first iteration, but regardless, this overhead is likely to be dwarfed by the work to be done on each item. This problem was noticed by Coverity. [jn: using a NULL check instead of a placeholder empty list; fleshed out the commit message based on mailing list discussion] Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 September 2017, 05:41:08 UTC |
| afe2fab | Junio C Hamano | 17 September 2017, 03:16:55 UTC | gc: call fscanf() with %<len>s, not %<len>c, when reading hostname Earlier in this codepath, we (ab)used "%<len>c" to read the hostname recorded in the lockfile into locking_host[HOST_NAME_MAX + 1] while substituting <len> with the actual value of HOST_NAME_MAX. This turns out to be incorrect, as it is an instruction to read exactly the specified number of bytes. Because we are trying to read at most that many bytes, we should be using "%<len>s" instead. Helped-by: A. Wilcox <awilfox@adelielinux.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 September 2017, 04:21:44 UTC |
| da769d2 | Max Kirillov | 16 September 2017, 05:53:44 UTC | describe: fix matching to actually match all patterns `git describe --match` with multiple patterns matches only first pattern. If it fails, next patterns are not tried. Fix it, add test cases and update existing test which has wrong expectation. Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 September 2017, 01:21:12 UTC |
| 4318094 | René Scharfe | 12 September 2017, 22:43:57 UTC | archive: don't add empty directories to archives While git doesn't track empty directories, git archive can be tricked into putting some into archives. One way is to construct an empty tree object, as t5004 does. While that is supported by the object database, it can't be represented in the index and thus it's unlikely to occur in the wild. Another way is using the literal name of a directory in an exclude pathspec -- its contents are are excluded, but the directory stub is included. That's inconsistent: exclude pathspecs containing wildcards don't leave empty directories in the archive. Yet another way is have a few levels of nested subdirectories (e.g. d1/d2/d3/file1) and ignoring the entries at the leaves (e.g. file1). The directories with the ignored content are ignored as well (e.g. d3), but their empty parents are included (e.g. d2). As empty directories are not supported by git, they should also not be written into archives. If an empty directory is really needed then it can be tracked and archived by placing an empty .gitignore file in it. There already is a mechanism in place for suppressing empty directories. When read_tree_recursive() encounters a directory excluded by a pathspec then it enters it anyway because it might contain included entries. It calls the callback function before it is able to decide if the directory is actually needed. For that reason git archive adds directories to a queue and writes entries for them only when it encounters the first child item -- but currently only if pathspecs with wildcards are used. Queue *all* directories, no matter if there even are pathspecs present. This prevents git archive from writing entries for empty directories in all cases. Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2017, 06:08:22 UTC |
| c788c54 | Thomas Gummerer | 12 September 2017, 22:59:21 UTC | refs: strip out not allowed flags from ref_transaction_update Callers are only allowed to pass certain flags into ref_transaction_update, other flags are internal to it. To prevent mistakes from the callers, strip the internal only flags out before continuing. This was noticed because of a compiler warning gcc 7.1.1 issued about passing a NULL parameter as second parameter to memcpy (through hashcpy): In file included from refs.c:5:0: refs.c: In function ‘ref_transaction_verify’: cache.h:948:2: error: argument 2 null where non-null expected [-Werror=nonnull] memcpy(sha_dst, sha_src, GIT_SHA1_RAWSZ); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from git-compat-util.h:165:0, from cache.h:4, from refs.c:5: /usr/include/string.h:43:14: note: in a call to function ‘memcpy’ declared here extern void *memcpy (void *__restrict __dest, const void *__restrict __src, ^~~~~~ The call to hascpy in ref_transaction_add_update is protected by the passed in flags, but as we only add flags there, gcc notices REF_HAVE_NEW or REF_HAVE_OLD flags could be passed in from the outside, which would potentially result in passing in NULL as second parameter to memcpy. Fix both the compiler warning, and make the interface safer for its users by stripping the internal flags out. Suggested-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 September 2017, 05:46:05 UTC |
| 5b4efea | Jeff King | 11 September 2017, 14:24:26 UTC | cvsimport: shell-quote variable used in backticks We run `git rev-parse` though the shell, and quote its argument only with single-quotes. This prevents most metacharacters from being a problem, but misses the obvious case when $name itself has single-quotes in it. We can fix this by applying the usual shell-quoting formula. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 September 2017, 02:10:22 UTC |
| 8d0fad0 | Jeff King | 11 September 2017, 14:24:11 UTC | archimport: use safe_pipe_capture for user input Refnames can contain shell metacharacters which need to be passed verbatim to sub-processes. Using safe_pipe_capture skips the shell entirely. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 September 2017, 02:08:15 UTC |
| 9a42c03 | Jeff King | 11 September 2017, 15:27:51 UTC | shell: drop git-cvsserver support by default The git-cvsserver script is old and largely unmaintained these days. But git-shell allows untrusted users to run it out of the box, significantly increasing its attack surface. Let's drop it from git-shell's list of internal handlers so that it cannot be run by default. This is not backwards compatible. But given the age and development activity on CVS-related parts of Git, this is likely to impact very few users, while helping many more (i.e., anybody who runs git-shell and had no intention of supporting CVS). There's no configuration mechanism in git-shell for us to add a boolean and flip it to "off". But there is a mechanism for adding custom commands, and adding CVS support here is fairly trivial. Let's document it to give guidance to anybody who really is still running cvsserver. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 September 2017, 02:05:58 UTC |
| 46203ac | Junio C Hamano | 11 September 2017, 05:45:54 UTC | cvsserver: use safe_pipe_capture for `constant commands` as well This is not strictly necessary, but it is a good code hygiene. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2017, 05:52:29 UTC |
| 27dd738 | joernchen | 11 September 2017, 05:45:09 UTC | cvsserver: use safe_pipe_capture instead of backticks This makes the script pass arguments that are derived from end-user input in safer way when invoking subcommands. Reported-by: joernchen <joernchen@phenoelit.de> Signed-off-by: joernchen <joernchen@phenoelit.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2017, 05:52:29 UTC |
| fce13af | Junio C Hamano | 11 September 2017, 05:44:24 UTC | cvsserver: move safe_pipe_capture() to the main package As a preparation for replacing `command` with a call to this function from outside GITCVS::updater package, move it to the main package. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 September 2017, 05:52:29 UTC |
| 94c9fd2 | Junio C Hamano | 10 September 2017, 08:06:09 UTC | RelNotes: further fixes for 2.14.2 from the master front Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 September 2017, 08:06:09 UTC |
| 60f4851 | Junio C Hamano | 10 September 2017, 08:03:10 UTC | Merge branch 'jt/doc-pack-objects-fix' into maint Doc updates. * jt/doc-pack-objects-fix: Doc: clarify that pack-objects makes packs, plural | 10 September 2017, 08:03:10 UTC |
| 8134746 | Junio C Hamano | 10 September 2017, 08:03:09 UTC | Merge branch 'jn/vcs-svn-cleanup' into maint Code clean-up. * jn/vcs-svn-cleanup: vcs-svn: move remaining repo_tree functions to fast_export.h vcs-svn: remove repo_delete wrapper function vcs-svn: remove custom mode constants vcs-svn: remove more unused prototypes and declarations | 10 September 2017, 08:03:09 UTC |
| 044aa0e | Junio C Hamano | 10 September 2017, 08:03:08 UTC | Merge branch 'bc/vcs-svn-cleanup' into maint Code clean-up. * bc/vcs-svn-cleanup: vcs-svn: rename repo functions to "svn_repo" vcs-svn: remove unused prototypes | 10 September 2017, 08:03:08 UTC |
| 5e03ae4 | Junio C Hamano | 10 September 2017, 08:03:07 UTC | Merge branch 'jk/doc-the-this' into maint Doc clean-up. * jk/doc-the-this: doc: fix typo in sendemail.identity | 10 September 2017, 08:03:07 UTC |
| 02a19e9 | Junio C Hamano | 10 September 2017, 08:03:07 UTC | Merge branch 'rs/commit-h-single-parent-cleanup' into maint Code clean-up. * rs/commit-h-single-parent-cleanup: commit: remove unused inline function single_parent() | 10 September 2017, 08:03:07 UTC |
| d2ef4be | Junio C Hamano | 10 September 2017, 08:03:06 UTC | Merge branch 'mg/format-ref-doc-fix' into maint Doc fix. * mg/format-ref-doc-fix: Documentation/git-for-each-ref: clarify peeling of tags for --format Documentation: use proper wording for ref format strings | 10 September 2017, 08:03:06 UTC |
| 95d25c4 | Junio C Hamano | 10 September 2017, 08:03:06 UTC | Merge branch 'sb/submodule-parallel-update' into maint Code clean-up. * sb/submodule-parallel-update: submodule.sh: remove unused variable | 10 September 2017, 08:03:06 UTC |
| b3c2280 | Junio C Hamano | 10 September 2017, 08:03:05 UTC | Merge branch 'hv/t5526-andand-chain-fix' into maint Test fix. * hv/t5526-andand-chain-fix: t5526: fix some broken && chains | 10 September 2017, 08:03:05 UTC |
| f04f860 | Junio C Hamano | 10 September 2017, 08:03:04 UTC | Merge branch 'sb/sha1-file-cleanup' into maint Code clean-up. * sb/sha1-file-cleanup: sha1_file: make read_info_alternates static | 10 September 2017, 08:03:04 UTC |
| 1a8a328 | Junio C Hamano | 10 September 2017, 08:03:04 UTC | Merge branch 'rs/t1002-do-not-use-sum' into maint Test simplification. * rs/t1002-do-not-use-sum: t1002: stop using sum(1) | 10 September 2017, 08:03:04 UTC |
| b438722 | Junio C Hamano | 10 September 2017, 08:03:03 UTC | Merge branch 'ah/doc-empty-string-is-false' into maint Doc update. * ah/doc-empty-string-is-false: doc: clarify "config --bool" behaviour with empty string | 10 September 2017, 08:03:03 UTC |
| afa6608 | Junio C Hamano | 10 September 2017, 08:03:02 UTC | Merge branch 'rs/merge-microcleanup' into maint Code clean-up. * rs/merge-microcleanup: merge: use skip_prefix() | 10 September 2017, 08:03:02 UTC |
| c580ce1 | Junio C Hamano | 10 September 2017, 08:03:02 UTC | Merge branch 'rs/find-pack-entry-bisection' into maint Code clean-up. * rs/find-pack-entry-bisection: sha1_file: avoid comparison if no packed hash matches the first byte | 10 September 2017, 08:03:02 UTC |
| c7759cd | Junio C Hamano | 10 September 2017, 08:03:01 UTC | Merge branch 'rs/apply-lose-prefix-length' into maint Code clean-up. * rs/apply-lose-prefix-length: apply: remove prefix_length member from apply_state | 10 September 2017, 08:03:01 UTC |
| 70def2c | Junio C Hamano | 10 September 2017, 08:03:00 UTC | Merge branch 'rj/add-chmod-error-message' into maint Message fix. * rj/add-chmod-error-message: builtin/add: add detail to a 'cannot chmod' error message | 10 September 2017, 08:03:00 UTC |
| 822a4d4 | Junio C Hamano | 10 September 2017, 08:02:59 UTC | Merge branch 'jk/hashcmp-memcmp' into maint Code clean-up. * jk/hashcmp-memcmp: hashcmp: use memcmp instead of open-coded loop | 10 September 2017, 08:02:59 UTC |
| f35a1d7 | Junio C Hamano | 10 September 2017, 08:02:58 UTC | Merge branch 'rs/t3700-clean-leftover' into maint A test fix. * rs/t3700-clean-leftover: t3700: fix broken test under !POSIXPERM | 10 September 2017, 08:02:58 UTC |
| 8f3d48e | Junio C Hamano | 10 September 2017, 08:02:57 UTC | Merge branch 'jc/perl-git-comment-typofix' into maint A comment fix. * jc/perl-git-comment-typofix: perl/Git.pm: typofix in a comment | 10 September 2017, 08:02:57 UTC |
| 036e127 | Junio C Hamano | 10 September 2017, 08:02:56 UTC | Merge branch 'mf/no-dashed-subcommands' into maint Code clean-up. * mf/no-dashed-subcommands: scripts: use "git foo" not "git-foo" | 10 September 2017, 08:02:56 UTC |
| 1eb539a | Junio C Hamano | 10 September 2017, 08:02:56 UTC | Merge branch 'ab/ref-filter-no-contains' into maint A test fix. * ab/ref-filter-no-contains: tests: don't give unportable ">" to "test" built-in, use -gt | 10 September 2017, 08:02:56 UTC |
| ea8bf00 | Junio C Hamano | 10 September 2017, 08:02:55 UTC | Merge branch 'rs/archive-excluded-directory' into maint "git archive" did not work well with pathspecs and the export-ignore attribute. We may want to resurrect the "we don't archive an empty directory" bonus patch, but I do not mind merging the above early to 'next' and leave it as a separate follow-up enhancement. cf. <20170820090629.tumvqwzkromcykjf@sigill.intra.peff.net> * rs/archive-excluded-directory: archive: don't queue excluded directories archive: factor out helper functions for handling attributes t5001: add tests for export-ignore attributes and exclude pathspecs | 10 September 2017, 08:02:55 UTC |
| 78ad094 | Junio C Hamano | 10 September 2017, 08:02:55 UTC | Merge branch 'mg/killed-merge' into maint Killing "git merge --edit" before the editor returns control left the repository in a state with MERGE_MSG but without MERGE_HEAD, which incorrectly tells the subsequent "git commit" that there was a squash merge in progress. This has been fixed. * mg/killed-merge: merge: save merge state earlier merge: split write_merge_state in two merge: clarify call chain Documentation/git-merge: explain --continue | 10 September 2017, 08:02:55 UTC |
| 648a50a | Junio C Hamano | 10 September 2017, 08:02:55 UTC | Merge branch 'tb/apply-with-crlf' into maint "git apply" that is used as a better "patch -p1" failed to apply a taken from a file with CRLF line endings to a file with CRLF line endings. The root cause was because it misused convert_to_git() that tried to do "safe-crlf" processing by looking at the index entry at the same path, which is a nonsense---in that mode, "apply" is not working on the data in (or derived from) the index at all. This has been fixed. * tb/apply-with-crlf: apply: file commited with CRLF should roundtrip diff and apply convert: add SAFE_CRLF_KEEP_CRLF | 10 September 2017, 08:02:55 UTC |
| 27015b4 | Junio C Hamano | 10 September 2017, 08:02:55 UTC | Merge branch 'cc/subprocess-handshake-missing-capabilities' into maint When handshake with a subprocess filter notices that the process asked for an unknown capability, Git did not report what program the offending subprocess was running. This has been corrected. We may want a follow-up fix to tighten the error checking, though. * cc/subprocess-handshake-missing-capabilities: sub-process: print the cmd when a capability is unsupported | 10 September 2017, 08:02:55 UTC |
| f1b64e8 | Junio C Hamano | 10 September 2017, 08:02:55 UTC | Merge branch 'as/grep-quiet-no-match-exit-code-fix' into maint "git grep -L" and "git grep --quiet -L" reported different exit codes; this has been corrected. * as/grep-quiet-no-match-exit-code-fix: git-grep: correct exit code with --quiet and -L | 10 September 2017, 08:02:55 UTC |
| 8388f98 | Junio C Hamano | 10 September 2017, 08:02:54 UTC | Merge branch 'kd/stash-with-bash-4.4' into maint bash 4.4 or newer gave a warning on NUL byte in command substitution done in "git stash"; this has been squelched. * kd/stash-with-bash-4.4: stash: prevent warning about null bytes in input | 10 September 2017, 08:02:54 UTC |
| fbded00 | Junio C Hamano | 10 September 2017, 08:02:54 UTC | Merge branch 'rs/win32-syslog-leakfix' into maint Memory leak in an error codepath has been plugged. * rs/win32-syslog-leakfix: win32: plug memory leak on realloc() failure in syslog() | 10 September 2017, 08:02:54 UTC |
| 438776e | Junio C Hamano | 10 September 2017, 08:02:53 UTC | Merge branch 'rs/unpack-entry-leakfix' into maint Memory leak in an error codepath has been plugged. * rs/unpack-entry-leakfix: sha1_file: release delta_stack on error in unpack_entry() | 10 September 2017, 08:02:53 UTC |
| c3b931e | Junio C Hamano | 10 September 2017, 08:02:52 UTC | Merge branch 'rs/fsck-obj-leakfix' into maint Memory leak in an error codepath has been plugged. * rs/fsck-obj-leakfix: fsck: free buffers on error in fsck_obj() | 10 September 2017, 08:02:53 UTC |
| e0d52ec | Junio C Hamano | 10 September 2017, 08:02:52 UTC | Merge branch 'ur/svn-local-zone' into maint "git svn" used with "--localtime" option did not compute the tz offset for the timestamp in question and instead always used the current time, which has been corrected. * ur/svn-local-zone: git svn fetch: Create correct commit timestamp when using --localtime | 10 September 2017, 08:02:52 UTC |
| 00fd0af | Junio C Hamano | 10 September 2017, 08:02:51 UTC | Merge branch 'pw/am-signoff' into maint "git am -s" has been taught that some input may end with a trailer block that is not Signed-off-by: and it should refrain from adding an extra blank line before adding a new sign-off in such a case. * pw/am-signoff: am: fix signoff when other trailers are present | 10 September 2017, 08:02:51 UTC |
| 0f80fb1 | Junio C Hamano | 10 September 2017, 08:02:51 UTC | Merge branch 'rs/in-obsd-basename-dirname-take-const' into maint Portability fix. * rs/in-obsd-basename-dirname-take-const: test-path-utils: handle const parameter of basename and dirname | 10 September 2017, 08:02:51 UTC |
| b3a19e0 | Junio C Hamano | 10 September 2017, 08:02:51 UTC | Merge branch 'rs/t4062-obsd' into maint Test portability fix. * rs/t4062-obsd: t4062: use less than 256 repetitions in regex | 10 September 2017, 08:02:51 UTC |
| c2e1941 | Junio C Hamano | 10 September 2017, 08:02:50 UTC | Merge branch 'rs/obsd-getcwd-workaround' into maint Test portability fix for BSDs. * rs/obsd-getcwd-workaround: t0001: skip test with restrictive permissions if getpwd(3) respects them | 10 September 2017, 08:02:50 UTC |
| 277194a | Junio C Hamano | 10 September 2017, 08:02:49 UTC | Merge branch 'bw/clone-recursive-quiet' into maint "git clone --recurse-submodules --quiet" did not pass the quiet option down to submodules. * bw/clone-recursive-quiet: clone: teach recursive clones to respect -q | 10 September 2017, 08:02:49 UTC |
| 86c726f | Junio C Hamano | 10 September 2017, 08:02:49 UTC | Merge branch 'pw/sequence-rerere-autoupdate' into maint Commands like "git rebase" accepted the --rerere-autoupdate option from the command line, but did not always use it. This has been fixed. * pw/sequence-rerere-autoupdate: cherry-pick/revert: reject --rerere-autoupdate when continuing cherry-pick/revert: remember --rerere-autoupdate t3504: use test_commit rebase -i: honor --rerere-autoupdate rebase: honor --rerere-autoupdate am: remember --rerere-autoupdate setting | 10 September 2017, 08:02:49 UTC |
| eba2a68 | Junio C Hamano | 10 September 2017, 08:02:49 UTC | Merge branch 'bw/push-options-recursively-to-submodules' into maint "git push --recurse-submodules $there HEAD:$target" was not propagated down to the submodules, but now it is. * bw/push-options-recursively-to-submodules: submodule--helper: teach push-check to handle HEAD | 10 September 2017, 08:02:49 UTC |
| 702239d | Junio C Hamano | 10 September 2017, 08:02:48 UTC | Merge branch 'ma/pager-per-subcommand-action' into maint The "tag.pager" configuration variable was useless for those who actually create tag objects, as it interfered with the use of an editor. A new mechanism has been introduced for commands to enable pager depending on what operation is being carried out to fix this, and then "git tag -l" is made to run pager by default. If this works out OK, I think there are low-hanging fruits in other commands like "git branch" that outputs long list in one mode while taking input in another. * ma/pager-per-subcommand-action: git.c: ignore pager.* when launching builtin as dashed external tag: change default of `pager.tag` to "on" tag: respect `pager.tag` in list-mode only t7006: add tests for how git tag paginates git.c: provide setup_auto_pager() git.c: let builtins opt for handling `pager.foo` themselves builtin.h: take over documentation from api-builtin.txt | 10 September 2017, 08:02:48 UTC |
| c2a3bb4 | Junio C Hamano | 10 September 2017, 08:02:48 UTC | Merge branch 'jk/rev-list-empty-input' into maint "git log --tag=no-such-tag" showed log starting from HEAD, which has been fixed---it now shows nothing. * jk/rev-list-empty-input: revision: do not fallback to default when rev_input_given is set rev-list: don't show usage when we see empty ref patterns revision: add rev_input_given flag t6018: flesh out empty input/output rev-list tests | 10 September 2017, 08:02:48 UTC |
