From: Junio C Hamano Date: Wed, 3 Dec 2014 20:59:42 +0000 (-0800) Subject: What's cooking (2014/12 #01) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d91b73d120f78a6cad50e73c50f40b806585677;p=thirdparty%2Fgit.git What's cooking (2014/12 #01) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 349450636d..ebaf171f86 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,20 +1,21 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Nov 2014, #04; Wed, 26) +Subject: What's cooking in git.git (Dec 2014, #01; Wed, 3) X-master-at: b260d265e189728b26e50506ac6ffab6a7d588da X-next-at: a0de725a8ff02c1f2a9452c2234bee819242395c -What's cooking in git.git (Nov 2014, #04; Wed, 26) +What's cooking in git.git (Dec 2014, #01; Wed, 3) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. -I haven't had time to write comments (they are essentially release -notes entries to be used when/if the topic graduates to 'master') -for new topics, but I am pushing this out to show the current state -of affairs. +People, coming up with new topics is fine, but please pay attention +to what is going around the area you are touching. Does your topic +applied to either 'master' or 'maint' merge cleanly to 'next' and +'pu'? If not, please coordinate with whoever is working in the same +area. You can find the changes described here in the integration branches of the repositories listed at @@ -22,74 +23,357 @@ of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -------------------------------------------------- -[Graduated to "master"] +[New Topics] -* cc/interpret-trailers (2014-11-10) 2 commits - (merged to 'next' on 2014-11-14 at fa0ccc6) - + trailer: display a trailer without its trailing newline - + trailer: ignore comment lines inside the trailers - (this branch is used by cc/interpret-trailers-more.) +* jc/exec-cmd-system-path-leak-fix (2014-11-30) 1 commit + - system_path(): always return free'able memory to the caller + + The function sometimes returned a non-freeable memory and some + other times returned a piece of memory that must be freed. + + Will merge to 'next'. + + +* jc/hook-cleanup (2014-12-01) 1 commit + - run-command.c: retire unused run_hook_with_custom_index() + + Will merge to 'next'. + + +* jk/push-simple (2014-11-30) 1 commit + - push: truly use "simple" as default, not "upstream" + + Will merge to 'next'. + + +* jn/rerere-fail-on-auto-update-failure (2014-12-03) 2 commits + - SQUASH??? + - rerere: error out on autoupdate failure + + +* js/push-to-deploy (2014-11-30) 2 commits + - t5516: more tests for receive.denyCurrentBranch=updateInstead + - receive-pack: add another option for receive.denyCurrentBranch + (this branch is used by jc/push-to-checkout.) + + "git push" into a repository with a working tree normally refuses + to modify the branch that is checked out. The command learned to + optionally do an equivalent of "git reset --hard" only when there + is no change to the working tree and the index instead, which would + be useful to "deploy" by pushing into a repository. + + Will merge to 'next'. + + +* jc/push-to-checkout (2014-12-01) 2 commits + - receive-pack: support push-to-checkout hook + - receive-pack: refactor updateInstead codepath + (this branch uses js/push-to-deploy.) + + Extending the js/push-to-deploy topic, the behaviour of "git push" + when updating the working tree and the index with an update to the + branch that is checked out can be tweaked by push-to-checkout hook. + + Needs docs. + + +* lh/send-email-hide-x-mailer (2014-12-03) 2 commits + - SQUASH??? + - send-email: add --[no-]xmailer option + + "git send-email" normally identifies itself via X-Mailer: header + in the message it sends out. A new command line flag allows the + header to be squelched. + + +* nd/list-files (2014-12-01) 19 commits + - list-files: -M aka diff-cached + - list-files -F: show submodules with the new indicator '&' + - list-files: add -F/--classify + - list-files: show directories as well as files + - list-files: do not show duplicate cached entries + - list-files: sort output and remove duplicates + - list-files: add -t back + - list-files: add -1 short for --no-column + - list-files: add -R/--recursive short for --max-depth=-1 + - list-files: -u does not imply showing stages + - list-files: a user friendly version of ls-files and more + - ls-files: support --max-depth + - ls-files: add --column + - ls-files: add --color to highlight file names + - ls-files: buffer full item in strbuf before printing + - ls_colors.c: highlight submodules like directories + - ls_colors.c: add a function to color a file name + - ls_colors.c: parse color.ls.* from config file + - ls_colors.c: add $LS_COLORS parsing code - Small fixes to a new experimental command already in 'master'. + A new "git list-files" Porcelain command, "ls-files" with bells and + whistles. -* da/difftool (2014-11-14) 1 commit - (merged to 'next' on 2014-11-17 at 231f559) - + difftool: honor --trust-exit-code for builtin tools +* nd/ls-tree-pathspec (2014-12-01) 5 commits + - t3102: style modernization + - t3102: document that ls-tree does not yet support negated pathspec + - ls-tree: disable negative pathspec because it's not supported + - ls-tree: remove path filtering logic in show_tree + - tree.c: update read_tree_recursive callback to pass strbuf as base - Fix-up to a new feature in 'master'. + "git ls-tree" does not support path selection based on negative + pathspecs, but did not error out when negative pathspecs are given. + Will merge to 'next'. -* jc/doc-commit-only (2014-11-07) 1 commit - (merged to 'next' on 2014-11-14 at 29c70d2) - + Documentation/git-commit: clarify that --only/--include records the working tree contents +* rj/t0050-passes (2014-11-30) 1 commit + - t0050-*.sh: mark the rename (case change) test as passing -* mh/doc-remote-helper-xref (2014-11-11) 1 commit - (merged to 'next' on 2014-11-14 at a7f6230) - + doc: add some crossrefs between manual pages + Will merge to 'next'. -* sn/tutorial-status-output-example (2014-11-13) 1 commit - (merged to 'next' on 2014-11-14 at 0fe4930) - + gittutorial: fix output of 'git status' +* rt/for-each-ref-spell-tcl-as-Tcl (2014-11-30) 1 commit + - for-each-ref: correct spelling of Tcl in option description + Will merge to 'next'. -* sv/submitting-final-patch (2014-11-13) 1 commit - (merged to 'next' on 2014-11-14 at 9e1220f) - + SubmittingPatches: final submission is To: maintainer and CC: list +* sb/ref-transaction-reflog (2014-12-03) 2 commits + - refs.c: rename transaction.updates to transaction.ref_updates + - refs.c: rename the transaction functions + (this branch uses sb/ref-transaction-unify-to-update.) -* ta/tutorial-modernize (2014-11-11) 1 commit - (merged to 'next' on 2014-11-14 at c45f0ac) - + gittutorial.txt: remove reference to ancient Git version + Still under review discussion. -* tb/no-relative-file-url (2014-11-13) 1 commit - (merged to 'next' on 2014-11-14 at 96e9227) - + t5705: the file:// URL should be absolute +* ye/http-accept-language (2014-12-03) 2 commits + - SQUASH??? + - http: send Accept-Language header if possible + + Still under review discussion. -------------------------------------------------- -[New Topics] +[Stalled] + +* ms/submodule-update-config-doc (2014-11-03) 1 commit + - submodule: clarify documentation for update subcommand + + Needs a reroll ($gmane/259037). + + +* je/quiltimport-no-fuzz (2014-10-21) 2 commits + - git-quiltimport: flip the default not to allow fuzz + - git-quiltimport.sh: allow declining fuzz with --exact option + + "quiltimport" drove "git apply" always with -C1 option to reduce + context of the patch in order to give more chance to somewhat stale + patches to apply. Add an "--exact" option to disable, and also + "-C$n" option to customize this behaviour. The top patch + optionally flips the default to "--exact". + + Tired of waiting for an Ack; will discard. + + +* jc/push-cert-hmac-optim (2014-09-25) 2 commits + - receive-pack: truncate hmac early and convert only necessary bytes + - sha1_to_hex: split out "hex-format n bytes" helper and use it + + This is "we could do this if we wanted to", not "we measured and it + improves performance critical codepath". + + Will perhaps drop. + + +* mt/patch-id-stable (2014-06-10) 1 commit + - patch-id: change default to stable + + Teaches "git patch-id" to compute the patch ID that does not change + when the files in a single patch is reordered. As this new algorithm + is backward incompatible, the last bit to flip it to be the default + is left out of 'master' for now. + + Nobody seems to be jumping up & down requesting this last step, + which makes the result somewhat backward incompatible. + Will perhaps drop. + + +* tr/remerge-diff (2014-11-10) 9 commits + - t4213: avoid "|" in sed regexp + - log --remerge-diff: show what the conflict resolution changed + - name-hash: allow dir hashing even when !ignore_case + - merge-recursive: allow storing conflict hunks in index + - merge_diff_mode: fold all merge diff variants into an enum + - combine-diff: do not pass revs->dense_combined_merges redundantly + - merge-recursive: -Xindex-only to leave worktree unchanged + - merge-recursive: internal flag to avoid touching the worktree + - merge-recursive: remove dead conditional in update_stages() + + "log -p" output learns a new way to let users inspect a merge + commit by showing the differences between the automerged result + with conflicts the person who recorded the merge would have seen + and the final conflict resolution that was recorded in the merge. + + Waiting for a reroll ($gmane/256591). + + +* hv/submodule-config (2014-11-11) 4 commits + - do not die on error of parsing fetchrecursesubmodules option + - use new config API for worktree configurations of submodules + - extract functions for submodule config set and lookup + - implement submodule config cache for lookup of submodule names + + Kicked back to 'pu' per request ($gmane/255610). + + +* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits + - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks + - git-add--interactive: Preserve diff heading when splitting hunks + + Waiting for a reroll. + + +* jn/gitweb-utf8-in-links (2014-05-27) 1 commit + - gitweb: Harden UTF-8 handling in generated links + + $gmane/250758? + + +* ss/userdiff-update-csharp-java (2014-06-02) 2 commits + - userdiff: support Java try keyword + - userdiff: support C# async methods and correct C# keywords + + Reviews sent; waiting for a response. + + +* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit + - git-rebase: print name of rev when using shorthand + + Teach "git rebase -" to report the concrete name of the branch + (i.e. the previous one). + + But it stops short and does not do the same for "git rebase @{-1}". + Expecting a reroll. + + +* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits + - merge: drop unused arg from abort_commit method signature + - merge: make prepare_to_commit responsible for write_merge_state + - t7505: ensure cleanup after hook blocks merge + - t7505: add missing && + + Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that + run during "git merge". The log message stresses too much on one + hook, prepare-commit-msg, but it would equally apply to other hooks + like post-merge, I think. + + Waiting for a reroll. + + +* jc/graph-post-root-gap (2013-12-30) 3 commits + - WIP: document what we want at the end + - graph: remove unused code a bit + - graph: stuff the current commit into graph->columns[] + + This was primarily a RFH ($gmane/239580). + + +* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits + - perf-lib: add test_perf_cleanup target + - perf-lib: split starting the test from the execution + + Add test_perf_cleanup shell function to the perf suite, that allows + the script writers to define a test with a clean-up action. + + Will hold. + + +* jc/show-branch (2014-03-24) 5 commits + - show-branch: use commit slab to represent bitflags of arbitrary width + - show-branch.c: remove "all_mask" + - show-branch.c: abstract out "flags" operation + - show-branch.c: lift all_mask/all_revs to a global static + - show-branch.c: update comment style + + Waiting for the final step to lift the hard-limit before sending it out. + +-------------------------------------------------- +[Cooking] + +* jk/pack-bitmap (2014-11-30) 1 commit + - pack-bitmap: do not use gcc packed attribute + + Will merge to 'next'. + + +* nd/multiple-work-trees (2014-12-01) 34 commits + - git-common-dir: make "modules/" per-working-directory directory + - checkout: do not fail if target is an empty directory + - t2025: add a test to make sure grafts is working from a linked checkout + - checkout: don't require a work tree when checking out into a new one + - git_path(): keep "info/sparse-checkout" per work-tree + - count-objects: report unused files in $GIT_DIR/worktrees/... + - gc: support prune --worktrees + - gc: factor out gc.pruneexpire parsing code + - gc: style change -- no SP before closing parenthesis + - checkout: clean up half-prepared directories in --to mode + - checkout: reject if the branch is already checked out elsewhere + - prune: strategies for linked checkouts + - checkout: support checking out into a new working directory + - use new wrapper write_file() for simple file writing + - wrapper.c: wrapper to open a file, fprintf then close + - setup.c: support multi-checkout repo setup + - setup.c: detect $GIT_COMMON_DIR check_repository_format_gently() + - setup.c: convert check_repository_format_gently to use strbuf + - setup.c: detect $GIT_COMMON_DIR in is_git_directory() + - setup.c: convert is_git_directory() to use strbuf + - git-stash: avoid hardcoding $GIT_DIR/logs/.... + - *.sh: avoid hardcoding $GIT_DIR/hooks/... + - git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects + - $GIT_COMMON_DIR: a new environment variable + - commit: use SEQ_DIR instead of hardcoding "sequencer" + - fast-import: use git_path() for accessing .git dir instead of get_git_dir() + - reflog: avoid constructing .lock path with git_path + - *.sh: respect $GIT_INDEX_FILE + - git_path(): be aware of file relocation in $GIT_DIR + - path.c: group git_path(), git_pathdup() and strbuf_git_path() together + - path.c: rename vsnpath() to do_git_path() + - git_snpath(): retire and replace with strbuf_git_path() + - path.c: make get_pathname() call sites return const char * + - path.c: make get_pathname() return strbuf instead of static buffer + + A replacement for contrib/workdir/git-new-workdir that does not + rely on symbolic links and make sharing of objects and refs safer + by making the borrowee and borrowers aware of each other. + + A few tests need some tweaks for MinGW ($gmane/{257756,257757}). + Conflicts with rs/ref-transaction so ejected for now, waiting for a + reroll. + * jc/unpack-trees-plug-leak (2014-11-17) 1 commit - unpack_trees: plug leakage of o->result + Will merge to 'next'. + * js/windows-open-eisdir-error (2014-11-17) 1 commit (merged to 'next' on 2014-11-18 at 57b0d49) + Windows: correct detection of EISDIR in mingw_open() + Will merge to 'master'. + * rs/maint-config-use-labs (2014-11-17) 1 commit (merged to 'next' on 2014-11-18 at 53c2404) + use labs() for variables of type long instead of abs() + Will merge to 'master'. + * rs/receive-pack-use-labs (2014-11-17) 1 commit (merged to 'next' on 2014-11-18 at c6d2d94) + use labs() for variables of type long instead of abs() + Will merge to 'master'. + * jk/colors (2014-11-20) 5 commits - diff-highlight: allow configurable colors @@ -99,6 +383,8 @@ of the repositories listed at - Merge branch 'jn/parse-config-slot' into jk/colors (this branch uses jk/colors-fix.) + Will merge to 'next'. + * jk/colors-fix (2014-11-20) 3 commits - t4026: test "normal" color @@ -106,69 +392,105 @@ of the repositories listed at - docs: describe ANSI 256-color mode (this branch is used by jk/colors.) + Will merge to 'next'. + * jk/gitweb-with-newer-cgi-multi-param (2014-11-18) 1 commit (merged to 'next' on 2014-11-18 at 6ac61fe) + gitweb: hack around CGI's list-context param() handling + Will merge to 'master'. + * jk/lock-ref-sha1-basic-return-errors (2014-11-20) 1 commit - lock_ref_sha1_basic: do not die on locking errors + Will merge to 'next'. + * jk/no-perl-tests (2014-11-18) 2 commits - t960[34]: mark cvsimport tests as requiring perl - t0090: mark add-interactive test with PERL prerequisite + Will merge to 'next'. + * jk/rebuild-perl-scripts-with-no-perl-seting-change (2014-11-18) 3 commits - Makefile: have python scripts depend on NO_PYTHON setting - Makefile: simplify by using SCRIPT_{PERL,SH}_GEN macros - Makefile: have perl scripts depend on NO_PERL setting + Will merge to 'next'. + * mh/config-copy-string-from-git-path (2014-11-17) 1 commit - cmd_config(): make a copy of path obtained from git_path() + Will merge to 'next'. + * mh/config-flip-xbit-back-after-checking (2014-11-18) 1 commit (merged to 'next' on 2014-11-18 at 45f7d71) + create_default_files(): don't set u+x bit on $GIT_DIR/config (this branch is used by tb/config-core-filemode-check-on-broken-fs.) + Will merge to 'master'. + * po/everyday-doc (2014-11-17) 1 commit - Documentation: change "gitlink" typo in git-push + Will merge to 'next'. + -* ps/new-workdir-into-empty-directory (2014-11-20) 1 commit - - git-new-workdir: Don't fail if the target directory is empty +* ps/new-workdir-into-empty-directory (2014-12-03) 1 commit + - git-new-workdir: don't fail if the target directory is empty + + Will merge to 'next'. * rt/push-recurse-submodule-usage-string (2014-11-18) 1 commit - builtin/push.c: fix description of --recurse-submodules option + Will merge to 'next'. + * sb/copy-fd-errno (2014-11-17) 1 commit - copy.c: make copy_fd preserve meaningful errno + Jonathan seems to be working in the same area, having a moral + equivalent. Have to drop either this or the other one. + * sb/log-ref-write-fd (2014-11-20) 1 commit - refs.c: add a function to append a reflog entry to a fd + Moves a part of function around to add a helper that still only has + one caller. Need to see how this helps in a bigger picture; + conflicts with nd/multiple-work-trees. + * sb/ref-transaction-unify-to-update (2014-11-20) 2 commits - refs.c: make ref_transaction_delete a wrapper for ref_transaction_update - refs.c: make ref_transaction_create a wrapper for ref_transaction_update + (this branch is used by sb/ref-transaction-reflog.) + + Code simplification. + + Will merge to 'next'. * sv/doc-stripspace (2014-11-19) 1 commit - Documentation/git-stripspace: Update synopsis + Will merge to 'next'. + * sv/typofix-apply-error-message (2014-11-17) 1 commit - apply: fix typo in an error message + Will merge to 'next'. + * da/difftool-mergetool-simplify-reporting-status (2014-11-21) 5 commits - mergetools: stop setting $status in merge_cmd() @@ -177,15 +499,21 @@ of the repositories listed at - mergetool--lib: remove use of $status global - mergetool--lib: remove no-op assignment to $status from setup_user_tool + Will merge to 'next'. + * dw/shell-basename-dashdash-before-stripping-leading-dash-from-login (2014-11-25) 1 commit - git-sh-setup.sh: use dashdash with basename call + Will merge to 'next'. + * jc/refer-to-t-readme-from-submitting-patches (2014-11-24) 2 commits - t/README: justify why "! grep foo" is sufficient - SubmittingPatches: refer to t/README for tests + Will merge to 'next'. + * jc/t9001-modernise (2014-11-25) 5 commits - t9001: style modernisation phase #5 @@ -199,14 +527,20 @@ of the repositories listed at * js/t5000-dont-copy-bin-sh (2014-11-24) 1 commit - t5000 on Windows: do not mistake "sh.exe" as "sh" + Will merge to 'next'. + * mg/add-ignore-errors (2014-11-21) 1 commit - add: ignore only ignored files + Will merge to 'next'. + * mh/find-uniq-abbrev (2014-11-26) 1 commit - sha1_name: avoid unnecessary sha1 lookup in find_unique_abbrev + Will merge to 'next'. + * mh/simplify-repack-without-refs (2014-11-25) 7 commits - sort_string_list(): rename to string_list_sort() @@ -217,229 +551,58 @@ of the repositories listed at - prune_remote(): initialize both delete_refs lists in a single loop - prune_remote(): exit early if there are no stale references + Will merge to 'next'. + * pb/am-message-id-footer (2014-11-25) 2 commits - git-am: add --message-id/--no-message-id - git-mailinfo: add --message-id + Will merge to 'next'. + * pb/send-email-te (2014-11-25) 2 commits - git-send-email: add --transfer-encoding option - git-send-email: delay creation of MIME headers (this branch is used by jc/t9001-modernise.) + Will merge to 'next'. + * pw/remote-set-url-fetch (2014-11-26) 1 commit - remote: add --fetch and --both options to set-url + Still under discussion. + * rj/no-xopen-source-for-cygwin (2014-11-24) 1 commit - git-compat-util.h: don't define _XOPEN_SOURCE on cygwin + Will merge to 'next'. -* sb/string-list (2014-11-25) 3 commits + +* sb/string-list (2014-11-30) 4 commits - string_list: remove string_list_insert_at_index() from its API + - SQUASH??? - mailmap: use higher level string list functions - string_list: document string_list_(insert,lookup) + Will merge to 'next' after squashing the fixup. + * sb/write-sha1-update-reflog (2014-11-24) 1 commit - refs.c: move reflog updates into its own function + Moves a part of function around to add a helper that still only has + one caller. Need to see how this helps in a bigger picture. + * tb/config-core-filemode-check-on-broken-fs (2014-11-21) 1 commit - init-db: improve the filemode trustability check (this branch uses mh/config-flip-xbit-back-after-checking.) --------------------------------------------------- -[Stalled] - -* je/quiltimport-no-fuzz (2014-10-21) 2 commits - - git-quiltimport: flip the default not to allow fuzz - - git-quiltimport.sh: allow declining fuzz with --exact option - - "quiltimport" drove "git apply" always with -C1 option to reduce - context of the patch in order to give more chance to somewhat stale - patches to apply. Add an "--exact" option to disable, and also - "-C$n" option to customize this behaviour. The top patch - optionally flips the default to "--exact". - - Waiting for an Ack. - - -* jc/push-cert-hmac-optim (2014-09-25) 2 commits - - receive-pack: truncate hmac early and convert only necessary bytes - - sha1_to_hex: split out "hex-format n bytes" helper and use it - - This is "we could do this if we wanted to", not "we measured and it - improves performance critical codepath". - - Will perhaps drop. - - -* nd/multiple-work-trees (2014-09-27) 32 commits - . t2025: add a test to make sure grafts is working from a linked checkout - . checkout: don't require a work tree when checking out into a new one - . git_path(): keep "info/sparse-checkout" per work-tree - . count-objects: report unused files in $GIT_DIR/worktrees/... - . gc: support prune --worktrees - . gc: factor out gc.pruneexpire parsing code - . gc: style change -- no SP before closing parenthesis - . checkout: clean up half-prepared directories in --to mode - . checkout: reject if the branch is already checked out elsewhere - . prune: strategies for linked checkouts - . checkout: support checking out into a new working directory - . use new wrapper write_file() for simple file writing - . wrapper.c: wrapper to open a file, fprintf then close - . setup.c: support multi-checkout repo setup - . setup.c: detect $GIT_COMMON_DIR check_repository_format_gently() - . setup.c: convert check_repository_format_gently to use strbuf - . setup.c: detect $GIT_COMMON_DIR in is_git_directory() - . setup.c: convert is_git_directory() to use strbuf - . git-stash: avoid hardcoding $GIT_DIR/logs/.... - . *.sh: avoid hardcoding $GIT_DIR/hooks/... - . git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects - . $GIT_COMMON_DIR: a new environment variable - . commit: use SEQ_DIR instead of hardcoding "sequencer" - . fast-import: use git_path() for accessing .git dir instead of get_git_dir() - . reflog: avoid constructing .lock path with git_path - . *.sh: respect $GIT_INDEX_FILE - . git_path(): be aware of file relocation in $GIT_DIR - . path.c: group git_path(), git_pathdup() and strbuf_git_path() together - . path.c: rename vsnpath() to do_git_path() - . git_snpath(): retire and replace with strbuf_git_path() - . path.c: make get_pathname() call sites return const char * - . path.c: make get_pathname() return strbuf instead of static buffer - - A replacement for contrib/workdir/git-new-workdir that does not - rely on symbolic links and make sharing of objects and refs safer - by making the borrowee and borrowers aware of each other. - - A few tests need some tweaks for MinGW ($gmane/{257756,257757}). - Conflicts with rs/ref-transaction so ejected for now, waiting for a - reroll. - - -* mt/patch-id-stable (2014-06-10) 1 commit - - patch-id: change default to stable - - Teaches "git patch-id" to compute the patch ID that does not change - when the files in a single patch is reordered. As this new algorithm - is backward incompatible, the last bit to flip it to be the default - is left out of 'master' for now. - - Nobody seems to be jumping up & down requesting this last step, - which makes the result somewhat backward incompatible. - Will perhaps drop. - - -* tr/remerge-diff (2014-11-10) 9 commits - - t4213: avoid "|" in sed regexp - - log --remerge-diff: show what the conflict resolution changed - - name-hash: allow dir hashing even when !ignore_case - - merge-recursive: allow storing conflict hunks in index - - merge_diff_mode: fold all merge diff variants into an enum - - combine-diff: do not pass revs->dense_combined_merges redundantly - - merge-recursive: -Xindex-only to leave worktree unchanged - - merge-recursive: internal flag to avoid touching the worktree - - merge-recursive: remove dead conditional in update_stages() - - "log -p" output learns a new way to let users inspect a merge - commit by showing the differences between the automerged result - with conflicts the person who recorded the merge would have seen - and the final conflict resolution that was recorded in the merge. - - Waiting for a reroll ($gmane/256591). - - -* hv/submodule-config (2014-11-11) 4 commits - - do not die on error of parsing fetchrecursesubmodules option - - use new config API for worktree configurations of submodules - - extract functions for submodule config set and lookup - - implement submodule config cache for lookup of submodule names - - Kicked back to 'pu' per request ($gmane/255610). - + Will merge to 'next'. -* jk/pack-bitmap (2014-08-04) 1 commit - - pack-bitmap: do not use gcc packed attribute - - Hold, waiting for Karsten's replacement. - - -* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits - - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks - - git-add--interactive: Preserve diff heading when splitting hunks - - Waiting for a reroll. - - -* jn/gitweb-utf8-in-links (2014-05-27) 1 commit - - gitweb: Harden UTF-8 handling in generated links - - $gmane/250758? - - -* ss/userdiff-update-csharp-java (2014-06-02) 2 commits - - userdiff: support Java try keyword - - userdiff: support C# async methods and correct C# keywords - - Reviews sent; waiting for a response. - - -* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit - - git-rebase: print name of rev when using shorthand - - Teach "git rebase -" to report the concrete name of the branch - (i.e. the previous one). - - But it stops short and does not do the same for "git rebase @{-1}". - Expecting a reroll. - - -* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits - - merge: drop unused arg from abort_commit method signature - - merge: make prepare_to_commit responsible for write_merge_state - - t7505: ensure cleanup after hook blocks merge - - t7505: add missing && - - Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that - run during "git merge". The log message stresses too much on one - hook, prepare-commit-msg, but it would equally apply to other hooks - like post-merge, I think. - - Waiting for a reroll. - - -* jc/graph-post-root-gap (2013-12-30) 3 commits - - WIP: document what we want at the end - - graph: remove unused code a bit - - graph: stuff the current commit into graph->columns[] - - This was primarily a RFH ($gmane/239580). - - -* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits - - perf-lib: add test_perf_cleanup target - - perf-lib: split starting the test from the execution - - Add test_perf_cleanup shell function to the perf suite, that allows - the script writers to define a test with a clean-up action. - - Will hold. - - -* jc/show-branch (2014-03-24) 5 commits - - show-branch: use commit slab to represent bitflags of arbitrary width - - show-branch.c: remove "all_mask" - - show-branch.c: abstract out "flags" operation - - show-branch.c: lift all_mask/all_revs to a global static - - show-branch.c: update comment style - - Waiting for the final step to lift the hard-limit before sending it out. - --------------------------------------------------- -[Cooking] * jk/approxidate-avoid-y-d-m-over-future-dates (2014-11-13) 2 commits (merged to 'next' on 2014-11-14 at 3c11a1b) @@ -456,7 +619,7 @@ of the repositories listed at (1) ISO-like format is used, and (2) the string can make sense interpreted as both y-m-d and y-d-m. - Will cook in 'next' throughout the remainder of the cycle. + Will cook in 'next'. * jk/checkout-from-tree (2014-11-13) 1 commit @@ -470,9 +633,7 @@ of the repositories listed at (merged to 'next' on 2014-11-14 at b2aae27) + t/lib-terminal: allow TTY tests to run under recent Mac OS - Will cook in 'next' throughout the remainder of the cycle. - - We probably should drop this, though. ($gmane/259609). + We probably should drop this ($gmane/259609). * sv/get-builtin (2014-11-13) 1 commit @@ -487,7 +648,7 @@ of the repositories listed at + imap-send: use parse options API to determine verbosity (this branch is used by br/imap-send-via-libcurl.) - Will cook in 'next' throughout the remainder of the cycle. + Will cook in 'next'. * br/imap-send-via-libcurl (2014-11-10) 1 commit @@ -495,7 +656,7 @@ of the repositories listed at + git-imap-send: use libcurl for implementation (this branch uses br/imap-send-verbosity.) - Will cook in 'next' throughout the remainder of the cycle. + Will cook in 'next'. * cc/interpret-trailers-more (2014-11-10) 4 commits @@ -505,12 +666,7 @@ of the repositories listed at - Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more (this branch uses jc/conflict-hint.) - -* js/push-to-update (2014-11-13) 1 commit - - Add another option for receive.denyCurrentBranch - - Still being discussed but we seem to have agreed what the desired - semantics should be. + Will merge to 'next'. * rs/env-array-in-child-process (2014-11-10) 1 commit @@ -533,12 +689,6 @@ of the repositories listed at Will merge to 'master'. -* ms/submodule-update-config-doc (2014-11-03) 1 commit - - submodule: clarify documentation for update subcommand - - Needs a reroll ($gmane/259037). - - * nd/lockfile-absolute (2014-11-03) 1 commit (merged to 'next' on 2014-11-06 at 68722a9) + lockfile.c: store absolute path @@ -546,7 +696,7 @@ of the repositories listed at The lockfile API can get confused which file to clean up when the process moved the $cwd after creating a lockfile. - Will cook in 'next' throughout the remainder of the cycle. + Will cook in 'next'. * jh/empty-notes (2014-11-14) 9 commits @@ -566,13 +716,15 @@ of the repositories listed at note that is empty. In the longer run, we might want to deprecate the somewhat unintuitive "emptying means deletion" behaviour. + Will merge to 'master'. + * jc/merge-bases (2014-10-30) 2 commits (merged to 'next' on 2014-11-06 at 491e576) + get_merge_bases(): always clean-up object flags + bisect: clean flags after checking merge bases - Will cook in 'next' throughout the remainder of the cycle. + Will cook in 'next'. * jc/strbuf-add-lines-avoid-sp-ht-sequence (2014-10-27) 1 commit @@ -583,7 +735,7 @@ of the repositories listed at line, resulting in "# \t\n" when the payload began with a HT. Instead, produce "#\t\n". - Will cook in 'next' throughout the remainder of the cycle. + Will cook in 'next'. * nd/untracked-cache (2014-10-27) 19 commits @@ -607,6 +759,8 @@ of the repositories listed at - untracked cache: record .gitignore information and dir hierarchy - dir.c: optionally compute sha-1 of a .gitignore file + Comments? + * zk/grep-color-words (2014-10-27) 2 commits (merged to 'next' on 2014-10-28 at 4d0457c) @@ -630,7 +784,7 @@ of the repositories listed at Unlike all the other hints given in the commit log editor, the list of conflicted paths were appended at the end without commented out. - Will cook in 'next' throughout the remainder of the cycle. + Will cook in 'next'. * jc/diff-b-m (2014-10-23) 1 commit @@ -639,7 +793,7 @@ of the repositories listed at Fix long-standing bug in "diff -B -M" output. - Will cook in 'next' throughout the remainder of the cycle. + Will cook in 'next'. * jc/checkout-local-track-report (2014-10-14) 1 commit @@ -650,7 +804,7 @@ of the repositories listed at local branch by setting its branch.*.merge to branch name (not a full refname) incorrectly said that the upstream is gone. - Will cook in 'next' throughout the remainder of the cycle. + Will cook in 'next'. * jc/clone-borrow (2014-10-15) 1 commit @@ -659,7 +813,7 @@ of the repositories listed at Allow "git clone --reference" to be used more safely. - Will cook in 'next' throughout the remainder of the cycle. + Will cook in 'next'. -------------------------------------------------- [Discarded] @@ -736,5 +890,3 @@ of the repositories listed at * sb/simplify-repack-without-refs (2014-11-20) 1 commit . refs.c: use a string_list for repack_without_refs - -