From: Junio C Hamano Date: Thu, 16 Apr 2009 05:46:08 +0000 (-0700) Subject: What's cooking 2009-04 #3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e9d8b3227245744378acd4a57916faa863a4abe;p=thirdparty%2Fgit.git What's cooking 2009-04 #3 --- diff --git a/whats/cooking/2009/04/03.txt b/whats/cooking/2009/04/03.txt new file mode 100644 index 0000000000..27ae6afd76 --- /dev/null +++ b/whats/cooking/2009/04/03.txt @@ -0,0 +1,253 @@ +To: git@vger.kernel.org +Subject: What's cooking in git.git (Apr 2009, #03; Wed, 15) +X-master-at: f800b65bea1504299747e7be03ee279508a74e1f +X-next-at: 40869ef2c65a11295fc4c83e257fa4564b3e18f5 + +What's cooking in git.git (Apr 2009, #03; Wed, 15) +-------------------------------------------------- + +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 branches, but I am still +holding onto them. + +The topics list the commits in reverse chronological order. The topics +meant to be merged to the maintenance series have "maint-" in their names. + +We are a bit past 1.6.3-rc0, and this report will show pretty much what +the final should look like from the feature-set point-of-view. + +---------------------------------------------------------------- +[New Topics] + +* ac/color-graph (Mon Apr 13 15:53:41 2009 -0400) 1 commit + + graph API: Added logic for colored edges + +This has been under discussion since before 1.6.3-rc0, hopefully in +1.6.3-rc1. + +* mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits + - send-email: Remove superfluous `my $editor = ...' + - send-email: 'References:' should only reference what is sent + - send-email: Handle "GIT:" rather than "GIT: " during --compose + - Docs: send-email: --smtp-server-port can take symbolic ports + - Docs: send-email: Refer to CONFIGURATION section for + sendemail.multiedit + - Docs: send-email: Put options back into alphabetical order + +Only partially queued, but this is not 1.6.3 material and we are not in a +hurry. + +* jk/cobdoc (Mon Apr 13 07:21:04 2009 -0400) 5 commits + + docs/checkout: clarify what "non-branch" means + + doc/checkout: split checkout and branch creation in synopsis + + doc/checkout: refer to git-branch(1) as appropriate + + doc: refer to tracking configuration as "upstream" + + doc: clarify --no-track option + +For 1.6.3 + +* mk/apply-swap (Sat Apr 11 21:31:00 2009 +0200) 2 commits + + builtin-apply: keep information about files to be deleted + + tests: test applying criss-cross rename patch + +For 1.6.3; perhaps needs to be cherry-picked to 1.6.2.X series as well. + +---------------------------------------------------------------- +[Will merge to 'master' before 1.6.3-rc1] + +* mm/add-p-quit (Fri Apr 10 16:57:01 2009 +0200) 1 commit + + git add -p: new "quit" command at the prompt. + +I did a minimal documentation update myself. + +* eb/upload-archive-from-git-shell (Thu Apr 9 21:58:52 2009 +0200) 1 commit + + git-shell: Add 'git-upload-archive' to allowed commands. + +* jc/shared-literally (Sun Apr 12 17:55:18 2009 -0700) 2 commits + + Mark t1301 permission test to depend on POSIXPERM + + t1301-shared-repo: fix forced modes test + +* jc/maint-shared-literally (Sun Apr 12 21:22:02 2009 +0200) 1 commit + + t1301-shared-repo: fix forced modes test + +J6t's updates to fix permission tests and make sure they won't run on +systems without permission bits on the filesystem. + +* ns/am-to-empty (Fri Apr 10 09:34:42 2009 +0900) 1 commit + + git-am: teach git-am to apply a patch to an unborn branch + +* bw/short-ref-strict (Mon Apr 13 13:20:26 2009 +0200) 3 commits + + rev-parse: --abbrev-ref option to shorten ref name + + for-each-ref: utilize core.warnAmbiguousRefs for :short-format + + shorten_unambiguous_ref(): add strict mode + +* da/difftool (Sat Apr 11 20:41:56 2009 -0700) 16 commits + + mergetool--lib: simplify API usage by removing more global + variables + + Fix misspelled mergetool.keepBackup + + difftool/mergetool: refactor commands to use git-mergetool--lib + + mergetool: use $( ... ) instead of `backticks` + + bash completion: add git-difftool + + difftool: add support for a difftool.prompt config variable + + difftool: add various git-difftool tests + + difftool: move 'git-difftool' out of contrib + + difftool/mergetool: add diffuse as merge and diff tool + + difftool: add a -y shortcut for --no-prompt + + difftool: use perl built-ins when testing for msys + + difftool: remove the backup file feature + + difftool: remove merge options for opendiff, tkdiff, kdiff3 and + xxdiff + + git-mergetool: add new merge tool TortoiseMerge + + git-mergetool/difftool: make (g)vimdiff workable under Windows + + doc/merge-config: list ecmerge as a built-in merge tool + +---------------------------------------------------------------- +[Graduated to "master"] + +(none) + +---------------------------------------------------------------- +[Stalled and may need help and prodding to go forward] + +* lt/bool-on-off (Thu Apr 9 12:40:39 2009 -0700) 1 commit + + Allow users to un-configure rename detection + +Still lacks doc updates. + +* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit + - blame.c: start libifying the blame infrastructure + +A few minor point remains in this initial one. I hate to do these minor +fix-ups myself, but I may end up doing so... + +* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit + - Allow --date=local --date=other-format to work as expected + +The one I posted had a few corner-case bugs that was caught with the test +suite; this one has them fixed. People did not like the UI so it is kept +out of 'next' + +* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit + - git-merge-file: allow converting the results for the work tree + +This is a feature waiting for a user. + +We did not give scripted Porcelains a way to say "this temporary file I am +using for merging is for this path, so use the core.autocrlf and attributes +rules for that final path". Instead, merge-file simply wrote out the +data in the canonical repository representation. + +rerere has the same issue, but it is a lot worse. It reads the three +files (preimage, postimage and thisimage) from the work tree in the work +tree representation, merges them without converting them to the canonical +representation first but inserts the conflict markers with the canonical +representation and writes the resulting mess out. It needs to be fixed to +read with convert_to_git(), merge them while they are still in the +canonical representation and possibly add conflict markers, and then write +the results out after convert_to_working_tree(). It also needs to write +in binary mode as well. + +* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits + - Add option for using a foreign VCS + - Document details of transport function APIs + - Allow late reporting of fetched hashes + +* js/notes (Tue Apr 14 00:03:36 2009 +0200) 15 commits + - Documentation: fix 'linkgit' macro in "git-notes.txt" + - tests: fix "export var=val" + - notes: refuse to edit notes outside refs/notes/ + - t3301: use test_must_fail instead of ! + - t3301: fix confusing quoting in test for valid notes ref + - notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR + - notes: only clean up message file when editing + - handle empty notes gracefully + - git notes show: test empty notes + - git-notes: fix printing of multi-line notes + - notes: fix core.notesRef documentation + - Add an expensive test for git-notes + - Speed up git notes lookup + - Add a script to edit/inspect notes + - Introduce commit notes + +* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits + - t/t9600: remove exit after test_done + - cvsimport: extend testcase about patchset order to contain + branches + - cvsimport: add test illustrating a bug in cvsps + + Add a test of "git cvsimport"'s handling of tags and branches + + Add some tests of git-cvsimport's handling of vendor branches + + Test contents of entire cvsimported "master" tree contents + + Use CVS's -f option if available (ignore user's ~/.cvsrc file) + + Start a library for cvsimport-related tests + +Two cvsimport test topics were rewound from 'next' and merged into this +one. I'll keep this in 'pu' so that people can polish their cvsps skilz +to resolve issues these tests identify. + +---------------------------------------------------------------- +[Actively cooking] + +* lt/pack-object-memuse (Fri Apr 10 18:15:26 2009 -0700) 2 commits + + show_object(): push path_name() call further down + + process_{tree,blob}: show objects without buffering + +This had some conflicts with Christian's bisect topic; I think I resolved +them correctly, but double-checking would be nice. + +* nd/archive-attribute (Mon Apr 13 14:18:39 2009 +0200) 5 commits + + archive test: test new --fix-attributes feature + + archive: do not read .gitattributes in working directory + + unpack-trees: do not muck with attributes when we are not checking + out + + attr: add GIT_ATTR_INDEX "direction" + + archive tests: do not use .gitattributes in working directory + +With fix-ups from René and myself. Perhaps 1.6.3 material, perhaps not. + +* js/add-edit (Wed Apr 8 23:30:24 2009 +0200) 1 commit + - git-add: introduce --edit (to edit the diff vs. the index) + +* cc/replace (Tue Apr 14 00:36:59 2009 +0200) 13 commits + - Documentation: add documentation for "git replace" + - Add git-replace to .gitignore + - builtin-replace: use "usage_msg_opt" to give better error messages + - parse-options: add new function "usage_msg_opt" + - builtin-replace: teach "git replace" to actually replace + - Add new "git replace" command + - environment: add global variable to disable replacement + - mktag: call "check_sha1_signature" with the replacement sha1 + - replace_object: add a test case + - object: call "check_sha1_signature" with the replacement sha1 + - sha1_file: add a "read_sha1_file_repl" function + - replace_object: add mechanism to replace objects found in + "refs/replace/" + - refs: add a "for_each_replace_ref" function + +I suspect an attempt to replace an object that is directly listed on the +command line would not work very well with this series. + +---------------------------------------------------------------- +[Reverted] + +* mh/cvsimport-tests (Mon Feb 23 06:08:14 2009 +0100) 5 commits + + Add a test of "git cvsimport"'s handling of tags and branches + + Add some tests of git-cvsimport's handling of vendor branches + + Test contents of entire cvsimported "master" tree contents + + Use CVS's -f option if available (ignore user's ~/.cvsrc file) + + Start a library for cvsimport-related tests + +This has been reverted out of 'next' for some time now. + +---------------------------------------------------------------- +[On Hold] + +* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit + - receive-pack: default receive.denyDeleteCurrent to refuse + +* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit + - Refuse updating the current branch in a non-bare repository via + push + +These are for 1.7.0, but the messages when they trigger together may need +to be rethought.