What's cooking

new file mode 100644 index 0000000000..3d08932c01 --- /dev/null +++ b/whats/cooking/2009/12/02.txt @@ -0,0 +1,398 @@ +To: git@vger.kernel.org +Subject: What's cooking in git.git (Dec 2009, #02; Sat, 05) +X-master-at: 9a424b276c409a3510e7735b6ecc012f50dc2a49 +X-next-at: d8fe1b5dc75e54be82e59239a8d5a430ae072fd8 + +What's cooking in git.git (Dec 2009, #02; Sat, 05) +-------------------------------------------------- + +Here are the topics that have been cooking. Commits prefixed with '-' are +only in 'pu' while commits prefixed with '+' are in 'next'. The ones +marked with '.' do not appear in any of the integration branches, but I am +still holding onto them. + +In 1.7.0, we plan to correct handful of warts in the interfaces everybody +agrees that they were mistakes. The resulting system may not be strictly +backward compatible. Currently planned changes are: + + * refuse push to update the checked out branch in a non-bare repo by + default + + Make "git push" into a repository to update the branch that is checked + out fail by default. You can countermand this default by setting a + configuration variable in the receiving repository. + + http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007 + + * refuse push to delete the current branch by default + + Make "git push $there :$killed" to delete the branch that is pointed at + by its HEAD fail by default. You can countermand this default by + setting a configuration variable in the receiving repository. + + http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936 + + * "git send-email" won't make deep threads by default + + Many people said that by default when sending more than 2 patches the + threading git-send-email makes by default is hard to read, and they + prefer the default be one cover letter and each patch as a direct + follow-up to the cover letter. You can countermand this by setting a + configuration variable. + + http://article.gmane.org/gmane.comp.version-control.git/109790 + + * "git status" won't be "git-commit --dry-run" anymore + + http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993 + + * "git diff -w --exit-code" will exit success if only differences it + found are whitespace changes that are stripped away from the output. + + http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751 + + * "git diff -w/-b" won't even produce "diff --git" header when all changes + are about whitespaces. + + http://thread.gmane.org/gmane.comp.version-control.git/133256 + +-------------------------------------------------- +[New Topics] + +Note: Ilari's vcs-helper series hasn't been queued yet, as its first round +generated a healthy amount of discussion and he made it clear that the +second round is being prepared, addressing the comments given on the list. +Hopefully trivial coding style issues in the first round will also be +fixed (e.g. keyword "if" lacked a SP after it before opening parenthesis +of the condition) in the second round. + +* jn/maint-pull-rebase-error-message (2009-11-27) 1 commit. + (merged to 'next' on 2009-12-03 at 2ced03c) + + pull: clarify advice for the unconfigured error case + +Replaces old 'jn/rfc-pull-rebase-error-message' topic. + +* fc/opt-quiet-gc-reset (2009-12-02) 1 commit + - General --quiet improvements + +* mv/commit-date (2009-12-03) 2 commits + - Document date formats accepted by parse_date() + - builtin-commit: add --date option + +* mh/rebase-fixup (2009-12-05) 4 commits + - [squash to Add a command "fix"] Avoid "\(alternatives\|choices\)" in sed script + - Add a command "fix" to rebase --interactive. + - t3404: set a couple more tags in the original repository + - t3404: Better document the original repository layout + +-------------------------------------------------- +[Stalled] + +* je/send-email-no-subject (2009-08-05) 1 commit. + (merged to 'next' on 2009-10-11 at 1b99c56) + + send-email: confirm on empty mail subjects + +The existing tests cover the positive case (i.e. as long as the user says +"yes" to the "do you really want to send this message that lacks subject", +the message is sent) of this feature, but the feature itself needs its own +test to verify the negative case (i.e. does it correctly stop if the user +says "no"?) + +* jc/checkout-merge-base (2009-11-20) 2 commits + - "rebase --onto A...B" replays history on the merge base between A and B + - "checkout A...B" switches to the merge base between A and B + +I've been using the first one for a while myself but do not see many users +want this (yet); the new feature is not urgent anyway. + +* jh/notes (2009-12-02) 11 commits + - Refactor notes concatenation into a flexible interface for combining notes + - Notes API: Allow multiple concurrent notes trees with new struct notes_tree + - Notes API: for_each_note(): Traverse the entire notes tree with a callback + - Notes API: get_note(): Return the note annotating the given object + - Notes API: add_note(): Add note objects to the internal notes tree structure + - Notes API: init_notes(): Initialize the notes tree from the given notes ref + - Notes API: get_commit_notes() -> format_note() + remove the commit restriction + - Minor style fixes to notes.c + - Add more testcases to test fast-import of notes + - Rename t9301 to t9350, to make room for more fast-import tests + - fast-import: Proper notes tree manipulation + +Rerolled (waiting for Acks). + +* tr/maint-merge-ours-clarification (2009-11-15) 1 commit + (merged to 'next' on 2009-11-21 at fadaf7b) + + rebase: refuse to rebase with -s ours + +I do not think we reached a concensus for solving conflicts between "give +them rope" and "protect users from clearly meaningless combinations". The +author obviously is for the latter (and I am inclined to agree); Dscho +seems to think otherwise. + +* jc/fix-tree-walk (2009-10-22) 8 commits + (merged to 'next' on 2009-10-22 at 10c0c8f) + + Revert failed attempt since 353c5ee + + read-tree --debug-unpack + (merged to 'next' on 2009-10-11 at 0b058e2) + + unpack-trees.c: look ahead in the index + + unpack-trees.c: prepare for looking ahead in the index + + Aggressive three-way merge: fix D/F case + + traverse_trees(): handle D/F conflict case sanely + + more D/F conflict tests + + tests: move convenience regexp to match object names to test-lib.sh + +This has some stupid bugs and reverted from 'next' until I can fix it, but +the "temporarily" turned out to be very loooong. Sigh. We won't have a +proper fix in 1.6.6. + +* jc/grep-full-tree (2009-11-24) 1 commit. + - grep: --full-tree + +The interaction with this option and pathspecs need to be worked out +better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from +all the header files in the tree, for example. + +-------------------------------------------------- +[Cooking] + +* sr/gfi-options (2009-12-04) 7 commits + - fast-import: add (non-)relative-marks feature + - fast-import: allow for multiple --import-marks= arguments + - fast-import: test the new option command + - fast-import: add option command + - fast-import: add feature command + - fast-import: put marks reading in its own function + - fast-import: put option parsing code in separate functions + +Rerolled. + +* ap/merge-backend-opts (2008-07-18) 6 commits + - Document that merge strategies can now take their own options + - Extend merge-subtree tests to test -Xsubtree=dir. + - Make "subtree" part more orthogonal to the rest of merge-recursive. + - Teach git-pull to pass -X<option> to git-merge + - git merge -X<option> + - git-merge-file --ours, --theirs + +"git pull" patch needs sq-then-eval fix to protect it from $IFS +but otherwise seemed good. + +* mo/bin-wrappers (2009-12-02) 3 commits + - INSTALL: document a simpler way to run uninstalled builds + - run test suite without dashed git-commands in PATH + - build dashless "bin-wrappers" directory similar to installed bindir + +Rerolled. + +* tr/http-updates (2009-12-01) 3 commits + - Allow curl to rewind the RPC read buffer + - Add an option for using any HTTP authentication scheme, not only basic + - http: maintain curl sessions + +There was a discussion on a better structure not to require rewinding in +the first place? I didn't follow it closely... + +* jc/diff-whitespace-prepare (2009-11-28) 2 commits + - diff: flip the default diff.bwoutputonly to true + - diff: optionally allow traditional "-b/-w affects only output" semantics + (this branch uses gb/1.7.0-diff-whitespace-only-output and jc/1.7.0-diff-whitespace-only-status; is used by jc/1.7.0-diff-whitespace-prepare.) + +This is to redo the two -b/-w semantic changes to prepare the migration of +existing users before 1.7.0 happens. + +* sr/vcs-helper (2009-12-04) 13 commits + (merged to 'next' on 2009-12-03 at e45b562) + + builtin-push: don't access freed transport->url + (merged to 'next' on 2009-11-27 at 83268ab) + + Add Python support library for remote helpers + + Basic build infrastructure for Python scripts + + Allow helpers to report in "list" command that the ref is unchanged + + Fix various memory leaks in transport-helper.c + + Allow helper to map private ref names into normal names + + Add support for "import" helper command + + Allow specifying the remote helper in the url + + Add a config option for remotes to specify a foreign vcs + + Allow fetch to modify refs + + Use a function to determine whether a remote is valid + + Allow programs to not depend on remotes having urls + + Fix memory leak in helper method for disconnect + +Should be among the first to graduate after 1.6.6 final. + +* tr/reset-checkout-patch (2009-11-19) 1 commit. + (merged to 'next' on 2009-11-22 at b224950) + + {checkout,reset} -p: make patch direction configurable + +I do not particularly like a configuration like this that changes the +behaviour of a command in a drastic way---it will make helping others +much harder. + +* nd/sparse (2009-11-25) 20 commits. + (merged to 'next' on 2009-11-25 at 71380f5) + + tests: rename duplicate t1009 + (merged to 'next' on 2009-11-23 at f712a41) + + sparse checkout: inhibit empty worktree + + Add tests for sparse checkout + + read-tree: add --no-sparse-checkout to disable sparse checkout support + + unpack-trees(): ignore worktree check outside checkout area + + unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index + + unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout + + unpack-trees.c: generalize verify_* functions + + unpack-trees(): add CE_WT_REMOVE to remove on worktree alone + + Introduce "sparse checkout" + + dir.c: export excluded_1() and add_excludes_from_file_1() + + excluded_1(): support exclude files in index + + unpack-trees(): carry skip-worktree bit over in merged_entry() + + Read .gitignore from index if it is skip-worktree + + Avoid writing to buffer in add_excludes_from_file_1() + + Teach Git to respect skip-worktree bit (writing part) + + Teach Git to respect skip-worktree bit (reading part) + + Introduce "skip-worktree" bit in index, teach Git to get/set this bit + + Add test-index-version + + update-index: refactor mark_valid() in preparation for new options + +There were some test glitches reported and at least one test seems to +be broken in the sense that it is not testing what it is trying to. +Fix-up expected. + +-------------------------------------------------- +[For 1.7.0] + +* jk/1.7.0-status (2009-12-05) 9 commits. + (merged to 'next' on 2009-12-05 at 44dcefd) + + status -s: obey color.status + + builtin-commit: refactor short-status code into wt-status.c + (merged to 'next' on 2009-11-27 at 91691ec) + + t7508-status.sh: Add tests for status -s + + status -s: respect the status.relativePaths option + (merged to 'next' on 2009-11-21 at 884bb56) + + docs: note that status configuration affects only long format + (merged to 'next' on 2009-10-11 at 65c8513) + + commit: support alternate status formats + + status: add --porcelain output format + + status: refactor format option parsing + + status: refactor short-mode printing to its own function + (this branch uses jc/1.7.0-status.) + +Gives the --short output format to post 1.7.0 "git commit --dry-run" that +is similar to that of post 1.7.0 "git status". + +Immediately after 1.6.6 while rebuilding 'next', we may want to reorder a +few commits at the tip, as "docs: affects only long format" describes a +limitation that will disappear soon. + +* jc/1.7.0-status (2009-09-05) 4 commits. + (merged to 'next' on 2009-10-11 at 9558627) + + status: typo fix in usage + + git status: not "commit --dry-run" anymore + + git stat -s: short status output + + git stat: the beginning of "status that is not a dry-run of commit" + (this branch is used by jk/1.7.0-status.) + +With this, "git status" is no longer "git commit --dry-run". + +* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit. + (merged to 'next' on 2009-10-11 at 043acdf) + + send-email: make --no-chain-reply-to the default + +As the title says. + +* jc/1.7.0-push-safety (2009-02-09) 2 commits. + (merged to 'next' on 2009-10-11 at 81b8128) + + Refuse deleting the current branch via push + + Refuse updating the current branch in a non-bare repository via push + +* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits. + (merged to 'next' on 2009-10-11 at 546c74d) + + diff.c: fix typoes in comments + + Make test case number unique + + diff: Rename QUIET internal option to QUICK + + diff: change semantics of "ignore whitespace" options + (this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.) + +This changes exit code from "git diff --ignore-whitespace" and friends +when there is no actual output. It is a backward incompatible change, +and jc/diff-whitespace-prepare topic is meant to ease the transition. + +* gb/1.7.0-diff-whitespace-only-output (2009-11-19) 1 commit + (merged to 'next' on 2009-11-21 at 3375bf4) + + No diff -b/-w output for all-whitespace changes + (this branch is used by jc/1.7.0-diff-whitespace-prepare and jc/diff-whitespace-prepare.) + +Likewise but for the output of "diff --git" headers. + +* jc/1.7.0-diff-whitespace-prepare (2009-11-28) 2 commits + - diff: disable diff.bwoutputonly warning + - diff: flip the diff.bwoutputonly default to false + (this branch uses gb/1.7.0-diff-whitespace-only-output, jc/1.7.0-diff-whitespace-only-status and jc/diff-whitespace-prepare.) + +And this is to actually flip the default and eventually remove the warning. + +* ns/1.7.0-send-email-no-chain-reply-to (2009-08-22) 1 commit + - send-email: make --no-chain-reply-to the default + +And this is to actually flip the default in 1.7.0. + +-------------------------------------------------- +[Reverted from 'next'] + +* jc/botched-maint-cygwin-count-objects (2009-11-24) 2 commits. + (merged to 'next' on 2009-11-25 at 8aa62a0) + + Revert "ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)" + (merged to 'next' on 2009-11-22 at 4ba5880) + + ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks) + +This is a revert of the tip one I merged prematurely to 'next'. The real +fix from Ramsay is already in 'master'. + +* ks/precompute-completion (2009-11-15) 4 commits. + (merged to 'next' on 2009-11-15 at 23cdb96) + + Revert ks/precompute-completion series + (merged to 'next' on 2009-10-28 at cd5177f) + + completion: ignore custom merge strategies when pre-generating + (merged to 'next' on 2009-10-22 at f46a28a) + + bug: precomputed completion includes scripts sources + (merged to 'next' on 2009-10-14 at adf722a) + + Speedup bash completion loading + +Reverted out of 'next', to be replaced with jn/faster-completion-startup +topic. + +-------------------------------------------------- +[I have been too busy to purge these] + +* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit + . git-pull.sh --rebase: overhaul error handling when no candidates are found + +Replaced. + +* jc/log-tz (2009-03-03) 1 commit. + - Allow --date=local --date=other-format to work as expected + +Maybe some people care about this. I dunno. + +* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit. + . git-merge: forbid fast-forward and up-to-date when --no-commit is given + +This makes "git merge --no-commit" fail when it results in fast-forward or +up-to-date. It appears nobody wants to have this, so I dropped it. + +* ne/rev-cache (2009-10-19) 7 commits. + . support for commit grafts, slight change to general mechanism + . support for path name caching in rev-cache + . full integration of rev-cache into git, completed test suite + . administrative functions for rev-cache, start of integration into git + . support for non-commit object caching in rev-cache + . basic revision cache system, no integration or features + . man page and technical discussion for rev-cache + +The author indicated that there is another round coming. Does not seem to +pass the tests when merged to 'pu', so it has been ejected for now. + +* pb/gitweb-no-project-list (2009-11-06) 3 commits. + . gitweb: Polish the content tags support + . gitweb: Support for no project list on gitweb front page + . gitweb: Refactor project list routines + +I picked these up but didn't queue as Warthog9's comments made certain +amount of sense to me.