mirror of
https://github.com/git/git.git
synced 2026-01-20 23:52:52 +00:00
What's cooking (2008/11 #05)
This commit is contained in:
Junio C Hamano
@@ -1,8 +1,8 @@
|
||||
Subject: What's cooking in git.git (Nov 2008, #04; Wed, 12)
|
||||
X-master-at: 171d7661eda111d3e35f6e8097a1a3a07b30026c
|
||||
X-next-at: c990ab59beabbf7e62799d0a0190cc0a5171aba2
|
||||
Subject: What's cooking in git.git (Nov 2008, #05; Sat, 15)
|
||||
X-master-at: ea4f2bd39dcfabb23e86b2f79149c6c4038ff3cd
|
||||
X-next-at: a277108ccd37bb47333edf23a681288943b48ef3
|
||||
|
||||
What's cooking in git.git (Nov 2008, #04; Wed, 12)
|
||||
What's cooking in git.git (Nov 2008, #05; Sat, 15)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed
|
||||
@@ -12,39 +12,43 @@ 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.
|
||||
|
||||
I think we should declare -rc0 by the end of this week, with the goal of
|
||||
including everything that are in 'next' as of tonight, plus the "narrow
|
||||
checkout" and possibly Pierre's send-email that acts as format-patch
|
||||
frontend, by the time we hit -rc1, perhaps soon after the end of month.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* lt/preload-lstat (Thu Nov 13 16:36:30 2008 -0800) 1 commit
|
||||
- Add cache preload facility
|
||||
|
||||
* 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).
|
||||
|
||||
* ta/quiet-pull (Sat Nov 15 01:14:24 2008 +0100) 1 commit
|
||||
- Teach/Fix pull/fetch -q/-v options
|
||||
|
||||
This has my fixes to preserve "fetch -v -v" behaviour squashed in.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* mk/maint-cg-push (Mon Nov 10 22:47:11 2008 +0100) 1 commit
|
||||
+ git push: Interpret $GIT_DIR/branches in a Cogito compatible way
|
||||
|
||||
* jk/commit-v-strip (Wed Nov 12 03:23:37 2008 -0500) 5 commits
|
||||
+ status: show "-v" diff even for initial commit
|
||||
+ Merge branch 'jk/maint-commit-v-strip' into jk/commit-v-strip
|
||||
+ commit: Fix stripping of patch in verbose mode.
|
||||
+ wt-status: refactor initial commit printing
|
||||
+ define empty tree sha1 as a macro
|
||||
Will need to further downmerge to 'maint'.
|
||||
|
||||
* jk/maint-commit-v-strip (Wed Nov 12 03:25:52 2008 -0500) 1 commit
|
||||
+ commit: Fix stripping of patch in verbose mode.
|
||||
|
||||
* 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.
|
||||
Will need to further downmerge to 'maint'.
|
||||
|
||||
* nd/rename-cache (Sat Nov 8 18:27:33 2008 +0700) 2 commits
|
||||
- diffcore-rename: add config option to allow to cache renames
|
||||
- diffcore-rename: support rename cache
|
||||
* st/maint-tag (Wed Nov 5 00:20:36 2008 +0100) 2 commits
|
||||
+ tag: Add more tests about mixing incompatible modes and options
|
||||
+ tag: Check that options are only allowed in the appropriate mode
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
Will need to further downmerge to 'maint'.
|
||||
|
||||
* jk/deny-push-to-current (Sat Nov 8 20:49:27 2008 -0500) 2 commits
|
||||
+ receive-pack: detect push to current branch of non-bare repo
|
||||
@@ -71,28 +75,9 @@ This performance fix may eventually need to be cherry-picked to 'maint'.
|
||||
+ gitweb: retrieve snapshot format from PATH_INFO
|
||||
+ gitweb: make the supported snapshot formats array global
|
||||
|
||||
Got sick of waiting for re-Ack.
|
||||
|
||||
* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit
|
||||
+ gitweb: Better processing format string in custom links in navbar
|
||||
|
||||
Got sick of waiting for some sort of response from Pasky.
|
||||
|
||||
* st/tag (Wed Nov 5 00:20:36 2008 +0100) 2 commits
|
||||
+ tag: Add more tests about mixing incompatible modes and options
|
||||
+ tag: Check that options are only allowed in the appropriate mode
|
||||
|
||||
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 5 commits
|
||||
- autoconf: Enable threaded delta search when pthreads are supported
|
||||
+ Add autoconf tests for pthreads
|
||||
+ Make Pthread link flags configurable
|
||||
+ Add Makefile check for FreeBSD 4.9-SECURITY
|
||||
+ Build: add NO_UINTMAX_T to support ancient systems
|
||||
|
||||
I split the part that unconditionally enable threaded delta search on any
|
||||
platform on which Pthread library is detected to be available from the
|
||||
topmost one. Will merge the rest to 'master' soon.
|
||||
|
||||
* jk/diff-convfilter (Sun Oct 26 00:50:02 2008 -0400) 8 commits
|
||||
+ enable textconv for diff in verbose status/commit
|
||||
+ wt-status: load diff ui config
|
||||
@@ -103,36 +88,11 @@ topmost one. Will merge the rest to 'master' soon.
|
||||
+ document the diff driver textconv feature
|
||||
+ diff: add missing static declaration
|
||||
|
||||
* jk/diff-convfilter-test-fix (Fri Oct 31 01:09:13 2008 -0400) 4 commits
|
||||
* jk/diff-convfilter-test-fix (Fri Oct 31 01:09:13 2008 -0400) 1 commit
|
||||
+ Avoid using non-portable `echo -n` in tests.
|
||||
+ add userdiff textconv tests
|
||||
+ document the diff driver textconv feature
|
||||
+ diff: add missing static declaration
|
||||
|
||||
An update to the one above.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* bc/maint-keep-pack (Sun Nov 9 23:59:58 2008 -0600) 9 commits
|
||||
+ pack-objects: extend --local to mean ignore non-local loose
|
||||
objects too
|
||||
+ sha1_file.c: split has_loose_object() into local and non-local
|
||||
counterparts
|
||||
+ t7700: demonstrate mishandling of loose objects in an alternate
|
||||
ODB
|
||||
+ builtin-gc.c: use new pack_keep bitfield to detect .keep file
|
||||
existence
|
||||
+ repack: do not fall back to incremental repacking with [-a|-A]
|
||||
+ repack: don't repack local objects in packs with .keep file
|
||||
+ pack-objects: new option --honor-pack-keep
|
||||
+ packed_git: convert pack_local flag into a bitfield and add
|
||||
pack_keep
|
||||
+ t7700: demonstrate mishandling of objects in packs with a .keep
|
||||
file
|
||||
|
||||
A few commits were rewound from 'next' and replaced with new ones.
|
||||
|
||||
* np/pack-safer (Sun Nov 9 13:11:06 2008 -0800) 11 commits
|
||||
+ t5303: fix printf format string for portability
|
||||
+ t5303: work around printf breakage in dash
|
||||
@@ -156,28 +116,63 @@ A few commits were rewound from 'next' and replaced with new ones.
|
||||
+ remote: add a new 'origin' variable to the struct
|
||||
+ Implement git remote rename
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Will merge to "master" soon]
|
||||
|
||||
* 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
|
||||
|
||||
----------------------------------------------------------------
|
||||
[Actively Cooking]
|
||||
|
||||
* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
|
||||
+ 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
|
||||
|
||||
I think the basic idea and structure of this is sound. Let's see if
|
||||
people who try this feature can find holes in what it currently does.
|
||||
|
||||
* ds/uintmax-config (Mon Nov 3 09:14:28 2008 -0900) 1 commit
|
||||
- autoconf: Enable threaded delta search when pthreads are supported
|
||||
|
||||
* 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.
|
||||
|
||||
* nd/rename-cache (Sat Nov 8 18:27:33 2008 +0700) 2 commits
|
||||
- diffcore-rename: add config option to allow to cache renames
|
||||
- diffcore-rename: support rename cache
|
||||
|
||||
I am moderately negative on this one in its current shape. We shouldn't
|
||||
have to be storing what can be recomputed (and recomputed differently in
|
||||
later software), and we shouldn't be keeping such cached result
|
||||
indefinitely.
|
||||
|
||||
* 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
|
||||
|
||||
* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits
|
||||
- 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
|
||||
|
||||
Early parts looked Ok; I am trying to find time to review the whole thing
|
||||
but fixing bugs in topics from other people here and there took almost all
|
||||
my time this weekend. Not good.
|
||||
|
||||
----------------------------------------------------------------
|
||||
[On Hold]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user