From c58d77d8960df7f7d95aef93b7af5330a510d5be Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 5 Aug 2008 21:44:16 -0700 Subject: [PATCH] What's cooking (2008/07 #05) --- whats-cooking.txt | 273 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 154 insertions(+), 119 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index e0fe6aa8d8..9447fce872 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,6 +1,6 @@ -Subject: What's cooking in git.git (Jul 2008, issue #04; Wed, 09) +Subject: What's cooking in git.git (Jul 2008, issue #05; Sun, 13) -What's cooking in git.git (Jul 2008, issue #04; Wed, 09) +What's cooking in git.git (Jul 2008, issue #05; Sun, 13) -------------------------------------------------------- Here are the topics that have been cooking. Commits prefixed @@ -8,48 +8,94 @@ with '-' are only in 'pu' while commits prefixed with '+' are in 'next'. The topics list the commits in reverse chronological order. The topics -meant to be applied to the maintenance series have "maint-" in their -names. +meant to be merged to the maintenance series have "maint-" in their names. -It already is beginning to become clear what 1.6.0 will look like. What's -already in 'next' all are well intentioned (I do not guarantee they are -already bug-free --- that is what cooking them in 'next' is for) and are -good set of feature enhancements. Bigger changes will be: +I think most of the important stuff is already in 'next'. Let's start +talking about closing the merge window for 1.6.0. - * Port for MinGW. +---------------------------------------------------------------- +[New Topics] - * With the default Makefile settings, most of the programs will be - installed outside your $PATH, except for "git", "gitk", "git-gui" and - some server side programs that need to be accessible for technical - reasons. Invoking a git subcommand as "git-xyzzy" from the command - line has been deprecated since early 2006 (and officially announced in - 1.5.4 release notes); use of them from your scripts after adding - output from "git --exec-path" to the $PATH will still be supported in - 1.6.0, but users are again strongly encouraged to adjust their - scripts to use "git xyzzy" form, as we will stop installing - "git-xyzzy" hardlinks for built-in commands in later releases. +* sb/dashless (Sun Jul 13 15:36:15 2008 +0200) 3 commits + - Make usage strings dash-less + - t/: Use "test_must_fail git" instead of "! git" + - t/test-lib.sh: exit with small negagive int is ok with + test_must_fail + +* mv/dashless (Fri Jul 11 02:12:06 2008 +0200) 4 commits + - make remove-dashes: apply to scripts and programs as well, not + just to builtins + - git-bisect: use dash-less form on git bisect log + - t1007-hash-object.sh: use quotes for the test description + - t0001-init.sh: change confusing directory name + +* sp/maint-bash-completion-optim (Mon Jul 14 00:22:03 2008 +0000) 1 commit + + bash completion: Append space after file names have been completed + +Early parts are already merged to 'master' and need to be merged down to +maint as well, as this is about a "performance bug" that has been with us +almost forever. + +* ag/rewrite_one (Sat Jul 12 22:00:57 2008 +0400) 1 commit + + Fix quadratic performance in rewrite_one. + +* sp/win (Fri Jul 11 18:52:42 2008 +0200) 3 commits + + We need to check for msys as well as Windows in add--interactive. + + Convert CR/LF to LF in tag signatures + + Fixed text file auto-detection: treat EOF character 032 at the end + of file as printable + +* js/merge-rr (Sat Jul 12 15:56:19 2008 +0100) 2 commits + + Move MERGE_RR from .git/rr-cache/ into .git/ + + builtin-rerere: more carefully find conflict markers - * git-merge will be rewritten in C. +* sb/rerere-lib (Wed Jul 9 14:58:57 2008 +0200) 2 commits + + rerere: Separate libgit and builtin functions + + builtin-rerere: more carefully find conflict markers - * default pack and idx versions will be updated as scheduled for some - time ago. +* ls/mailinfo (Sun Jul 13 20:30:12 2008 +0200) 3 commits + - git-mailinfo: use strbuf's instead of fixed buffers + - Add some useful functions for strbuf manipulation. + - Make some strbuf_*() struct strbuf arguments const. - * GIT_CONFIG, which was only documented as affecting "git config", but - actually affected all git commands, now only affects "git config". - GIT_LOCAL_CONFIG, also only documented as affecting "git config" and - not different from GIT_CONFIG in a useful way, is removed. +* gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit + - cherry: cache patch-ids to avoid repeating work ----------------------------------------------------------------- -[New Topics] +This does not seem to pass tests even on its own. -* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits - + Teach git-merge -X