What's in/cooking updates

index ef1bda7518..75298e88af 100755 --- a/WC +++ b/WC @@ -37,6 +37,7 @@ mkdir -p "Meta/$lead" exec >"Meta/$lead/$issue.txt" cat <<EOF +To: git@vger.kernel.org Subject: What's cooking in git.git ($monthname $year, #$issue; $dow, $date) X-master-at: $master_at X-next-at: $next_at

index 5c52cd91db..66334d186f 100755 --- a/WI +++ b/WI @@ -34,6 +34,7 @@ mkdir -p "Meta/$lead" exec >"Meta/$lead/$issue.txt" cat <<EOF +To: git@vger.kernel.org Subject: What's in git.git ($monthname $year, #$issue; $dow, $date) X-maint-at: $maint_at X-master-at: $master_at

new file mode 100644 index 0000000000..39bddb4a0e --- /dev/null +++ b/whats/cooking/2008/12/01.txt @@ -0,0 +1,247 @@ +Subject: What's cooking in git.git (Dec 2008, #01; Tue, 02) +X-master-at: 757c7f60a78004fc3d0ea62f44320d54ef430c10 +X-next-at: 44b0c4a7f55234e12cead3e1909c17be7c068dca + +What's cooking in git.git (Dec 2008, #01; Tue, 02) +-------------------------------------------------- + +Here are the topics that have been cooking. Commits prefixed +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 merged to the maintenance series have "maint-" in their names. + +As we have already passed -rc1, things queued in 'next' let alone 'pu' are +unlikely to be merged to 'master' by the end of year unless otherwise +noted. + +---------------------------------------------------------------- +[New Topics] + +* gb/gitweb-patch (Sat Nov 29 14:41:11 2008 +0100) 2 commits + - [DONTMERGE: wait for signoff] gitweb: links to patch action in + commitdiff and shortlog view + - gitweb: add patch view + +* lt/reset-merge (Mon Dec 1 09:30:31 2008 -0800) 1 commit + + Add 'merge' mode to 'git reset' + +Unfortunately, I cannot write down a good use case in what circumstances +this is needed, even though I do recall that I occasionally (perhaps once +every two months) needed to do "read-tree -m -u" myself in the past, and +this patch brings that feature close to Porcelain. On the other hand, the +existing "reset --mixed" is very easily explained ("after starting to add +changes to the staging area, you realized that you screwed up, and you +want to redo it from scratch"). Therefore, I cannot justify what the log +message of this change claims myself. + +* jc/rm-i-t-a (Fri Nov 28 19:56:34 2008 -0800) 5 commits + + git add --intent-to-add: do not let an empty blob be committed by + accident + + git add --intent-to-add: fix removal of cached emptiness + + builtin-rm.c: explain and clarify the "local change" logic + + Merge branch 'nd/narrow' (early part) into jc/add-i-t-a + + Extend index to save more flags + +As intent-to-add index entry is a new feature for 1.6.1, it probably is a +good idea to merge this to 'master'. Nitpicks and bugfixes are very much +appreciated. + +* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits + - In add --patch, Handle K,k,J,j slightly more gracefully. + - Add / command in add --patch + - git-add -i/-p: Change prompt separater from slash to comma + +There are some other useful bits and pieces around this area exchanged on +the list with the author of these patches. I think it would become a +useful series after reassembling their pieces. Waiting for v2. + +* jn/gitweb-utf8 (Mon Dec 1 19:01:42 2008 +0100) 1 commit + - gitweb: Fix handling of non-ASCII characters in inserted HTML + files. + +Possibly a bugfix worthy to have in 1.6.1. + +* jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits + - clone: test the new HEAD detection logic + - Merge commit 'HEAD@{2}' into HEAD + - upload-pack: send the HEAD information + - clone: find the current branch more explicitly + - connect.c::read_extra_info(): find where HEAD points at + - connect.c::read_extra_info(): prepare to receive more than server + capabilities + - get_remote_heads(): refactor code to read "server capabilities" + +This is no way meant for 1.6.1, let alone next, yet. + +---------------------------------------------------------------- +[Graduated to "master"] + +* cr/remote-update-v (Tue Nov 18 19:04:02 2008 +0800) 1 commit + + git-remote: add verbose mode to git remote update + +* rs/strbuf-expand (Sun Nov 23 00:16:59 2008 +0100) 6 commits + + remove the unused files interpolate.c and interpolate.h + + daemon: deglobalize variable 'directory' + + daemon: inline fill_in_extra_table_entries() + + daemon: use strbuf_expand() instead of interpolate() + + merge-recursive: use strbuf_expand() instead of interpolate() + + add strbuf_expand_dict_cb(), a helper for simple cases + +* mv/fast-export (Sun Nov 23 12:55:54 2008 +0100) 2 commits + + fast-export: use an unsorted string list for extra_refs + + Add new testcase to show fast-export does not always exports all + tags + +* st/levenshtein (Thu Nov 20 14:27:27 2008 +0100) 2 commits + + Document levenshtein.c + + Fix deletion of last character in levenshtein distance + +* js/mingw-rename-fix (Wed Nov 19 17:25:27 2008 +0100) 1 commit + + compat/mingw.c: Teach mingw_rename() to replace read-only files + +* mv/clone-strbuf (Fri Nov 21 01:45:01 2008 +0100) 3 commits + + builtin_clone: use strbuf in cmd_clone() + + builtin-clone: use strbuf in clone_local() and + copy_or_link_directory() + + builtin-clone: use strbuf in guess_dir_name() + +* pw/maint-p4 (Wed Nov 26 13:52:15 2008 -0500) 1 commit + - git-p4: fix keyword-expansion regex + +* cc/bisect-skip (Sun Nov 23 22:02:49 2008 +0100) 1 commit + - bisect: teach "skip" to accept special arguments like "A..B" + +Should be in 1.6.1-rc1. + +* lt/preload-lstat (Mon Nov 17 09:01:20 2008 -0800) 2 commits + + Fix index preloading for racy dirty case + + Add cache preload facility + +* ta/quiet-pull (Mon Nov 17 23:09:30 2008 +0100) 2 commits + + Retain multiple -q/-v occurrences in git pull + + Teach/Fix pull/fetch -q/-v options + +* ph/send-email (Tue Nov 11 00:54:02 2008 +0100) 4 commits + + git send-email: ask less questions when --compose is used. + + git send-email: add --annotate option + + git send-email: interpret unknown files as revision lists + + git send-email: make the message file name more specific. + +After merging these to 'master' I found a breakage which I hopefully +fixed. + +---------------------------------------------------------------- +[Will merge to "master" soon] + +What are you looking for? We are in -rc ;-) + +---------------------------------------------------------------- +[On Hold] + +* cb/mergetool (Thu Nov 13 12:41:15 2008 +0000) 3 commits + - [DONTMERGE] Add -k/--keep-going option to mergetool + - Add -y/--no-prompt option to mergetool + - Fix some tab/space inconsistencies in git-mergetool.sh + +Jeff had good comments on the last one; the discussion needs concluded, +and also waiting for comments from the original author (Ted). + +* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits + + blame: show "previous" information in --porcelain/--incremental + format + + git-blame: refactor code to emit "porcelain format" output + +* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit + - autoconf: Enable threaded delta search when pthreads are supported + +Rebased to 'master', that introduced NO_PTHREADS. + +* cc/bisect-replace (Mon Nov 24 22:20:30 2008 +0100) 9 commits + - bisect: add "--no-replace" option to bisect without using replace + refs + - rev-list: make it possible to disable replacing using "--no- + bisect-replace" + - bisect: use "--bisect-replace" options when checking merge bases + - merge-base: add "--bisect-replace" option to use fixed up revs + - commit: add "bisect_replace_all" prototype to "commit.h" + - rev-list: add "--bisect-replace" to list revisions with fixed up + history + - Documentation: add "git bisect replace" documentation + - bisect: add test cases for "git bisect replace" + - bisect: add "git bisect replace" subcommand + +I really hate the idea of introducing a potentially much more useful +replacement of the existing graft mechanism and tie it very tightly to +bisect, making it unusable from outside. + + (1) I do not think "bisect replace" workflow is a practical and usable + one; + + (2) The underlying mechanism to express "this object replaces that other + object" is much easier to work with than what the graft does which is + "the parents of this commit are these", and idea to use the normal + ref to point at them means this can potentially be used for + transferring the graft information across repositories, which the + current graft mechanism cannot do. + + (3) Because I like the aspect (2) of this series so much, it deeply + disappoints and troubles me that this is implemented minimally near + the surface, and that it is controlled by the "bisect" Porcelain + alone, by explicitly passing command line arguments. + +I think a mechanism like this should be added to replace grafts, but it +should always be enabled for normal revision traversal operation, while +always disabled for object enumeration and transfer operation (iow, fsck, +fetch and push should use the real ancestry information recorded in the +underlying objects, while rev-list, log, etc. should always use the +replaced objects). I have a suspicion that even cat-file could honor it. + +* nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 18 commits + - wt-status: show sparse checkout info + - Introduce default sparse patterns (core.defaultsparse) + - checkout: add new options to support sparse checkout + - clone: support sparse checkout with --sparse-checkout option + - unpack_trees(): add support for sparse checkout + - unpack_trees(): keep track of unmerged entries + - Introduce "sparse patterns" + - Merge branch 'master' into nd/narrow + + t2104: touch portability fix + + grep: skip files outside sparse checkout area + + checkout_entry(): CE_NO_CHECKOUT on checked out entries. + + Prevent diff machinery from examining worktree outside sparse + checkout + + ls-files: Add tests for --sparse and friends + + update-index: add --checkout/--no-checkout to update + CE_NO_CHECKOUT bit + + update-index: refactor mark_valid() in preparation for new options + + ls-files: add options to support sparse checkout + + Introduce CE_NO_CHECKOUT bit + + Extend index to save more flags + +Kicked back to 'on hold' until 1.6.1 final by popular(?) demand. + +* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit + - "git push": tellme-more protocol extension + +This seems to have a deadlock during communication between the peers. +Someone needs to pick up this topic and resolve the deadlock before it can +continue. + +* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit + - diff: enable "too large a rename" warning when -M/-C is explicitly + asked for + +This would be the right thing to do for command line use, +but gitk will be hit due to tcl/tk's limitation, so I am holding +this back for now. + +* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits + - git-am --forge: add Signed-off-by: line for the author + - git-am: clean-up Signed-off-by: lines + - stripspace: add --log-clean option to clean up signed-off-by: + lines + - stripspace: use parse_options() + - Add "git am -s" test + - git-am: refactor code to add signed-off-by line for the committer

new file mode 100644 index 0000000000..c5529401e6 --- /dev/null +++ b/whats/in/2008/12/01.txt @@ -0,0 +1,161 @@ +Subject: What's in git.git (Dec 2008, #01; Tue, 02) +X-maint-at: 25e30fa08e687d584d9dd87d13acf84bb1e1858c +X-master-at: 757c7f60a78004fc3d0ea62f44320d54ef430c10 +X-maint-was: 5aa3bdd50d4e4f59c41ee6e70ae1e738a3a28cc0 +X-master-was: aa14a0c3f191ee4df7344eed119be5b4a527a0ff + +What's in git.git (Dec 2008, #01; Tue, 02) + + maint 25e30fa (User's Manual: remove duplicated url at the end of Appendix B) + master 757c7f6 (git-stash: use git rev-parse -q) +------------------------------------------------------------------------ + +We'll probably have 1.6.0.5 by the end of this week. + +The tip of the 'master' branch is at 1.6.1-rc1 with a few more fixes. +Hopefully we will have the final 1.6.1 by the end of the year. + +* The 'maint' branch has these fixes since the last announcement. + +Joey Hess (1): + sha1_file: avoid bogus "file exists" error message + +Johannes Schindelin (1): + fast-export: use an unsorted string list for extra_refs + +Junio C Hamano (1): + Update draft release notes to 1.6.0.5 + +Martin Koegler (1): + git push: Interpret $GIT_DIR/branches in a Cogito compatible way + +Matt McCutchen (1): + git checkout: don't warn about unborn branch if -f is already passed + +Miklos Vajna (2): + Add new testcase to show fast-export does not always exports all tags + User's Manual: remove duplicated url at the end of Appendix B + +Nguyễn Thái Ngọc Duy (1): + generate-cmdlist.sh: avoid selecting synopsis at wrong place + +Pete Wyckoff (1): + git-p4: fix keyword-expansion regex + +Ralf Wildenhues (1): + Fix typos in the documentation. + +SZEDER Gábor (2): + bash: remove dashed command leftovers + bash: offer refs instead of filenames for 'git revert' + +Sam Vilain (1): + sha1_file.c: resolve confusion EACCES vs EPERM + +Samuel Tardieu (2): + tag: Check that options are only allowed in the appropriate mode + tag: Add more tests about mixing incompatible modes and options + + +* The 'master' branch has these since the last announcement + in addition to the above. + +Alexander Gavrilov (3): + gitk: Avoid handling the Return key twice in Add Branch + gitk: Make line origin search update the busy status + gitk: Add a menu option to start git gui + +Cheng Renquan (1): + git-remote: add verbose mode to git remote update + +Christian Couder (4): + git-gui: french translation update + bisect: teach "skip" to accept special arguments like "A..B" + bisect: fix "git bisect skip <commit>" and add tests cases + Documentation: describe how to "bisect skip" a range of commits + +Christian Stimming (1): + gitk: Update German translation + +Giuseppe Bilotta (2): + gitweb: make gitweb_check_feature a boolean wrapper + Update comment on gitweb_check/get_feature + +Johannes Schindelin (1): + Document levenshtein.c + +Johannes Sixt (2): + compat/mingw.c: Teach mingw_rename() to replace read-only files + t4030-diff-textconv: Make octal escape sequence more portable + +Junio C Hamano (6): + gitweb: fix 'ctags' feature check and others + gitweb: rename gitweb_check_feature to gitweb_get_feature + send-email: do not reverse the command line arguments + Include git-gui--askpass in git-gui RPM package + GIT 1.6.1-rc1 + Makefile: introduce NO_PTHREADS + +Linus Torvalds (3): + Add cache preload facility + Fix index preloading for racy dirty case + Add backslash to list of 'crud' characters in real name + +Mark Burton (1): + git-gui: Teach start_push_anywhere_action{} to notice when remote is a + mirror. + +Michele Ballabio (1): + git gui: update Italian translation + +Miklos Vajna (5): + Update Hungarian translation. 100% completed. + builtin-clone: use strbuf in guess_dir_name() + builtin-clone: use strbuf in clone_local() and copy_or_link_directory() + builtin_clone: use strbuf in cmd_clone() + git-stash: use git rev-parse -q + +Nanako Shiraishi (1): + git-gui: update Japanese translation + +Paul Mackerras (6): + gitk: Index line[hnd]tag arrays by id rather than row number + gitk: Fix switch statement in parseviewargs + gitk: Show local changes properly when we have a path limit + gitk: Fix context menu items for generating diffs when in tree mode + gitk: Highlight only when search type is "containing:". + gitk: Fix bug in accessing undefined "notflag" variable + +Peter Krefting (1): + Updated Swedish translation (514t0f0u). + +Pierre Habouzit (4): + git send-email: make the message file name more specific. + git send-email: interpret unknown files as revision lists + git send-email: add --annotate option + git send-email: ask less questions when --compose is used. + +Ralf Wildenhues (1): + Fix typos in the documentation. + +René Scharfe (6): + add strbuf_expand_dict_cb(), a helper for simple cases + merge-recursive: use strbuf_expand() instead of interpolate() + daemon: use strbuf_expand() instead of interpolate() + daemon: inline fill_in_extra_table_entries() + daemon: deglobalize variable 'directory' + remove the unused files interpolate.c and interpolate.h + +SZEDER Gábor (1): + bash: complete full refs + +Samuel Tardieu (1): + Fix deletion of last character in levenshtein distance + +Scott Chacon (1): + Add a built-in alias for 'stage' to the 'add' command + +Tuncer Ayaz (2): + Teach/Fix pull/fetch -q/-v options + Retain multiple -q/-v occurrences in git pull +