| d966095 | Junio C Hamano | 18 October 2019, 02:31:00 UTC | Git 2.24-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2019, 02:40:50 UTC |
| 90e0d16 | Junio C Hamano | 18 October 2019, 02:40:50 UTC | Merge branch 'rs/remote-curl-use-argv-array' Code cleanup. * rs/remote-curl-use-argv-array: remote-curl: use argv_array in parse_push() | 18 October 2019, 02:40:50 UTC |
| 3def8ae | Junio C Hamano | 18 October 2019, 02:40:49 UTC | Merge branch 'rs/column-use-utf8-strnwidth' Code cleanup. * rs/column-use-utf8-strnwidth: column: use utf8_strnwidth() to strip out ANSI color escapes | 18 October 2019, 02:40:49 UTC |
| d0258d0 | Junio C Hamano | 18 October 2019, 02:40:49 UTC | Merge branch 'rs/http-push-simplify' Code cleanup. * rs/http-push-simplify: http-push: simplify deleting a list item | 18 October 2019, 02:40:49 UTC |
| bb52def | Junio C Hamano | 18 October 2019, 02:40:49 UTC | Merge branch 'jj/stash-reset-only-toplevel' "git stash save" lost local changes to submodules, which has been corrected. * jj/stash-reset-only-toplevel: stash: avoid recursive hard reset on submodules | 18 October 2019, 02:40:49 UTC |
| f1afbb0 | Junio C Hamano | 18 October 2019, 02:40:48 UTC | Merge branch 'bw/format-patch-o-create-leading-dirs' "git format-patch -o <outdir>" did an equivalent of "mkdir <outdir>" not "mkdir -p <outdir>", which is being corrected. * bw/format-patch-o-create-leading-dirs: format-patch: create leading components of output directory | 18 October 2019, 02:40:48 UTC |
| e5fca6b | Junio C Hamano | 18 October 2019, 02:40:48 UTC | Merge branch 'bb/compat-util-comment-fix' Code cleanup. * bb/compat-util-comment-fix: git-compat-util: fix documentation syntax | 18 October 2019, 02:40:48 UTC |
| 43400b4 | Junio C Hamano | 18 October 2019, 02:40:48 UTC | Merge branch 'bb/utf8-wcwidth-cleanup' Code cleanup. * bb/utf8-wcwidth-cleanup: utf8: use ARRAY_SIZE() in git_wcwidth() | 18 October 2019, 02:40:48 UTC |
| 07ff6dd | Junio C Hamano | 18 October 2019, 02:40:48 UTC | Merge branch 'dl/allow-running-cocci-verbosely' Dev support update. * dl/allow-running-cocci-verbosely: Makefile: respect $(V) in %.cocci.patch target | 18 October 2019, 02:40:48 UTC |
| 2d74d28 | Junio C Hamano | 18 October 2019, 02:40:47 UTC | Merge branch 'dl/compat-cleanup' Code formatting micronit fix. * dl/compat-cleanup: pthread.h: manually align parameter lists | 18 October 2019, 02:40:47 UTC |
| 9b83a94 | Junio C Hamano | 18 October 2019, 02:40:47 UTC | Merge branch 'ta/t1308-typofix' Test fix. * ta/t1308-typofix: t1308-config-set: fix a test that has a typo | 18 October 2019, 02:40:47 UTC |
| 376012c | Junio C Hamano | 18 October 2019, 02:40:47 UTC | Merge branch 'js/doc-stash-save' Doc clarification. * js/doc-stash-save: doc(stash): clarify the description of `save` | 18 October 2019, 02:40:47 UTC |
| 108b97d | Junio C Hamano | 15 October 2019, 04:31:50 UTC | Ninth batch Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 October 2019, 04:48:04 UTC |
| cbe8cdd | Junio C Hamano | 15 October 2019, 04:48:03 UTC | Merge branch 'jk/coc' Code-of-conduct document. * jk/coc: CODE_OF_CONDUCT: mention individual project-leader emails add a Code of Conduct document | 15 October 2019, 04:48:04 UTC |
| 3b9ec27 | Junio C Hamano | 15 October 2019, 04:48:03 UTC | Merge branch 'js/trace2-fetch-push' Dev support. * js/trace2-fetch-push: transport: push codepath can take arbitrary repository push: add trace2 instrumentation fetch: add trace2 instrumentation | 15 October 2019, 04:48:03 UTC |
| c7d2ced | Junio C Hamano | 15 October 2019, 04:48:03 UTC | Merge branch 'jt/push-avoid-lazy-fetch' Performance hack. * jt/push-avoid-lazy-fetch: send-pack: never fetch when checking exclusions | 15 October 2019, 04:48:03 UTC |
| 1ef3bd3 | Junio C Hamano | 15 October 2019, 04:48:03 UTC | Merge branch 'dl/format-patch-doc-test-cleanup' test cleanup. * dl/format-patch-doc-test-cleanup: t4014: treat rev-list output as the expected value | 15 October 2019, 04:48:03 UTC |
| eb3de5b | Junio C Hamano | 15 October 2019, 04:48:03 UTC | Merge branch 'js/xdiffi-comment-updates' Comment update. * js/xdiffi-comment-updates: xdiffi: fix typos and touch up comments | 15 October 2019, 04:48:03 UTC |
| 4e8371e | Junio C Hamano | 15 October 2019, 04:48:02 UTC | Merge branch 'dl/t0000-skip-test-test' test update. * dl/t0000-skip-test-test: t0000: cover GIT_SKIP_TESTS blindspots | 15 October 2019, 04:48:02 UTC |
| b6d712f | Junio C Hamano | 15 October 2019, 04:48:02 UTC | Merge branch 'tg/range-diff-output-update' "git range-diff" failed to handle mode-only change, which has been corrected. * tg/range-diff-output-update: range-diff: don't segfault with mode-only changes | 15 October 2019, 04:48:02 UTC |
| 7745887 | Junio C Hamano | 15 October 2019, 04:48:02 UTC | Merge branch 'gs/sq-quote-buf-pretty' Pretty-printed command line formatter (used in e.g. reporting the command being run by the tracing API) had a bug that lost an argument that is an empty string, which has been corrected. * gs/sq-quote-buf-pretty: sq_quote_buf_pretty: don't drop empty arguments | 15 October 2019, 04:48:02 UTC |
| 5efabc7 | Junio C Hamano | 15 October 2019, 04:48:01 UTC | Merge branch 'ew/hashmap' Code clean-up of the hashmap API, both users and implementation. * ew/hashmap: hashmap_entry: remove first member requirement from docs hashmap: remove type arg from hashmap_{get,put,remove}_entry OFFSETOF_VAR macro to simplify hashmap iterators hashmap: introduce hashmap_free_entries hashmap: hashmap_{put,remove} return hashmap_entry * hashmap: use *_entry APIs for iteration hashmap_cmp_fn takes hashmap_entry params hashmap_get{,_from_hash} return "struct hashmap_entry *" hashmap: use *_entry APIs to wrap container_of hashmap_get_next returns "struct hashmap_entry *" introduce container_of macro hashmap_put takes "struct hashmap_entry *" hashmap_remove takes "const struct hashmap_entry *" hashmap_get takes "const struct hashmap_entry *" hashmap_add takes "struct hashmap_entry *" hashmap_get_next takes "const struct hashmap_entry *" hashmap_entry_init takes "struct hashmap_entry *" packfile: use hashmap_entry in delta_base_cache_entry coccicheck: detect hashmap_entry.hash assignment diff: use hashmap_entry_init on moved_entry.ent | 15 October 2019, 04:48:02 UTC |
| d0ce4d9 | Junio C Hamano | 15 October 2019, 04:48:01 UTC | Merge branch 'js/trace2-cap-max-output-files' The trace2 output, when sending them to files in a designated directory, can populate the directory with too many files; a mechanism is introduced to set the maximum number of files and discard further logs when the maximum is reached. * js/trace2-cap-max-output-files: trace2: write discard message to sentinel files trace2: discard new traces if target directory has too many files docs: clarify trace2 version invariants docs: mention trace2 target-dir mode in git-config | 15 October 2019, 04:48:01 UTC |
| 6ed610b | Junio C Hamano | 15 October 2019, 04:48:01 UTC | Merge branch 'am/t0028-utf16-tests' Test fixes. * am/t0028-utf16-tests: t0028: add more tests t0028: fix test for UTF-16-LE-BOM | 15 October 2019, 04:48:01 UTC |
| 5b900fb | Junio C Hamano | 15 October 2019, 04:48:01 UTC | Merge branch 'dl/octopus-graph-bug' "git log --graph" for an octopus merge is sometimes colored incorrectly, which is demonstrated and documented but not yet fixed. * dl/octopus-graph-bug: t4214: demonstrate octopus graph coloring failure t4214: explicitly list tags in log t4214: generate expect in their own test cases t4214: use test_merge test-lib: let test_merge() perform octopus merges | 15 October 2019, 04:48:01 UTC |
| 16d9d71 | Junio C Hamano | 15 October 2019, 04:48:00 UTC | Merge branch 'en/fast-imexport-nested-tags' Updates to fast-import/export. * en/fast-imexport-nested-tags: fast-export: handle nested tags t9350: add tests for tags of things other than a commit fast-export: allow user to request tags be marked with --mark-tags fast-export: add support for --import-marks-if-exists fast-import: add support for new 'alias' command fast-import: allow tags to be identified by mark labels fast-import: fix handling of deleted tags fast-export: fix exporting a tag and nothing else | 15 October 2019, 04:48:00 UTC |
| 6d5291b | Junio C Hamano | 15 October 2019, 04:48:00 UTC | Merge branch 'js/azure-pipelines-msvc' CI updates. * js/azure-pipelines-msvc: ci: also build and test with MS Visual Studio on Azure Pipelines ci: really use shallow clones on Azure Pipelines tests: let --immediate and --write-junit-xml play well together test-tool run-command: learn to run (parts of) the testsuite vcxproj: include more generated files vcxproj: only copy `git-remote-http.exe` once it was built msvc: work around a bug in GetEnvironmentVariable() msvc: handle DEVELOPER=1 msvc: ignore some libraries when linking compat/win32/path-utils.h: add #include guards winansi: use FLEX_ARRAY to avoid compiler warning msvc: avoid using minus operator on unsigned types push: do not pretend to return `int` from `die_push_simple()` | 15 October 2019, 04:48:00 UTC |
| ccc2899 | Junio C Hamano | 15 October 2019, 04:48:00 UTC | Merge branch 'gs/commit-graph-trace-with-cmd' Dev support. * gs/commit-graph-trace-with-cmd: commit-graph: emit trace2 cmd_mode for each sub-command | 15 October 2019, 04:48:00 UTC |
| d96e31e | Junio C Hamano | 15 October 2019, 04:48:00 UTC | Merge branch 'js/fetch-jobs' "git fetch --jobs=<n>" allowed <n> parallel jobs when fetching submodules, but this did not apply to "git fetch --multiple" that fetches from multiple remote repositories. It now does. * js/fetch-jobs: fetch: let --jobs=<n> parallelize --multiple, too | 15 October 2019, 04:48:00 UTC |
| 280bd44 | Junio C Hamano | 15 October 2019, 04:47:59 UTC | Merge branch 'en/merge-recursive-cleanup' The merge-recursive machiery is one of the most complex parts of the system that accumulated cruft over time. This large series cleans up the implementation quite a bit. * en/merge-recursive-cleanup: (26 commits) merge-recursive: fix the fix to the diff3 common ancestor label merge-recursive: fix the diff3 common ancestor label for virtual commits merge-recursive: alphabetize include list merge-recursive: add sanity checks for relevant merge_options merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* merge-recursive: split internal fields into a separate struct merge-recursive: avoid losing output and leaking memory holding that output merge-recursive: comment and reorder the merge_options fields merge-recursive: consolidate unnecessary fields in merge_options merge-recursive: move some definitions around to clean up the header merge-recursive: rename merge_options argument to opt in header merge-recursive: rename 'mrtree' to 'result_tree', for clarity merge-recursive: use common name for ancestors/common/base_list merge-recursive: fix some overly long lines cache-tree: share code between functions writing an index as a tree merge-recursive: don't force external callers to do our logging merge-recursive: remove useless parameter in merge_trees() merge-recursive: exit early if index != head Ensure index matches head before invoking merge machinery, round N merge-recursive: remove another implicit dependency on the_repository ... | 15 October 2019, 04:47:59 UTC |
| 062a309 | René Scharfe | 13 October 2019, 13:37:39 UTC | remote-curl: use argv_array in parse_push() Use argv_array to build an array of strings instead of open-coding it. This simplifies the code a bit. We also need to make the specs parameter of push(), push_dav() and push_git() const to match the argv member of the argv_array. That's fine, as all three only actually read from the specs array anyway. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 October 2019, 01:55:11 UTC |
| a81e42d | René Scharfe | 13 October 2019, 12:49:50 UTC | column: use utf8_strnwidth() to strip out ANSI color escapes Make use of utf8_strnwidth()'s feature to skip ANSI escape sequences instead of open-coding it. This shortens the code and makes it more consistent. This changes the behavior, though: The old code skips all kinds of Control Sequence Introducer sequences, while utf8_strnwidth() only skips the Select Graphic Rendition kind, i.e. those ending with "m". They are used for specifying color and font attributes like boldness. The only other kind of escape sequence we print in Git is Erase in Line, ending with "K". That's not used for columnar output, so this difference actually doesn't matter here. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 October 2019, 01:54:15 UTC |
| 5cc6a4b | René Scharfe | 13 October 2019, 12:49:17 UTC | http-push: simplify deleting a list item The first step for deleting an item from a linked list is to locate the item preceding it. Be more careful in release_request() and handle an empty list. This only has consequences for invalid delete requests (removing the same item twice, or deleting an item that was never added to the list), but simplifies the loop condition as well as the check after the loop. Once we found the item's predecessor in the list, update its next pointer to skip over the item, which removes it from the list. In other words: Make the item's successor the successor of its predecessor. (At this point entry->next == request and prev->next == lock, respectively.) This is a bit simpler and saves a pointer dereference. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 October 2019, 01:53:50 UTC |
| 556895d | Jakob Jarmar | 12 October 2019, 15:38:29 UTC | stash: avoid recursive hard reset on submodules git stash push does not recursively stash submodules, but if submodule.recurse is set, it may recursively reset --hard them. Having only the destructive action recurse is likely to be surprising behaviour, and unlikely to be desirable, so the easiest fix should be to ensure that the call to git reset --hard never recurses into submodules. This matches the behavior of check_changes_tracked_files, which ignores submodules. Signed-off-by: Jakob Jarmar <jakob@jarmar.se> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 October 2019, 01:34:44 UTC |
| edefc31 | Bert Wesarg | 11 October 2019, 08:36:41 UTC | format-patch: create leading components of output directory 'git format-patch -o <outdir>' did an equivalent of 'mkdir <outdir>' not 'mkdir -p <outdir>', which is being corrected. Avoid the usage of 'adjust_shared_perm' on the leading directories which may have security implications. Achieved by temporarily disabling of 'config.sharedRepository' like 'git init' does. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 October 2019, 02:51:20 UTC |
| 68b6921 | Beat Bolli | 11 October 2019, 18:24:54 UTC | git-compat-util: fix documentation syntax The parameter marker for x was garbled in its introduction in 89c855ed3c ("git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deriving the size of array", 2015-04-30). Signed-off-by: Beat Bolli <dev+git@drbeat.li> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 October 2019, 01:57:55 UTC |
| fa364ad | Beat Bolli | 11 October 2019, 18:41:23 UTC | utf8: use ARRAY_SIZE() in git_wcwidth() This macro has been available globally since b4f2a6ac92 ("Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))", 2006-03-09), so let's use it. Signed-off-by: Beat Bolli <dev+git@drbeat.li> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 October 2019, 01:57:39 UTC |
| 4f3c1dc | Denton Liu | 09 October 2019, 20:43:46 UTC | Makefile: respect $(V) in %.cocci.patch target When the %.cocci.patch target was defined in 63f0a758a0 (add coccicheck make target, 2016-09-15), it included a mechanism to suppress the noisy output, similar to the $(QUIET_<x>) family of variables. In the case where one wants to inspect the output hidden by $(QUIET_<x>), one could define $(V) for verbose output. In the %.cocci.patch target, this was not implemented. Move the output suppression into the $(QUIET_SPATCH) variable which is used like the other $(QUIET_<x>) variables. While we're at it, change the number of spaces printed from 5 to 4, like the other variables there. Signed-off-by: Denton Liu <liu.denton@gmail.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 October 2019, 01:14:28 UTC |
| 9cad1c4 | Denton Liu | 10 October 2019, 19:37:04 UTC | pthread.h: manually align parameter lists In previous patches, extern was mechanically removed from function declarations without care to formatting, causing parameter lists to be misaligned. Manually format changed sections such that the parameter lists are realigned. Viewing this patch with 'git diff -w' should produce no output. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 October 2019, 05:59:35 UTC |
| 8c1cfd5 | Tanay Abhra | 10 October 2019, 12:35:34 UTC | t1308-config-set: fix a test that has a typo Change test 'find value_list for a key from a configset' to redirect the result to 'expect' instead of 'except' which was a typo. With this change, the test case actually fails because it uses `configset_get_value`. Clearly, this was intended to be `configset_get_value_multi` since the test expects a list of values instead of a single value, so let's fix that, too. Signed-off-by: Tanay Abhra <tanayabh@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 October 2019, 05:35:31 UTC |
| 57d8f4b | Johannes Schindelin | 10 October 2019, 10:06:41 UTC | doc(stash): clarify the description of `save` The original phrasing of this paragraph made at least one person stumble over the word "from" (thinking that it was a typo and "from" was intended), and other readers chimed in, agreeing that it was confusing: https://public-inbox.org/git/0102016b8d597569-c1f6cfdc-cb45-4428-8737-cb1bc30655d8-000000@eu-west-1.amazonses.com/#t Let's rewrite that paragraph for clarity. Inspired-by-a-patch-by: Catalin Criste <cris_linu_w@yahoo.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 October 2019, 05:28:04 UTC |
| 08da649 | Junio C Hamano | 11 October 2019, 05:16:01 UTC | Eighth batch Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 October 2019, 05:24:49 UTC |
| 07f25ad | Junio C Hamano | 11 October 2019, 05:24:48 UTC | Merge branch 'dl/rev-list-doc-cleanup' Doc update. * dl/rev-list-doc-cleanup: git-rev-list.txt: prune options in synopsis | 11 October 2019, 05:24:49 UTC |
| f0d407e | Junio C Hamano | 11 October 2019, 05:24:48 UTC | Merge branch 'kt/add-i-progress' "git add -i" has been taught to show the total number of hunks and the hunks that has been processed so far when showing prompts. * kt/add-i-progress: add -i: show progress counter in the prompt | 11 October 2019, 05:24:48 UTC |
| 66102cf | Junio C Hamano | 11 October 2019, 05:24:48 UTC | Merge branch 'js/stash-apply-in-secondary-worktree' "git stash apply" in a subdirectory of a secondary worktree failed to access the worktree correctly, which has been corrected. * js/stash-apply-in-secondary-worktree: stash apply: report status correctly even in a worktree's subdirectory | 11 October 2019, 05:24:48 UTC |
| a4c5d9f | Junio C Hamano | 11 October 2019, 05:24:48 UTC | Merge branch 'rs/dedup-includes' Code cleanup. * rs/dedup-includes: treewide: remove duplicate #include directives | 11 October 2019, 05:24:48 UTC |
| 159cdab | Junio C Hamano | 11 October 2019, 05:24:47 UTC | Merge branch 'js/range-diff-noprefix' "git range-diff" segfaulted when diff.noprefix configuration was used, as it blindly expected the patch it internally generates to have the standard a/ and b/ prefixes. The command now forces the internal patch to be built without any prefix, not to be affected by any end-user configuration. * js/range-diff-noprefix: range-diff: internally force `diff.noprefix=true` | 11 October 2019, 05:24:48 UTC |
| 93424f1 | Junio C Hamano | 11 October 2019, 05:24:47 UTC | Merge branch 'cb/pcre1-cleanup' PCRE fixes. * cb/pcre1-cleanup: grep: refactor and simplify PCRE1 support grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1 | 11 October 2019, 05:24:47 UTC |
| a73f917 | Junio C Hamano | 11 October 2019, 05:24:47 UTC | Merge branch 'ab/pcre-jit-fixes' A few simplification and bugfixes to PCRE interface. * ab/pcre-jit-fixes: grep: under --debug, show whether PCRE JIT is enabled grep: do not enter PCRE2_UTF mode on fixed matching grep: stess test PCRE v2 on invalid UTF-8 data grep: create a "is_fixed" member in "grep_pat" grep: consistently use "p->fixed" in compile_regexp() grep: stop using a custom JIT stack with PCRE v1 grep: stop "using" a custom JIT stack with PCRE v2 grep: remove overly paranoid BUG(...) code grep: use PCRE v2 for optimized fixed-string search grep: remove the kwset optimization grep: drop support for \0 in --fixed-strings <pattern> grep: make the behavior for NUL-byte in patterns sane grep tests: move binary pattern tests into their own file grep tests: move "grep binary" alongside the rest grep: inline the return value of a function call used only once t4210: skip more command-line encoding tests on MinGW grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>" log tests: test regex backends in "--encode=<enc>" tests | 11 October 2019, 05:24:47 UTC |
| 4608a02 | Junio C Hamano | 11 October 2019, 05:24:46 UTC | Merge branch 'pw/rebase-i-show-HEAD-to-reword' "git rebase -i" showed a wrong HEAD while "reword" open the editor. * pw/rebase-i-show-HEAD-to-reword: sequencer: simplify root commit creation rebase -i: check for updated todo after squash and reword rebase -i: always update HEAD before rewording | 11 October 2019, 05:24:47 UTC |
| 020011f | Junio C Hamano | 11 October 2019, 05:24:46 UTC | Merge branch 'tk/git-svn-trim-author-name' The author names taken from SVN repositories may have extra leading or trailing whitespaces, which are now munged away. * tk/git-svn-trim-author-name: git-svn: trim leading and trailing whitespaces in author name | 11 October 2019, 05:24:46 UTC |
| 676278f | Junio C Hamano | 11 October 2019, 05:24:46 UTC | Merge branch 'bc/object-id-part17' Preparation for SHA-256 upgrade continues. * bc/object-id-part17: (26 commits) midx: switch to using the_hash_algo builtin/show-index: replace sha1_to_hex rerere: replace sha1_to_hex builtin/receive-pack: replace sha1_to_hex builtin/index-pack: replace sha1_to_hex packfile: replace sha1_to_hex wt-status: convert struct wt_status to object_id cache: remove null_sha1 builtin/worktree: switch null_sha1 to null_oid builtin/repack: write object IDs of the proper length pack-write: use hash_to_hex when writing checksums sequencer: convert to use the_hash_algo bisect: switch to using the_hash_algo sha1-lookup: switch hard-coded constants to the_hash_algo config: use the_hash_algo in abbrev comparison combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo bundle: switch to use the_hash_algo connected: switch GIT_SHA1_HEXSZ to the_hash_algo show-index: switch hard-coded constants to the_hash_algo blame: remove needless comparison with GIT_SHA1_HEXSZ ... | 11 October 2019, 05:24:46 UTC |
| aafb754 | Junio C Hamano | 11 October 2019, 05:24:45 UTC | Merge branch 'en/clean-nested-with-ignored' "git clean" fixes. * en/clean-nested-with-ignored: dir: special case check for the possibility that pathspec is NULL clean: fix theoretical path corruption clean: rewrap overly long line clean: avoid removing untracked files in a nested git repository clean: disambiguate the definition of -d git-clean.txt: do not claim we will delete files with -n/--dry-run dir: add commentary explaining match_pathspec_item's return value dir: if our pathspec might match files under a dir, recurse into it dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case dir: also check directories for matching pathspecs dir: fix off-by-one error in match_pathspec_item dir: fix typo in comment t7300: add testcases showing failure to clean specified pathspecs | 11 October 2019, 05:24:46 UTC |
| 3f9ef87 | Jeff King | 26 September 2019, 07:20:46 UTC | CODE_OF_CONDUCT: mention individual project-leader emails It's possible that somebody on the project committee is the subject of a complaint. In that case, it may be useful to be able to contact the other members individually, so let's make it clear that's an option. This also serves to enumerate the set of people on the committee. That lets you easily _know_ if you're in the situation mentioned above. And it's just convenient to list who's involved in the process, since the project committee list is not anywhere else in the repository. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 October 2019, 01:41:46 UTC |
| 5cdf230 | Jeff King | 24 September 2019, 06:44:54 UTC | add a Code of Conduct document We've never had a formally written Code of Conduct document. Though it has been discussed off and on over the years, for the most part the behavior on the mailing list has been good enough that nobody felt the need to push one forward. However, even if there aren't specific problems now, it's a good idea to have a document: - it puts everybody on the same page with respect to expectations. This might avoid poor behavior, but also makes it easier to handle it if it does happen. - it publicly advertises that good conduct is important to us and will be enforced, which may make some people more comfortable with joining our community - it may be a good time to cement our expectations when things are quiet, since it gives everybody some distance rather than focusing on a current contentious issue This patch adapts the Contributor Covenant Code of Conduct. As opposed to writing our own from scratch, this uses common and well-accepted language, and strikes a good balance between illustrating expectations and avoiding a laundry list of behaviors. It's also the same document used by the Git for Windows project. The text is taken mostly verbatim from: https://www.contributor-covenant.org/version/1/4/code-of-conduct.html I also stole a very nice introductory paragraph from the Git for Windows version of the file. There are a few subtle points, though: - the document refers to "the project maintainers". For the code, we generally only consider there to be one maintainer: Junio C Hamano. But for dealing with community issues, it makes sense to involve more people to spread the responsibility. I've listed the project committee address of git@sfconservancy.org as the contact point. - the document mentions banning from the community, both in the intro paragraph and in "Our Responsibilities". The exact mechanism here is left vague. I can imagine it might start with social enforcement (not accepting patches, ignoring emails) and could escalate to technical measures if necessary (asking vger admins to block an address). It probably make sense _not_ to get too specific at this point, and deal with specifics as they come up. Signed-off-by: Jeff King <peff@peff.net> Acked-by: CB Bailey <cb@hashpling.org> Acked-by: Christian Couder <chriscool@tuxfamily.org> Acked-by: Emily Shaffer <emilyshaffer@google.com> Acked-by: Garima Singh <garimasigit@gmail.com> Acked-by: Junio C Hamano <gitster@pobox.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Jonathan Tan <jonathantanmy@google.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Taylor Blau <me@ttaylorr.com> Acked-by: Elijah Newren <newren@gmail.com> Acked-by: Phillip Wood <phillip.wood@dunelm.org.uk> Acked-by: brian m. carlson <sandals@crustytoothpaste.net> Acked-by: Derrick Stolee <stolee@gmail.com> Acked-by: Thomas Gummerer <t.gummerer@gmail.com> Acked-by: William Baker <williamtbakeremail@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 October 2019, 01:39:23 UTC |
| 70bf0b7 | Junio C Hamano | 09 October 2019, 05:02:58 UTC | Seventh batch Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2019, 05:02:58 UTC |
| 9b3995c | Junio C Hamano | 09 October 2019, 05:01:01 UTC | Merge branch 'rs/test-remove-useless-debugging-cat' Code cleanup. * rs/test-remove-useless-debugging-cat: tests: remove "cat foo" before "test_i18ngrep bar foo" | 09 October 2019, 05:01:01 UTC |
| 2e956f7 | Junio C Hamano | 09 October 2019, 05:01:00 UTC | Merge branch 'pm/p4-auto-delete-named-temporary' * pm/p4-auto-delete-named-temporary: git-p4: auto-delete named temporary file | 09 October 2019, 05:01:00 UTC |
| d17f549 | Junio C Hamano | 09 October 2019, 05:01:00 UTC | Merge branch 'rs/convert-fix-utf-without-dash' The code to skip "UTF" and "UTF-" prefix, when computing an advice message, did not work correctly when the prefix was "UTF", which has been fixed. * rs/convert-fix-utf-without-dash: convert: fix handling of dashless UTF prefix in validate_encoding() | 09 October 2019, 05:01:00 UTC |
| 82c80f9 | Junio C Hamano | 09 October 2019, 05:01:00 UTC | Merge branch 'py/git-gui-has-maintainer' Doc update. * py/git-gui-has-maintainer: Documentation: update the location of the git-gui repo | 09 October 2019, 05:01:00 UTC |
| 6e12570 | Junio C Hamano | 09 October 2019, 05:01:00 UTC | Merge branch 'ah/cleanups' Miscellaneous code clean-ups. * ah/cleanups: git_mkstemps_mode(): replace magic numbers with computed value wrapper: use a loop instead of repetitive statements diffcore-break: use a goto instead of a redundant if statement commit-graph: remove a duplicate assignment | 09 October 2019, 05:01:00 UTC |
| 772cad0 | Junio C Hamano | 09 October 2019, 05:00:59 UTC | Merge branch 'js/diff-rename-force-stable-sort' The rename detection logic sorts a list of rename source candidates by similarity to pick the best candidate, which means that a tie between sources with the same similarity is broken by the original location in the original candidate list (which is sorted by path). Force the sorting by similarity done with a stable sort, which is not promised by system supplied qsort(3), to ensure consistent results across platforms. * js/diff-rename-force-stable-sort: diffcore_rename(): use a stable sort Move git_sort(), a stable sort, into into libgit.a | 09 October 2019, 05:00:59 UTC |
| 424663d | Junio C Hamano | 09 October 2019, 05:00:59 UTC | Merge branch 'js/mingw-spawn-with-spaces-in-path' Test fix. * js/mingw-spawn-with-spaces-in-path: t0061: fix test for argv[0] with spaces (MINGW only) | 09 October 2019, 05:00:59 UTC |
| 678a9ca | Junio C Hamano | 09 October 2019, 05:00:59 UTC | Merge branch 'as/shallow-slab-use-fix' Correct code that tried to reference all entries in a sparse array of pointers by mistake. * as/shallow-slab-use-fix: shallow.c: don't free unallocated slabs | 09 October 2019, 05:00:59 UTC |
| 0b4fae5 | Junio C Hamano | 09 October 2019, 05:00:58 UTC | Merge branch 'sg/name-rev-cutoff-underflow-fix' Integer arithmetic fix. * sg/name-rev-cutoff-underflow-fix: name-rev: avoid cutoff timestamp underflow | 09 October 2019, 05:00:58 UTC |
| 042a54d | Junio C Hamano | 09 October 2019, 05:00:58 UTC | Merge branch 'am/visual-studio-config-fix' Dev support. * am/visual-studio-config-fix: contrib/buildsystems: fix Visual Studio Debug configuration | 09 October 2019, 05:00:58 UTC |
| 03d3b12 | Johannes Schindelin | 08 October 2019, 18:27:52 UTC | xdiffi: fix typos and touch up comments Inspired by the thoroughly stale https://github.com/git/git/pull/159, this patch fixes a couple of typos, rewraps and clarifies some comments. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2019, 01:58:34 UTC |
| b05b409 | Denton Liu | 08 October 2019, 09:22:47 UTC | t0000: cover GIT_SKIP_TESTS blindspots Currently, the tests for GIT_SKIP_TESTS do not cover the situation where we skip an entire test suite. The tests also do not cover the situation where we have GIT_SKIP_TESTS defined but the test suite does not match. Add two test cases so we cover this blindspot. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2019, 01:47:08 UTC |
| d8bc1a5 | Jonathan Tan | 08 October 2019, 18:37:39 UTC | send-pack: never fetch when checking exclusions When building the packfile to be sent, send_pack() is given a list of remote refs to be used as exclusions. For each ref, it first checks if the ref exists locally, and if it does, passes it with a "^" prefix to pack-objects. However, in a partial clone, the check may trigger a lazy fetch. The additional commit ancestry information obtained during such fetches may show that certain objects that would have been sent are already known to the server, resulting in a smaller pack being sent. But this is at the cost of fetching from many possibly unrelated refs, and the lazy fetches do not help at all in the typical case where the client is up-to-date with the upstream of the branch being pushed. Ensure that these lazy fetches do not occur. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2019, 01:46:41 UTC |
| 756fb0d | Denton Liu | 08 October 2019, 09:14:11 UTC | t4014: treat rev-list output as the expected value In 6bd26f58ea (t4014: use test_line_count() where possible, 2019-08-27), we converted many test cases to take advantage of the test_line_count() function. In one conversion, we inverted the expected and actual value as tested by test_line_count(). Although functionally correct, if format-patch ever produced incorrect output, the debugging output would be a bunch of hashes which would be difficult to debug. Invert the expected and actual values provided to test_line_count() so that if format-patch produces incorrect output, the debugging output will be a list of human-readable files instead. Helped-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2019, 01:44:40 UTC |
| 2b6a9b1 | Thomas Gummerer | 08 October 2019, 17:38:43 UTC | range-diff: don't segfault with mode-only changes In ef283b3699 ("apply: make parse_git_diff_header public", 2019-07-11) the 'parse_git_diff_header' function was made public and useable by callers outside of apply.c. However it was missed that its (then) only caller, 'find_header' did some error handling, and completing 'struct patch' appropriately. range-diff then started using this function, and tried to handle this appropriately itself, but fell short in some cases. This in turn would lead to range-diff segfaulting when there are mode-only changes in a range. Move the error handling and completing of the struct into the 'parse_git_diff_header' function, so other callers can take advantage of it. This fixes the segfault in 'git range-diff'. Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2019, 01:41:11 UTC |
| 360c7ba | Junio C Hamano | 08 October 2019, 04:18:24 UTC | transport: push codepath can take arbitrary repository The previous step added annotations with "the_repository" to various functions in the push codepath in the transport layer, but they all can take arbitrary repository pointer, and may be working on a repository that is not the_repository. Fix them. Signed-off-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2019, 04:20:01 UTC |
| ce2d7ed | Garima Singh | 07 October 2019, 19:38:56 UTC | sq_quote_buf_pretty: don't drop empty arguments Empty arguments passed on the command line can be represented by a '', however sq_quote_buf_pretty was incorrectly dropping these arguments altogether. Fix this problem by ensuring that such arguments are emitted as '' instead. Signed-off-by: Garima Singh <garima.singh@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2019, 03:59:29 UTC |
| b657047 | Elijah Newren | 07 October 2019, 15:52:11 UTC | merge-recursive: fix the fix to the diff3 common ancestor label In commit 8e4ec337 ("merge-recursive: fix the diff3 common ancestor label for virtual commits", 2019-10-01), which was a fix to commit 743474cbfa8b ("merge-recursive: provide a better label for diff3 common ancestor", 2019-08-17), the label for the common ancestor was changed from always being "merged common ancestors" to instead be based on the number of merge bases and whether the merge base was a real commit or a virtual one: >=2: "merged common ancestors" 1, via merge_recursive_generic: "constructed merge base" 1, otherwise: <abbreviated commit hash> 0: "<empty tree>" The handling for "constructed merge base" worked by allowing opt->ancestor to be set in merge_recursive_generic(), so we paid attention to the setting of that variable in merge_recursive_internal(). Now, for the outer merge, the code flow was simply the following: ancestor_name = "merged merge bases" loop over merge_bases: merge_recursive_internal() The first merge base not needing recursion would determine its own ancestor_name however necessary and thus run ancestor_name = $SOMETHING empty loop over merge_bases... opt->ancestor = ancestor_name merge_trees_internal() Now, the next set of merge_bases that would need to be merged after this particular merge had completed would note that opt->ancestor has been set to something (to a local ancestor_name variable that has since been popped off the stack), and thus it would run: ... else if (opt->ancestor) { ancestor_name = opt->ancestor; /* OOPS! */ loop over merge_bases: merge_recursive_internal() opt->ancestor = ancestor_name merge_trees_internal() This resulted in garbage strings being printed for the virtual merge bases, which was visible in git.git by just merging commit b744c3af07 into commit 6d8cb22a4f. There are two ways to fix this: set opt->ancestor to NULL after using it to avoid re-use, or add a !opt->priv->call_depth check to the if block for using a pre-defined opt->ancestor. Apply both fixes. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2019, 02:36:27 UTC |
| b744c3a | Junio C Hamano | 07 October 2019, 02:33:44 UTC | Sixth batch Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 October 2019, 02:33:44 UTC |
| 4170565 | Junio C Hamano | 07 October 2019, 02:33:03 UTC | Merge branch 'bw/submodule-helper-usage-fix' Typofix. * bw/submodule-helper-usage-fix: builtin/submodule--helper: fix usage string for 'update-clone' | 07 October 2019, 02:33:03 UTC |
| 9728ab4 | Junio C Hamano | 07 October 2019, 02:33:02 UTC | Merge branch 'dl/honor-cflags-in-hdr-check' Dev support. * dl/honor-cflags-in-hdr-check: ci: run `hdr-check` as part of the `Static Analysis` job Makefile: emulate compile in $(HCO) target better pack-bitmap.h: remove magic number promisor-remote.h: include missing header apply.h: include missing header | 07 October 2019, 02:33:02 UTC |
| 1f314d5 | Junio C Hamano | 07 October 2019, 02:33:02 UTC | Merge branch 'cb/do-not-use-test-cmp-with-a' Test portability fix. * cb/do-not-use-test-cmp-with-a: t4038: Remove non-portable '-a' option passed to test_cmp | 07 October 2019, 02:33:02 UTC |
| 59b19bc | Junio C Hamano | 07 October 2019, 02:33:02 UTC | Merge branch 'cc/multi-promisor' Cleanup. * cc/multi-promisor: promisor-remote: skip move_to_tail when no-op promisor-remote.h: drop extern from function declaration | 07 October 2019, 02:33:02 UTC |
| 1f4485b | Junio C Hamano | 07 October 2019, 02:33:02 UTC | Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way' A bug in merge-recursive code that triggers when a branch with a symbolic link is merged with a branch that replaces it with a directory has been fixed. * jt/merge-recursive-symlink-is-not-a-dir-in-way: merge-recursive: symlink's descendants not in way | 07 October 2019, 02:33:02 UTC |
| 5ecdbfa | Junio C Hamano | 07 October 2019, 02:33:01 UTC | Merge branch 'ps/my-first-contribution-alphasort' Docfix. * ps/my-first-contribution-alphasort: doc: MyFirstContribution: fix cmd placement instructions | 07 October 2019, 02:33:01 UTC |
| eb35c18 | Junio C Hamano | 07 October 2019, 02:33:01 UTC | Merge branch 'sg/travis-help-debug' Dev support update. * sg/travis-help-debug: travis-ci: do not skip successfully tested trees in debug mode | 07 October 2019, 02:33:01 UTC |
| cabb145 | Junio C Hamano | 07 October 2019, 02:33:01 UTC | Merge branch 'rs/alias-use-copy-array' Code cleanup. * rs/alias-use-copy-array: git: use COPY_ARRAY and MOVE_ARRAY in handle_alias() | 07 October 2019, 02:33:01 UTC |
| 56c7ab0 | Junio C Hamano | 07 October 2019, 02:33:00 UTC | Merge branch 'sg/t-helper-gitignore' Update the way build artifacts in t/helper/ directory are ignored. * sg/t-helper-gitignore: t/helper: ignore only executable files | 07 October 2019, 02:33:01 UTC |
| e5ce62b | Junio C Hamano | 07 October 2019, 02:33:00 UTC | Merge branch 'cc/svn-fe-py-shebang' * cc/svn-fe-py-shebang: contrib/svn-fe: fix shebang for svnrdump_sim.py | 07 October 2019, 02:33:00 UTC |
| 583cf62 | Junio C Hamano | 07 October 2019, 02:33:00 UTC | Merge branch 'ah/doc-submodule-ignore-submodules' Docfix. * ah/doc-submodule-ignore-submodules: doc: fix reference to --ignore-submodules | 07 October 2019, 02:33:00 UTC |
| 337e3f2 | Junio C Hamano | 07 October 2019, 02:32:59 UTC | Merge branch 'rs/nth-switch-code-simplification' Code simplification. * rs/nth-switch-code-simplification: sha1_name: simplify strbuf handling in interpret_nth_prior_checkout() | 07 October 2019, 02:33:00 UTC |
| 8f53fe1 | Junio C Hamano | 07 October 2019, 02:32:59 UTC | Merge branch 'hb/hg-to-git-py3' The hg-to-git script (in contrib/) has been updated to work with Python 3. * hb/hg-to-git-py3: hg-to-git: make it compatible with both python3 and python2 | 07 October 2019, 02:32:59 UTC |
| ef93bfb | Junio C Hamano | 07 October 2019, 02:32:59 UTC | Merge branch 'sg/progress-fix' Regression fix for progress output. * sg/progress-fix: Test the progress display Revert "progress: use term_clear_line()" | 07 October 2019, 02:32:59 UTC |
| 980351d | Junio C Hamano | 07 October 2019, 02:32:59 UTC | Merge branch 'js/doc-patch-text' Docfix. * js/doc-patch-text: diff, log doc: small grammer, format, and language fixes diff, log doc: say "patch text" instead of "patches" | 07 October 2019, 02:32:59 UTC |
| 80693e3 | Junio C Hamano | 07 October 2019, 02:32:58 UTC | Merge branch 'tb/commit-graph-harden' The code to parse and use the commit-graph file has been made more robust against corrupted input. * tb/commit-graph-harden: commit-graph.c: handle corrupt/missing trees commit-graph.c: handle commit parsing errors t/t5318: introduce failing 'git commit-graph write' tests | 07 October 2019, 02:32:58 UTC |
| ae203ba | Junio C Hamano | 07 October 2019, 02:32:58 UTC | Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge' The cache-tree code has been taught to be less aggressive in attempting to see if a tree object it computed already exists in the repository. * jt/cache-tree-avoid-lazy-fetch-during-merge: cache-tree: do not lazy-fetch tentative tree | 07 October 2019, 02:32:58 UTC |
| 3f84633 | Junio C Hamano | 07 October 2019, 02:32:58 UTC | Merge branch 'dl/cocci-everywhere' Coccinelle checks are done on more source files than before now. * dl/cocci-everywhere: Makefile: run coccicheck on more source files Makefile: strip leading ./ in $(FIND_SOURCE_FILES) Makefile: define THIRD_PARTY_SOURCES Makefile: strip leading ./ in $(LIB_H) | 07 October 2019, 02:32:58 UTC |
| caf150c | Junio C Hamano | 07 October 2019, 02:32:57 UTC | Merge branch 'gs/commit-graph-progress' * gs/commit-graph-progress: commit-graph: add --[no-]progress to write and verify | 07 October 2019, 02:32:57 UTC |
| 1d8b0df | Junio C Hamano | 07 October 2019, 02:32:57 UTC | Merge branch 'ms/fetch-follow-tag-optim' The code used in following tags in "git fetch" has been optimized. * ms/fetch-follow-tag-optim: fetch: use oidset to keep the want OIDs for faster lookup | 07 October 2019, 02:32:57 UTC |
| 1398171 | Junio C Hamano | 07 October 2019, 02:32:57 UTC | Merge branch 'rs/commit-graph-use-list-count' Code cleanup. * rs/commit-graph-use-list-count: commit-graph: use commit_list_count() | 07 October 2019, 02:32:57 UTC |
| 773521d | Junio C Hamano | 07 October 2019, 02:32:57 UTC | Merge branch 'rs/nth-parent-parse' The object name parser for "Nth parent" syntax has been made more robust against integer overflows. * rs/nth-parent-parse: sha1-name: check for overflow of N in "foo^N" and "foo~N" rev-parse: demonstrate overflow of N for "foo^N" and "foo~N" | 07 October 2019, 02:32:57 UTC |
| 7f17913 | Junio C Hamano | 07 October 2019, 02:32:56 UTC | Merge branch 'dl/submodule-set-branch' Docfix. * dl/submodule-set-branch: git-submodule.txt: fix AsciiDoc formatting error | 07 October 2019, 02:32:56 UTC |
| cb3ec6f | Junio C Hamano | 07 October 2019, 02:32:56 UTC | Merge branch 'cs/pretty-formats-doc-typofix' Doc fix. * cs/pretty-formats-doc-typofix: doc: minor formatting fix | 07 October 2019, 02:32:56 UTC |
| bbfe5f2 | Junio C Hamano | 07 October 2019, 02:32:56 UTC | Merge branch 'jk/list-objects-optim-wo-trees' The object traversal machinery has been optimized not to load tree objects when we are only interested in commit history. * jk/list-objects-optim-wo-trees: list-objects: don't queue root trees unless revs->tree_objects is set | 07 October 2019, 02:32:56 UTC |
