Commit Graph

  • 1b638216b4 Merge branch 'ds/vscode-settings' Junio C Hamano 2022-07-11 15:38:52 -07:00
  • 6d65013bb7 Merge branch 'cr/setup-bug-typo' Junio C Hamano 2022-07-11 15:38:52 -07:00
  • b5a2d6cc49 Merge branch 'rs/archive-with-internal-gzip' Junio C Hamano 2022-07-11 15:38:51 -07:00
  • c2d01098fb Merge branch 'ds/branch-checked-out' Junio C Hamano 2022-07-11 15:38:51 -07:00
  • 2b970bc09f Merge branch 'jk/optim-promisor-object-enumeration' Junio C Hamano 2022-07-11 15:38:50 -07:00
  • 5dbbdaac79 Merge branch 'ac/bitmap-format-doc' Junio C Hamano 2022-07-11 15:38:50 -07:00
  • 2c8c0b4843 Merge branch 'pb/diff-doc-raw-format' Junio C Hamano 2022-07-11 15:38:49 -07:00
  • 96730964f8 Merge branch 'jk/revisions-doc-markup-fix' Junio C Hamano 2022-07-11 15:38:49 -07:00
  • a2d1f00bdd Merge branch 'rs/combine-diff-with-incompatible-options' Junio C Hamano 2022-07-11 15:38:48 -07:00
  • 359b01ca84 ref-filter: disable save_commit_buffer while traversing Jeff King 2022-07-11 10:48:06 -04:00
  • daf7898abb clone: move unborn head creation to update_head() Jeff King 2022-07-11 05:21:52 -04:00
  • b0c4adcdd7 remote-curl: send Accept-Language header to server Li Linchao 2022-07-11 05:58:54 +00:00
  • 803978da49 gpg-interface: add function for converting trust level to string Jaydeep Das 2022-07-11 05:00:50 +00:00
  • cc74afb83f multi-pack-index: simplify handling of unknown --options SZEDER Gábor 2022-07-10 17:16:45 +02:00
  • f53156f2ee cocci: avoid normalization rules for memcpy René Scharfe 2022-07-10 12:05:51 +02:00
  • e555735836 sha256: add support for Nettle brian m. carlson 2022-07-10 13:29:07 +00:00
  • eee227ad8e builtin/mv.c: use the MOVE_ARRAY() macro instead of memmove() Junio C Hamano 2022-07-09 18:33:54 -07:00
  • 341c4206c6 What's cooking (2022/07 #02) Junio C Hamano 2022-07-08 16:19:42 -07:00
  • f3d7623a13 vimdiff: make layout engine more robust against user vim settings Fernando Ramos 2022-07-08 20:10:24 +02:00
  • f7b587bf65 xdiff: introduce XDL_ALLOC_GROW() Phillip Wood 2022-07-08 16:25:19 +00:00
  • 848fd5ae5b xdiff: introduce XDL_CALLOC_ARRAY() Phillip Wood 2022-07-08 16:25:18 +00:00
  • 18aae7e21e xdiff: introduce xdl_calloc Phillip Wood 2022-07-08 16:25:17 +00:00
  • abf04bdaa8 xdiff: introduce XDL_ALLOC_ARRAY() Phillip Wood 2022-07-08 16:25:16 +00:00
  • 34f67c9619 git-p4: fix bug with encoding of p4 client name Kilian Kilger 2022-07-08 08:01:00 +00:00
  • cc8fcd1e1a clone: use remote branch if it matches default HEAD Jeff King 2022-07-07 19:59:35 -04:00
  • 3d8314f8d1 clone: propagate empty remote HEAD even with other branches Jeff King 2022-07-07 19:57:45 -04:00
  • f77710c504 clone: drop extra newline from warning message Jeff King 2022-07-07 19:54:51 -04:00
  • e16743dc55 Meta/Make: prepare for nettle SHA256 Junio C Hamano 2022-07-06 16:53:34 -07:00
  • 06f5f8940c cocci: generalize "unused" rule to cover more than "strbuf" Ævar Arnfjörð Bjarmason 2022-07-05 15:47:00 +02:00
  • 4f40f6cb73 cocci: add and apply a rule to find "unused" strbufs Ævar Arnfjörð Bjarmason 2022-07-05 15:46:59 +02:00
  • 7a9a10b10e cocci: have "coccicheck{,-pending}" depend on "coccicheck-test" Ævar Arnfjörð Bjarmason 2022-07-05 15:46:58 +02:00
  • f7ff6597a7 cocci: add a "coccicheck-test" target and test *.cocci rules Ævar Arnfjörð Bjarmason 2022-07-05 15:46:57 +02:00
  • af0aa6904b Makefile & .gitignore: ignore & clean "git.res", not "*.res" Ævar Arnfjörð Bjarmason 2022-07-05 15:46:56 +02:00
  • 7b63ea5750 Makefile: remove mandatory "spatch" arguments from SPATCH_FLAGS Ævar Arnfjörð Bjarmason 2022-07-05 15:46:55 +02:00
  • 18337d406f ls-files: update test style Li Linchao 2022-07-03 15:49:09 +00:00
  • 751e165424 merge-ort: fix issue with dual rename and add/add conflict Elijah Newren 2022-07-05 01:33:43 +00:00
  • 3ffbe5a223 merge-ort: shuffle the computation and cleanup of potential collisions Elijah Newren 2022-07-05 01:33:42 +00:00
  • 6dd1f0e9d4 merge-ort: make a separate function for freeing struct collisions Elijah Newren 2022-07-05 01:33:41 +00:00
  • 51e41e4eaf merge-ort: small cleanups of check_for_directory_rename Elijah Newren 2022-07-05 01:33:40 +00:00
  • 0565cee5e4 t6423: add tests of dual directory rename plus add/add conflict Elijah Newren 2022-07-05 01:33:39 +00:00
  • bbea4dcf42 Git 2.37.1 v2.37.1 Junio C Hamano 2022-07-04 13:45:08 -07:00
  • a631e99807 Merge 'js/add-i-delete' into maint-2.37 Junio C Hamano 2022-07-04 13:40:31 -07:00
  • 30cc8d0f14 A regression fix for 2.37 Junio C Hamano 2022-07-02 17:01:34 -07:00
  • 0f0bc2124b Merge branch 'js/add-i-delete' Junio C Hamano 2022-07-02 21:56:08 -07:00
  • c251ee53e7 What's cooking (2022/07 #01) Junio C Hamano 2022-07-01 15:33:44 -07:00
  • b91a2b6594 mv: add check_dir_in_index() and solve general dir check issue Shaoxuan Yuan 2022-06-30 10:37:37 +08:00
  • 24ea81d9ac mv: use flags mode for update_mode Shaoxuan Yuan 2022-06-30 10:37:36 +08:00
  • 8a26a3915f mv: check if <destination> exists in index to handle overwriting Shaoxuan Yuan 2022-06-30 10:37:35 +08:00
  • 6645b03ca5 mv: check if out-of-cone file exists in index with SKIP_WORKTREE bit Shaoxuan Yuan 2022-06-30 10:37:34 +08:00
  • 7889755bae mv: decouple if/else-if checks using goto Shaoxuan Yuan 2022-06-30 10:37:33 +08:00
  • 707fa2f76a mv: update sparsity after moving from out-of-cone to in-cone Shaoxuan Yuan 2022-06-30 10:37:32 +08:00
  • 1143cc01b7 t1092: mv directory from out-of-cone to in-cone Shaoxuan Yuan 2022-06-30 10:37:31 +08:00
  • 367844e5b7 t7002: add tests for moving out-of-cone file/directory Shaoxuan Yuan 2022-06-30 10:37:30 +08:00
  • f40a693450 test-tool delta: fix a memory leak Ævar Arnfjörð Bjarmason 2022-07-01 12:37:40 +02:00
  • 34e691288d test-tool ref-store: fix a memory leak Ævar Arnfjörð Bjarmason 2022-07-01 12:37:39 +02:00
  • 9794633b4e test-tool bloom: fix memory leaks Ævar Arnfjörð Bjarmason 2022-07-01 12:37:38 +02:00
  • 1caaa858cc test-tool json-writer: fix memory leaks Ævar Arnfjörð Bjarmason 2022-07-01 12:37:37 +02:00
  • a20b0dc796 test-tool regex: call regfree(), fix memory leaks Ævar Arnfjörð Bjarmason 2022-07-01 12:37:36 +02:00
  • 1c343e5aef test-tool urlmatch-normalization: fix a memory leak Ævar Arnfjörð Bjarmason 2022-07-01 12:37:35 +02:00
  • 9afa46d4a6 test-tool {dump,scrap}-cache-tree: fix memory leaks Ævar Arnfjörð Bjarmason 2022-07-01 12:37:34 +02:00
  • e287a5b0a4 test-tool path-utils: fix a memory leak Ævar Arnfjörð Bjarmason 2022-07-01 12:37:33 +02:00
  • 330ca8501b test-tool test-hash: fix a memory leak Ævar Arnfjörð Bjarmason 2022-07-01 12:37:32 +02:00
  • ece3974ba6 pull: fix a "struct oid_array" memory leak Ævar Arnfjörð Bjarmason 2022-07-01 12:43:00 +02:00
  • 27472b5195 cat-file: fix a common "struct object_context" memory leak Ævar Arnfjörð Bjarmason 2022-07-01 12:42:59 +02:00
  • 55916bba0f gc: fix a memory leak Ævar Arnfjörð Bjarmason 2022-07-01 12:42:58 +02:00
  • 33d0dda633 checkout: avoid "struct unpack_trees_options" leak Ævar Arnfjörð Bjarmason 2022-07-01 12:42:57 +02:00
  • e72e12cc02 merge-file: fix memory leaks on error path Ævar Arnfjörð Bjarmason 2022-07-01 12:42:56 +02:00
  • 480a0e30a7 merge-file: refactor for subsequent memory leak fix Ævar Arnfjörð Bjarmason 2022-07-01 12:42:55 +02:00
  • d90dafbe31 cat-file: fix a memory leak in --batch-command mode Ævar Arnfjörð Bjarmason 2022-07-01 12:42:54 +02:00
  • fd74ac95ac revert: free "struct replay_opts" members Ævar Arnfjörð Bjarmason 2022-07-01 12:42:53 +02:00
  • bc57ba1d54 submodule.c: free() memory from xgetcwd() Ævar Arnfjörð Bjarmason 2022-07-01 12:42:52 +02:00
  • 74a06a9f21 clone: fix memory leak in wanted_peer_refs() Ævar Arnfjörð Bjarmason 2022-07-01 12:42:51 +02:00
  • 99b6c45d8f check-ref-format: fix trivial memory leak Ævar Arnfjörð Bjarmason 2022-07-01 12:42:50 +02:00
  • ec2f6c0cca t6429: fix use of non-existent function Elijah Newren 2022-07-01 05:19:59 +00:00
  • 3a1ea94a49 commit-graph.c: no lazy fetch in lookup_commit_in_graph() Han Xin 2022-07-01 09:34:30 +08:00
  • 5ad87271cf submodule--helper: remove display path helper Glen Choo 2022-06-30 19:11:57 -07:00
  • d7a714fddc submodule--helper update: use --super-prefix Glen Choo 2022-06-30 19:11:56 -07:00
  • b0f8b21305 submodule--helper: remove unused SUPPORT_SUPER_PREFIX flags Ævar Arnfjörð Bjarmason 2022-06-30 19:11:55 -07:00
  • 58cec298f1 submodule--helper: use correct display path helper Glen Choo 2022-06-30 19:11:54 -07:00
  • cb49e1e8d3 submodule--helper: don't recreate recursive prefix Glen Choo 2022-06-30 19:11:53 -07:00
  • 618b8445d9 submodule--helper update: use display path helper Glen Choo 2022-06-30 19:11:52 -07:00
  • 8fc36c39d9 submodule--helper tests: add missing "display path" coverage Glen Choo 2022-06-30 19:11:51 -07:00
  • c9e221b124 Merge branch 'ab/submodule-cleanup' into gc/submodule-use-super-prefix Junio C Hamano 2022-06-30 15:43:06 -07:00
  • eb1cd60290 config tests: fix harmless but broken "rm -r" cleanup Ævar Arnfjörð Bjarmason 2022-06-30 12:18:36 +02:00
  • 361fa321ec test-lib.sh: fix prepend_var() quoting issue Ævar Arnfjörð Bjarmason 2022-06-30 12:18:35 +02:00
  • 386e7a9d30 tests: add missing double quotes to included library paths Ævar Arnfjörð Bjarmason 2022-06-30 12:18:34 +02:00
  • 54e51e559e git-rebase.txt: use back-ticks consistently Derrick Stolee 2022-06-29 13:21:07 +00:00
  • 14deb585fb pack-objects.h: remove outdated pahole results Taylor Blau 2022-06-28 14:30:20 -04:00
  • 4788e8b256 add --interactive: allow update to stage deleted files Johannes Schindelin 2022-06-28 22:22:44 +00:00
  • a35258c62a gitweb/Makefile: add a "NO_GITWEB" parameter Ævar Arnfjörð Bjarmason 2022-06-28 12:16:02 +02:00
  • d3b827408c Makefile: build 'gitweb' in the default target SZEDER Gábor 2022-06-28 12:16:01 +02:00
  • affc3b755c gitweb/Makefile: include in top-level Makefile Ævar Arnfjörð Bjarmason 2022-06-28 12:16:00 +02:00
  • 27438ef5e0 gitweb: remove "test" and "test-installed" targets Ævar Arnfjörð Bjarmason 2022-06-28 12:15:59 +02:00
  • b82d66eb0c gitweb/Makefile: prepare to merge into top-level Makefile Ævar Arnfjörð Bjarmason 2022-06-28 12:15:58 +02:00
  • 564ebde3d3 gitweb/Makefile: clear up and de-duplicate the gitweb.{css,js} vars Ævar Arnfjörð Bjarmason 2022-06-28 12:15:57 +02:00
  • 1e08fa5e2b gitweb/Makefile: add a $(GITWEB_ALL) variable Ævar Arnfjörð Bjarmason 2022-06-28 12:15:56 +02:00
  • 7decdb9b4a gitweb/Makefile: define all .PHONY prerequisites inline Ævar Arnfjörð Bjarmason 2022-06-28 12:15:55 +02:00
  • 5b893f7d81 git-sh-setup.sh: remove "say" function, change last users Ævar Arnfjörð Bjarmason 2022-06-28 12:05:34 +02:00
  • 2eec463739 git-submodule.sh: use "$quiet", not "$GIT_QUIET" Ævar Arnfjörð Bjarmason 2022-06-28 12:05:33 +02:00
  • b788fc671b submodule--helper: eliminate internal "--update" option Glen Choo 2022-06-28 12:05:32 +02:00