From 9c36507110c072d4e0b5f1059e35fa416e2774ab Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 2 Dec 2008 22:55:26 -0800 Subject: [PATCH] What's in/cooking updates --- whats/cooking/2008/11/06.txt | 200 +++++++++++++++++++++++++++++++++++ whats/in/2008/11/04.txt | 121 +++++++++++++++++++++ 2 files changed, 321 insertions(+) create mode 100644 whats/cooking/2008/11/06.txt create mode 100644 whats/in/2008/11/04.txt diff --git a/whats/cooking/2008/11/06.txt b/whats/cooking/2008/11/06.txt new file mode 100644 index 0000000000..babdb6987d --- /dev/null +++ b/whats/cooking/2008/11/06.txt @@ -0,0 +1,200 @@ +Subject: What's cooking in git.git (Nov 2008, #06; Wed, 26) +X-master-at: aa14a0c3f191ee4df7344eed119be5b4a527a0ff +X-next-at: 406979f7fe53d139cdb79bf8c5eecf8735f4f146 + +What's cooking in git.git (Nov 2008, #06; Wed, 26) +-------------------------------------------------- + +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. + +---------------------------------------------------------------- +[New Topics] + +* cr/remote-update-v (Tue Nov 18 19:04:02 2008 +0800) 1 commit + + git-remote: add verbose mode to git remote update + +Should be in 1.6.1-rc1. + +* 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 + +Should be in 1.6.1-rc1. + +* 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 + +Should be in 1.6.1-rc1 and backmerged to 'maint'. + +* st/levenshtein (Thu Nov 20 14:27:27 2008 +0100) 2 commits + + Document levenshtein.c + + Fix deletion of last character in levenshtein distance + +Should be in 1.6.1-rc1. + +* 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 + +Should be in 1.6.1-rc1 and backmerged to 'maint'. + +* 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() + +Should be in 1.6.1-rc1. + +* pw/maint-p4 (Wed Nov 26 13:52:15 2008 -0500) 1 commit + - git-p4: fix keyword-expansion regex + +Waiting for Ack from git-p4 folks. + +* 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. + +* 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. + +---------------------------------------------------------------- +[Graduated to "master"] + +* bc/maint-keep-pack (Thu Nov 13 14:11:46 2008 -0600) 1 commit + + repack: only unpack-unreachable if we are deleting redundant packs + +This makes "repack -A -d" without -d do the same thing as "repack -a -d", +which makes sense. This does not have to go to 'maint', though. + +* jk/commit-v-strip (Wed Nov 12 03:23:37 2008 -0500) 4 commits + + status: show "-v" diff even for initial commit + + Merge branch 'jk/maint-commit-v-strip' into jk/commit-v-strip + + wt-status: refactor initial commit printing + + define empty tree sha1 as a macro + +---------------------------------------------------------------- +[Will merge to "master" soon] + +* 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 + +* nd/narrow (Tue Nov 18 06:33:16 2008 -0500) 10 commits + + 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 + +* 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. + +---------------------------------------------------------------- +[Actively Cooking] + +* 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). + +* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit + - autoconf: Enable threaded delta search when pthreads are supported + +* 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 + +---------------------------------------------------------------- +[On Hold] + +* 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 + diff --git a/whats/in/2008/11/04.txt b/whats/in/2008/11/04.txt new file mode 100644 index 0000000000..0332db9b89 --- /dev/null +++ b/whats/in/2008/11/04.txt @@ -0,0 +1,121 @@ +Subject: What's in git.git (Nov 2008, #04; Wed, 26) +X-maint-at: 5aa3bdd50d4e4f59c41ee6e70ae1e738a3a28cc0 +X-master-at: aa14a0c3f191ee4df7344eed119be5b4a527a0ff +X-maint-was: 9e77353e0ea6e9e6d88ad1943570afb526d54a16 +X-master-was: ea4f2bd39dcfabb23e86b2f79149c6c4038ff3cd + +What's in git.git (Nov 2008, #04; Wed, 26) + + maint 5aa3bdd (Merge branch 'mm/maint-sort-config-doc' into maint) + master aa14a0c (Merge branch 'maint') +------------------------------------------------------------------------ + +I suspect many people especially the ones in the US will be in vacation +mode and not near their keyboards til next week, but here is an update. + +There are a few 'maint' material cooking in 'next' and v1.6.0.5 should be +tagged at the end of the month. + +At around the same time I am hoping majority of topics cooking in 'next' +tonight can be in 'master' and we can tagl v1.6.1-rc1. + +* The 'maint' branch has these fixes since the last announcement. + +Bryan Drewery (1): + Fix misleading wording for git-cherry-pick + +Junio C Hamano (3): + builtin-ls-files.c: coding style fix. + Teach ls-files --with-tree= to work with options other than -c + Teach "git diff" to honour --[no-]ext-diff + +Matt McCutchen (1): + config.txt: alphabetize configuration sections + +Stefan Naewe (1): + request-pull: make usage string match manpage + + +* The 'master' branch has these since the last announcement + in addition to the above. + +Alex Riesen (2): + Fix handle leak in sha1_file/unpack_objects if there were damaged object + data + Fix t4030-diff-textconv.sh + +Alexander Gavrilov (6): + git-gui: Implement system-wide configuration handling. + git-gui: Fix the after callback execution in rescan. + git-gui: Add a Tools menu for arbitrary commands. + git-gui: Allow Tools request arguments from the user. + git-gui: Implement automatic rescan after Tool execution. + git-gui: Fix the search bar destruction handler. + +Alexandre Julliard (9): + git.el: Improve error handling for commits. + git.el: Remove the env parameter in git-call-process and + git-call-process-string. + git.el: Simplify handling of merge heads in the commit log-edit buffer. + git.el: Properly handle merge commits in git-amend-commit. + git.el: Fix git-amend-commit to support amending an initial commit. + git.el: Never clear the status buffer, only update the files. + git.el: Add an insert file command. + git.el: Add possibility to mark files directly in + git-update-status-files. + git.el: Allow to commit even if there are no marked files. + +Brandon Casey (1): + repack: only unpack-unreachable if we are deleting redundant packs + +Cheng Renquan (1): + git-remote: match usage string with the manual pages + +Christian Couder (2): + Documentation: user-manual: add information about "git help" at the + beginning + Documentation: tutorial: add information about "git help" at the + beginning + +Giuseppe Bilotta (1): + git-gui: try to provide a window icon under X + +Jeff King (3): + define empty tree sha1 as a macro + wt-status: refactor initial commit printing + status: show "-v" diff even for initial commit + +Jim Meyering (1): + xdiff-interface.c: remove 10 duplicated lines + +Joey Hess (1): + sha1_file: avoid bogus "file exists" error message + +Junio C Hamano (1): + builtin-remote.c: plug a small memory leak in + get_one_remote_for_updates() + +Linus Torvalds (1): + Fix machine-parseability of 'git log --source' + +Marcel Koeppen (1): + t9129-git-svn-i18n-commitencoding: Make compare_svn_head_with() + compatible with OSX sed + +Mark Burton (2): + Documentation: rev-list-options.txt: added --branches, --tags & + --remotes. + git-commit.txt - mention that files listed on the command line must be + known to git. + +Miklos Vajna (3): + builtin-branch: use strbuf in delete_branches() + builtin-branch: use strbuf in fill_tracking_info() + builtin-branch: use strbuf in rename_branch() + +Shawn O. Pearce (1): + Update the po template + +Trent Piepho (1): + send-email: Fix Pine address book parsing + -- 2.47.3