From: Junio C Hamano Date: Wed, 19 Apr 2017 05:42:39 +0000 (-0700) Subject: What's cooking (2017/04 #03) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=593695fe106f842d958a2297cd5cec25989ab955;p=thirdparty%2Fgit.git What's cooking (2017/04 #03) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index ce8f35e9ea..c81fb074d5 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Apr 2017, #02; Sun, 16) +Subject: What's cooking in git.git (Apr 2017, #03; Tue, 18) X-master-at: 584f8975d2d9530a34bd0b936ae774f82fe30fed -X-next-at: 2cccc8116438182c988c7f26d9559a1c22e78f1c +X-next-at: 79292aac69b6a4563ffbc4589a70ae46f7eb15cb -What's cooking in git.git (Apr 2017, #02; Sun, 16) +What's cooking in git.git (Apr 2017, #03; Tue, 18) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with @@ -18,114 +18,252 @@ of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -------------------------------------------------- -[Graduated to "master"] +[New Topics] -* ab/regen-perl-mak-with-different-perl (2017-03-29) 1 commit - (merged to 'next' on 2017-04-11 at 706b224f1e) - + perl: regenerate perl.mak if perl -V changes +* df/dir-iter-remove-subtree (2017-04-17) 5 commits + - remove_subtree(): reimplement using iterators + - dir_iterator: refactor state machine model + - dir_iterator: add helpers to dir_iterator_advance + - remove_subtree(): test removing nested directories + - dir_iterator: add tests for dir_iterator API - Update the build dependency so that an update to /usr/bin/perl - etc. result in recomputation of perl.mak file. + Update the dir-iterator API and use it to reimplement + remove_subtree(). + Waiting for response to review. + GSoC microproject. -* jc/bs-t-is-not-a-tab-for-sed (2017-03-31) 1 commit - (merged to 'next' on 2017-04-11 at 5573b2c49b) - + contrib/git-resurrect.sh: do not write \t for HT in sed scripts - Code cleanup. +* jk/ls-files-recurse-submodules-fix (2017-04-18) 2 commits + - ls-files: fix path used when recursing into submodules + - ls-files: fix recurse-submodules with nested submodules + "ls-files --recurse-submodules" did not quite work well in a + project with nested submodules. -* jc/unused-symbols (2017-03-31) 1 commit - (merged to 'next' on 2017-04-11 at 750a6d9e97) - + remote.[ch]: parse_push_cas_option() can be static + Will merge to 'next'. - Code cleanup. +* jt/fetch-pack-error-reporting (2017-04-17) 1 commit + - fetch-pack: show clearer error message upon ERR + + "git fetch-pack" was not prepared to accept ERR packet that the + upload-pack can send with a human-readable error message. It + showed the packet contents with ERR prefix, so there was no data + loss, but it was redundant to say "ERR" in an error message. -* jk/loose-object-info-report-error (2017-04-01) 2 commits - (merged to 'next' on 2017-04-11 at 3a33761d94) - + index-pack: detect local corruption in collision check - + sha1_loose_object_info: return error for corrupted objects - - Update error handling for codepath that deals with corrupt loose - objects. - - -* jk/snprintf-cleanups (2017-03-30) 18 commits - (merged to 'next' on 2017-04-11 at 42ac56e886) - + daemon: use an argv_array to exec children - + gc: replace local buffer with git_path - + transport-helper: replace checked snprintf with xsnprintf - + convert unchecked snprintf into xsnprintf - + combine-diff: replace malloc/snprintf with xstrfmt - + replace unchecked snprintf calls with heap buffers - + receive-pack: print --pack-header directly into argv array - + name-rev: replace static buffer with strbuf - + create_branch: use xstrfmt for reflog message - + create_branch: move msg setup closer to point of use - + avoid using mksnpath for refs - + avoid using fixed PATH_MAX buffers for refs - + fetch: use heap buffer to format reflog - + tag: use strbuf to format tag header - + diff: avoid fixed-size buffer for patch-ids - + odb_mkstemp: use git_path_buf - + odb_mkstemp: write filename into strbuf - + do not check odb_mkstemp return value for errors - - Code clean-up. - - -* js/difftool-builtin (2017-04-13) 2 commits - (merged to 'next' on 2017-04-15 at 0040a91b86) - + difftool: fix use-after-free - (merged to 'next' on 2017-04-11 at 38df92441f) - + difftool: avoid strcpy + Will merge to 'next'. + + +* nd/conditional-config-in-early-config (2017-04-17) 3 commits + - config: correct file reading order in read_early_config() + - config: handle conditional include when $GIT_DIR is not set up + - config: prepare to pass more info in git_config_with_options() + + The recently introduced conditional inclusion of configuration did + not work well when early-config mechanism was involved. + + Will merge to 'next'. + + +* sb/checkout-recurse-submodules (2017-04-17) 1 commit + - submodule: remove a superfluous second check for the "new" variable Code cleanup. + Will merge to 'next'. -* mm/ls-files-s-doc (2017-04-01) 1 commit - (merged to 'next' on 2017-04-11 at 7e55625b1e) - + Documentation: document elements in "ls-files -s" output in order - Doc update. +* xy/format-patch-base (2017-04-17) 1 commit + - doc: trivial typo in git-format-patch.txt + Doc cleanup. + + Will merge to 'next'. -* qp/bisect-docfix (2017-04-01) 1 commit - (merged to 'next' on 2017-04-11 at 9c20eba240) - + git-bisect.txt: add missing word - Doc update. +* jk/snprintf-cleanups (2017-04-17) 1 commit + - replace: plug a memory leak + Hotfix for a topic that is already in 'master'. + + Will merge to 'next'. + + +* ab/clone-no-tags (2017-04-18) 1 commit + - clone: add a --no-tags option to clone without tags -* sb/show-diff-for-submodule-in-diff-fix (2017-04-02) 1 commit - (merged to 'next' on 2017-04-11 at 8d16ef369e) - + diff: submodule inline diff to initialize env array. + "git clone" learned the "--no-tags" option not to fetch all tags + initially, and also set up the tagopt not to follow any tags in + subsequent fetches. - "git diff --submodule=diff" learned to work better in a project - with a submodule that in turn has its own submodules. +* ab/completion-push-delete-ref (2017-04-18) 1 commit + - completion: expand "push --delete " for refs on that -* sb/unpack-trees-would-lose-submodule-message-update (2017-03-29) 1 commit - (merged to 'next' on 2017-04-11 at 61d8ce8218) - + unpack-trees.c: align submodule error message to the other error messages + The completion script (in contrib/) learned to complete "git push + --delete b" to complete branch name to be deleted. - Update an error message. + +* bw/forking-and-threading (2017-04-18) 11 commits + - run-command: block signals between fork and execve + - run-command: add note about forking and threading + - run-command: handle dup2 and close errors in child + - run-command: eliminate calls to error handling functions in child + - run-command: don't die in child when duping /dev/null + - run-command: prepare child environment before forking + - string-list: add string_list_remove function + - run-command: use the async-signal-safe execv instead of execvp + - run-command: prepare command before forking + - t0061: run_command executes scripts without a #! line + - t5550: use write_script to generate post-update hook + + +* sb/reset-recurse-submodules (2017-04-18) 4 commits + - builtin/reset: add --recurse-submodules switch + - submodule.c: submodule_move_head works with broken submodules + - submodule.c: uninitialized submodules are ignored in recursive commands + - entry.c: submodule recursing: respect force flag correctly + + "git reset" learned "--recurse-submodules" option. -------------------------------------------------- -[New Topics] +[Stalled] + +* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit + - clone: respect configured fetch respecs during initial fetch + + Expecting a reroll. + cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net> + cf. + Some nits but looks ok. + + +* sk/dash-is-previous (2017-03-01) 5 commits + - revert.c: delegate handling of "-" shorthand to setup_revisions + - sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}" + - revision.c: args starting with "-" might be a revision + - revision.c: swap if/else blocks + - revision.c: do not update argv with unknown option + + A dash "-" can be written to mean "the branch that was previously + checked out" in more places. + + Needs review. + cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com> + + +* ls/filter-process-delayed (2017-03-06) 1 commit + - convert: add "status=delayed" to filter process protocol + + What's the status of this one??? + cf. + + +* nd/worktree-move (2017-01-27) 7 commits + . fixup! worktree move: new command + . worktree remove: new command + . worktree move: refuse to move worktrees with submodules + . worktree move: accept destination as directory + . worktree move: new command + . worktree.c: add update_worktree_location() + . worktree.c: add validate_worktree() + + "git worktree" learned move and remove subcommands. + + Tentatively ejected as it seems to break 'pu' when merged. + + +* pb/bisect (2017-02-18) 28 commits + - fixup! bisect--helper: `bisect_next_check` & bisect_voc shell function in C + - bisect--helper: remove the dequote in bisect_start() + - bisect--helper: retire `--bisect-auto-next` subcommand + - bisect--helper: retire `--bisect-autostart` subcommand + - bisect--helper: retire `--bisect-write` subcommand + - bisect--helper: `bisect_replay` shell function in C + - bisect--helper: `bisect_log` shell function in C + - bisect--helper: retire `--write-terms` subcommand + - bisect--helper: retire `--check-expected-revs` subcommand + - bisect--helper: `bisect_state` & `bisect_head` shell function in C + - bisect--helper: `bisect_autostart` shell function in C + - bisect--helper: retire `--next-all` subcommand + - bisect--helper: retire `--bisect-clean-state` subcommand + - bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C + - t6030: no cleanup with bad merge base + - bisect--helper: `bisect_start` shell function partially in C + - bisect--helper: `get_terms` & `bisect_terms` shell function in C + - bisect--helper: `bisect_next_check` & bisect_voc shell function in C + - bisect--helper: `check_and_set_terms` shell function in C + - bisect--helper: `bisect_write` shell function in C + - bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C + - bisect--helper: `bisect_reset` shell function in C + - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file() + - t6030: explicitly test for bisection cleanup + - bisect--helper: `bisect_clean_state` shell function in C + - bisect--helper: `write_terms` shell function in C + - bisect: rewrite `check_term_format` shell function in C + - bisect--helper: use OPT_CMDMODE instead of OPT_BOOL + + Move more parts of "git bisect" to C. + + Expecting a reroll. + cf. + cf. + cf. + + +* sh/grep-tree-obj-tweak-output (2017-01-20) 2 commits + - grep: use '/' delimiter for paths + - grep: only add delimiter if there isn't one already + + "git grep", when fed a tree-ish as an input, shows each hit + prefixed with ":::". As is + almost always either a commit or a tag that points at a commit, the + early part of the output ":" can be used as the + name of the blob and given to "git show". When is a + tree given in the extended SHA-1 syntax (e.g. ":", or + ":"), however, this results in a string that does not + name a blob (e.g. "::" or "::"). + "git grep" has been taught to be a bit more intelligent about these + cases and omit a colon (in the former case) or use slash (in the + latter case) to produce ":" and + ":/" that can be used as the name of a blob. + + Expecting a reroll? Is this good enough with known limitations? + + +* jc/diff-b-m (2015-02-23) 5 commits + . WIPWIP + . WIP: diff-b-m + - diffcore-rename: allow easier debugging + - diffcore-rename.c: add locate_rename_src() + - diffcore-break: allow debugging + + "git diff -B -M" produced incorrect patch when the postimage of a + completely rewritten file is similar to the preimage of a removed + file; such a resulting file must not be expressed as a rename from + other place. + + The fix in this patch is broken, unfortunately. + + Will discard. + +-------------------------------------------------- +[Cooking] * ah/diff-files-ours-theirs-doc (2017-04-13) 1 commit - - diff-files: document --ours etc. + (merged to 'next' on 2017-04-18 at a4f80f0c3f) + + diff-files: document --ours etc. The diff options "--ours", "--theirs" exist for quite some time. But so far they were not documented. Now they are. - Will merge to 'next'. + Will merge to 'master'. -* dt/xgethostname-nul-termination (2017-04-13) 1 commit +* dt/xgethostname-nul-termination (2017-04-18) 2 commits - xgethostname: handle long hostnames + - use HOST_NAME_MAX to size buffers for gethostname(2) gethostname(2) may not NUL terminate the buffer if hostname does not fit; unfortunately there is no easy way to see if our buffer @@ -167,14 +305,15 @@ of the repositories listed at * jk/no-looking-at-dotgit-outside-repo (2017-04-16) 2 commits - - test-read-cache: setup git dir - - has_sha1_file: don't bother if we are not in a repository + (merged to 'next' on 2017-04-18 at 68260787ad) + + test-read-cache: setup git dir + + has_sha1_file: don't bother if we are not in a repository Clean up fallouts from recent tightening of the set-up sequence, where Git barfs when repository information is accessed without first ensuring that it was started in a repository. - Will merge to 'next'. + Will merge to 'master'. * ls/travis-doc-asciidoctor (2017-04-16) 3 commits @@ -222,11 +361,12 @@ of the repositories listed at * sb/submodule-rm-absorb (2017-04-13) 1 commit - - submodule.c: add missing ' in error messages + (merged to 'next' on 2017-04-18 at 179081f848) + + submodule.c: add missing ' in error messages Error message fix. - Will merge to 'next'. + Will merge to 'master'. * sr/http-proxy-configuration-fix (2017-04-13) 2 commits @@ -248,30 +388,36 @@ of the repositories listed at * va/i18n-perl-scripts (2017-04-13) 1 commit - - git-add--interactive.perl: add missing dot in a message + (merged to 'next' on 2017-04-18 at 89f1c77091) + + git-add--interactive.perl: add missing dot in a message Message fix. - Will merge to 'next'. + Will merge to 'master'. * bw/submodule-is-active (2017-04-13) 1 commit - - submodule--helper: fix typo in is_active error message + (merged to 'next' on 2017-04-18 at 25b05ec29e) + + submodule--helper: fix typo in is_active error message Error message fix. - Will merge to 'next'. + Will merge to 'master'. -* gb/rebase-signoff (2017-04-16) 3 commits +* gb/rebase-signoff (2017-04-18) 3 commits - rebase: pass --[no-]signoff option to git am - builtin/am: fold am_signoff() into am_append_signoff() - builtin/am: honor --signoff also when --rebasing "git rebase" learns "--signoff" option. + Will merge to 'next'. + -* jh/add-index-entry-optim (2017-04-15) 3 commits +* jh/add-index-entry-optim (2017-04-17) 5 commits + - read-cache: speed up has_dir_name (part 2) + - read-cache: speed up has_dir_name (part 1) - read-cache: speed up add_index_entry during checkout - p0006-read-tree-checkout: perf test to time read-tree - read-cache: add strcmp_offset function @@ -284,13 +430,14 @@ of the repositories listed at * ab/grep-plug-pathspec-leak (2017-04-16) 1 commit - - grep: plug a trivial memory leak + (merged to 'next' on 2017-04-18 at d8f00b5e44) + + grep: plug a trivial memory leak Call clear_pathspec() to release resources immediately before the cmd_grep() function returns. - Will merge to 'next'. - Meh. + Will merge to 'master'. + * ab/grep-threading-cleanup (2017-04-16) 8 commits - grep: given --threads with NO_PTHREADS=YesPlease, warn @@ -304,10 +451,11 @@ of the repositories listed at * bw/attr-pathspec (2017-04-16) 1 commit - - pathspec: fix segfault in clear_pathspec + (merged to 'next' on 2017-04-18 at 2644ca1269) + + pathspec: fix segfault in clear_pathspec - Will merge to 'next'. - Hotfix for a topic already in 'master'. + Will merge to 'master'. + Hotfix for a topic already in 'master'. * bw/submodule-with-bs-path (2017-04-16) 1 commit @@ -320,10 +468,11 @@ of the repositories listed at * dt/gc-ignore-old-gc-logs (2017-04-16) 1 commit - - t6500: wait for detached auto gc at the end of the test script + (merged to 'next' on 2017-04-18 at caadf4ff66) + + t6500: wait for detached auto gc at the end of the test script - Will merge to 'next'. - Hotfix for a topic already in 'master'. + Will merge to 'master'. + Hotfix for a topic already in 'master'. * jk/loose-object-fsck (2017-04-16) 1 commit @@ -345,14 +494,15 @@ of the repositories listed at * ld/p4-current-branch-fix (2017-04-16) 3 commits - - git-p4: don't use name-rev to get current branch - - git-p4: add read_pipe_text() internal function - - git-p4: add failing test for name-rev rather than symbolic-ref + (merged to 'next' on 2017-04-18 at 9e74a2609e) + + git-p4: don't use name-rev to get current branch + + git-p4: add read_pipe_text() internal function + + git-p4: add failing test for name-rev rather than symbolic-ref "git p4" used "name-rev HEAD" when it wants to learn what branch is checked out; it should use "symbolic-ref HEAD". - Will merge to 'next'. + Will merge to 'master'. * ls/travis-coccicheck (2017-04-16) 1 commit @@ -361,7 +511,7 @@ of the repositories listed at Travis CI learns to run coccicheck. -* rs/misc-cppcheck-fixes (2017-04-16) 3 commits +* rs/misc-cppcheck-fixes (2017-04-17) 3 commits - server-info: avoid calling fclose(3) twice in update_info_file() - files_for_each_reflog_ent_reverse(): close stream and free strbuf on error - am: close stream on error, but not stdin @@ -371,10 +521,11 @@ of the repositories listed at * sf/putty-w-args (2017-04-16) 1 commit - - connect.c: handle errors from split_cmdline + (merged to 'next' on 2017-04-18 at cbf042088c) + + connect.c: handle errors from split_cmdline - Will merge to 'next'. - Hotfix for a topic already in 'master'. + Will merge to 'master'. + Hotfix for a topic already in 'master'. * km/t1400-modernization (2017-04-16) 1 commit @@ -386,135 +537,13 @@ of the repositories listed at * vn/revision-shorthand-for-side-branch-log (2017-04-16) 1 commit - - doc/revisions: remove brackets from rev^-n shorthand + (merged to 'next' on 2017-04-18 at 9fbe55bfef) + + doc/revisions: remove brackets from rev^-n shorthand Doc cleanup. - Will merge to 'next'. - --------------------------------------------------- -[Stalled] - -* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit - - clone: respect configured fetch respecs during initial fetch - - Expecting a reroll. - cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net> - cf. - Some nits but looks ok. - - -* sk/dash-is-previous (2017-03-01) 5 commits - - revert.c: delegate handling of "-" shorthand to setup_revisions - - sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}" - - revision.c: args starting with "-" might be a revision - - revision.c: swap if/else blocks - - revision.c: do not update argv with unknown option - - A dash "-" can be written to mean "the branch that was previously - checked out" in more places. - - Needs review. - cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com> - - -* ls/filter-process-delayed (2017-03-06) 1 commit - - convert: add "status=delayed" to filter process protocol - - What's the status of this one??? - cf. - - -* nd/worktree-move (2017-01-27) 7 commits - . fixup! worktree move: new command - . worktree remove: new command - . worktree move: refuse to move worktrees with submodules - . worktree move: accept destination as directory - . worktree move: new command - . worktree.c: add update_worktree_location() - . worktree.c: add validate_worktree() - - "git worktree" learned move and remove subcommands. - - Tentatively ejected as it seems to break 'pu' when merged. - - -* pb/bisect (2017-02-18) 28 commits - - fixup! bisect--helper: `bisect_next_check` & bisect_voc shell function in C - - bisect--helper: remove the dequote in bisect_start() - - bisect--helper: retire `--bisect-auto-next` subcommand - - bisect--helper: retire `--bisect-autostart` subcommand - - bisect--helper: retire `--bisect-write` subcommand - - bisect--helper: `bisect_replay` shell function in C - - bisect--helper: `bisect_log` shell function in C - - bisect--helper: retire `--write-terms` subcommand - - bisect--helper: retire `--check-expected-revs` subcommand - - bisect--helper: `bisect_state` & `bisect_head` shell function in C - - bisect--helper: `bisect_autostart` shell function in C - - bisect--helper: retire `--next-all` subcommand - - bisect--helper: retire `--bisect-clean-state` subcommand - - bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C - - t6030: no cleanup with bad merge base - - bisect--helper: `bisect_start` shell function partially in C - - bisect--helper: `get_terms` & `bisect_terms` shell function in C - - bisect--helper: `bisect_next_check` & bisect_voc shell function in C - - bisect--helper: `check_and_set_terms` shell function in C - - bisect--helper: `bisect_write` shell function in C - - bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C - - bisect--helper: `bisect_reset` shell function in C - - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file() - - t6030: explicitly test for bisection cleanup - - bisect--helper: `bisect_clean_state` shell function in C - - bisect--helper: `write_terms` shell function in C - - bisect: rewrite `check_term_format` shell function in C - - bisect--helper: use OPT_CMDMODE instead of OPT_BOOL - - Move more parts of "git bisect" to C. - - Expecting a reroll. - cf. - cf. - cf. - - -* sh/grep-tree-obj-tweak-output (2017-01-20) 2 commits - - grep: use '/' delimiter for paths - - grep: only add delimiter if there isn't one already - - "git grep", when fed a tree-ish as an input, shows each hit - prefixed with ":::". As is - almost always either a commit or a tag that points at a commit, the - early part of the output ":" can be used as the - name of the blob and given to "git show". When is a - tree given in the extended SHA-1 syntax (e.g. ":", or - ":"), however, this results in a string that does not - name a blob (e.g. "::" or "::"). - "git grep" has been taught to be a bit more intelligent about these - cases and omit a colon (in the former case) or use slash (in the - latter case) to produce ":" and - ":/" that can be used as the name of a blob. - - Expecting a reroll? Is this good enough with known limitations? - - -* jc/diff-b-m (2015-02-23) 5 commits - . WIPWIP - . WIP: diff-b-m - - diffcore-rename: allow easier debugging - - diffcore-rename.c: add locate_rename_src() - - diffcore-break: allow debugging - - "git diff -B -M" produced incorrect patch when the postimage of a - completely rewritten file is similar to the preimage of a removed - file; such a resulting file must not be expressed as a rename from - other place. + Will merge to 'master'. - The fix in this patch is broken, unfortunately. - - Will discard. - --------------------------------------------------- -[Cooking] * dt/http-postbuffer-can-be-large (2017-04-13) 1 commit - http.postbuffer: allow full range of ssize_t values @@ -526,7 +555,9 @@ of the repositories listed at Will merge to 'next'. -* jh/memihash-opt (2017-04-12) 3 commits +* jh/memihash-opt (2017-04-18) 4 commits + (merged to 'next' on 2017-04-18 at 6555be6bab) + + p0004: make perf test executable (merged to 'next' on 2017-04-15 at 6bfc58e19a) + t3008: skip lazy-init test on a single-core box + test-online-cpus: helper to return cpu count @@ -736,34 +767,35 @@ of the repositories listed at * nd/files-backend-git-dir (2017-04-14) 28 commits - - refs.h: add a note about sorting order of for_each_ref_* - - t1406: new tests for submodule ref store - - t1405: some basic tests on main ref store - - t/helper: add test-ref-store to test ref-store functions - - refs: delete pack_refs() in favor of refs_pack_refs() - - files-backend: avoid ref api targeting main ref store - - refs: new transaction related ref-store api - - refs: add new ref-store api - - refs: rename get_ref_store() to get_submodule_ref_store() and make it public - - files-backend: replace submodule_allowed check in files_downcast() - - refs: move submodule code out of files-backend.c - - path.c: move some code out of strbuf_git_path_submodule() - - refs.c: make get_main_ref_store() public and use it - - refs.c: kill register_ref_store(), add register_submodule_ref_store() - - refs.c: flatten get_ref_store() a bit - - refs: rename lookup_ref_store() to lookup_submodule_ref_store() - - refs.c: introduce get_main_ref_store() - - files-backend: remove the use of git_path() - - files-backend: add and use files_ref_path() - - files-backend: add and use files_reflog_path() - - files-backend: move "logs/" out of TMP_RENAMED_LOG - - files-backend: convert git_path() to strbuf_git_path() - - files-backend: make sure files_rename_ref() always reach the end - - files-backend: add and use files_packed_refs_path() - - files-backend: delete dead code in files_init_db() - - files-backend.c: delete dead code in files_ref_iterator_begin() - - files-backend: make files_log_ref_write() static - - refs.h: add forward declaration for structs used in this file + (merged to 'next' on 2017-04-18 at 79292aac69) + + refs.h: add a note about sorting order of for_each_ref_* + + t1406: new tests for submodule ref store + + t1405: some basic tests on main ref store + + t/helper: add test-ref-store to test ref-store functions + + refs: delete pack_refs() in favor of refs_pack_refs() + + files-backend: avoid ref api targeting main ref store + + refs: new transaction related ref-store api + + refs: add new ref-store api + + refs: rename get_ref_store() to get_submodule_ref_store() and make it public + + files-backend: replace submodule_allowed check in files_downcast() + + refs: move submodule code out of files-backend.c + + path.c: move some code out of strbuf_git_path_submodule() + + refs.c: make get_main_ref_store() public and use it + + refs.c: kill register_ref_store(), add register_submodule_ref_store() + + refs.c: flatten get_ref_store() a bit + + refs: rename lookup_ref_store() to lookup_submodule_ref_store() + + refs.c: introduce get_main_ref_store() + + files-backend: remove the use of git_path() + + files-backend: add and use files_ref_path() + + files-backend: add and use files_reflog_path() + + files-backend: move "logs/" out of TMP_RENAMED_LOG + + files-backend: convert git_path() to strbuf_git_path() + + files-backend: make sure files_rename_ref() always reach the end + + files-backend: add and use files_packed_refs_path() + + files-backend: delete dead code in files_init_db() + + files-backend.c: delete dead code in files_ref_iterator_begin() + + files-backend: make files_log_ref_write() static + + refs.h: add forward declaration for structs used in this file (this branch is used by mh/separate-ref-cache, nd/prune-in-worktree and nd/worktree-kill-parse-ref.) The "submodule" specific field in the ref_store structure is @@ -771,7 +803,7 @@ of the repositories listed at when dealing with ref_store that represents the set of refs visible from the other worktrees. - Will merge to 'next'. + Will merge to 'master'. * jc/bundle (2016-03-03) 6 commits