Skip to content

Commit c068d5b

Browse files
committed
What's cooking (2010/01 git#10)
1 parent 85ace14 commit c068d5b

File tree

1 file changed

+103
-51
lines changed

1 file changed

+103
-51
lines changed

whats-cooking.txt

Lines changed: 103 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,122 @@
11
To: git@vger.kernel.org
2-
Subject: What's cooking in git.git (Jan 2010, #09; Mon, 25)
3-
X-master-at: e3f67d30b20e49d8fc3eefe819808cba7998b060
4-
X-next-at: fbe713d5bd6c280a0b5838c6fffb700008ae456e
2+
Subject: What's cooking in git.git (Jan 2010, #10; Sun, 31)
3+
X-master-at: c0da5db1e692c2bc74e5cdba67baf8762ac304b4
4+
X-next-at: 0b0b75cec288f9895f99607456ed06b21da0e2a9
55

6-
What's cooking in git.git (Jan 2010, #09; Mon, 25)
6+
What's cooking in git.git (Jan 2010, #10; Sun, 31)
77
--------------------------------------------------
88

99
Here are the topics that have been cooking. Commits prefixed with '-' are
1010
only in 'pu' while commits prefixed with '+' are in 'next'. The ones
1111
marked with '.' do not appear in any of the integration branches, but I am
1212
still holding onto them.
1313

14-
We are already past -rc0; I think jl/diff-submodule-ignore should be part
15-
of 1.7.0-rc1, and I heard that early parts of jh/gitweb-cached are ready,
16-
but perhaps needs the final round of clean-up. I am not confident if we
17-
can fix any potential fallouts before 1.7.0 if we merged other topics.
14+
We are passed 1.7.0-rc1; please test "master" branch to avoid giving
15+
regressions to end users. Thanks.
1816

19-
So while I expect some minor merges to 'master' yet to come but otherwise
20-
this should be pretty much "it" from feature-set perspective.
17+
--------------------------------------------------
18+
[Graduated to "master"]
2119

22-
Oh, gitk and git-gui may have further pull-requests before -rc1.
20+
* jl/diff-submodule-ignore (2010-01-24) 2 commits
21+
(merged to 'next' on 2010-01-25 at fbe713d)
22+
+ Teach diff --submodule that modified submodule directory is dirty
23+
+ git diff: Don't test submodule dirtiness with --ignore-submodules
24+
(this branch uses jc/ce-uptodate.)
2325

24-
--------------------------------------------------
25-
[New Topics]
26+
* jc/ce-uptodate (2010-01-24) 1 commit
27+
(merged to 'next' on 2010-01-25 at fbe713d)
28+
+ Make ce_uptodate() trustworthy again
29+
(this branch is used by jl/diff-submodule-ignore.)
30+
31+
* gp/maint-cvsserver (2010-01-26) 1 commit
32+
+ git-cvsserver: allow regex metacharacters in CVSROOT
2633

2734
* fk/threaded-grep (2010-01-25) 1 commit
28-
- Threaded grep
35+
(merged to 'next' on 2010-01-26 at 687b2a6)
36+
+ Threaded grep
2937
(this branch uses jc/grep-q.)
3038

3139
400% performance gain on a 4-core box ;-)
3240

3341
* jc/grep-q (2010-01-25) 1 commit
34-
- grep: expose "status-only" feature via -q
42+
(merged to 'next' on 2010-01-26 at 687b2a6)
43+
+ grep: expose "status-only" feature via -q
3544
(this branch is used by fk/threaded-grep.)
3645

37-
* jl/diff-submodule-ignore (2010-01-24) 2 commits
38-
(merged to 'next' on 2010-01-25 at fbe713d)
39-
+ Teach diff --submodule that modified submodule directory is dirty
40-
+ git diff: Don't test submodule dirtiness with --ignore-submodules
41-
(this branch uses jc/ce-uptodate.)
42-
4346
--------------------------------------------------
44-
[Cooking]
47+
[New Topics]
4548

46-
* jc/ce-uptodate (2010-01-24) 1 commit
47-
(merged to 'next' on 2010-01-25 at fbe713d)
48-
+ Make ce_uptodate() trustworthy again
49-
(this branch is used by jl/diff-submodule-ignore.)
49+
* jn/maint-makedepend (2010-01-26) 5 commits
50+
- Makefile: drop dependency on $(wildcard */*.h)
51+
- Makefile: clean up http-walker.o dependency rules
52+
- Makefile: remove wt-status.h from LIB_H
53+
- Makefile: make sure test helpers are rebuilt when headers change
54+
- Makefile: add missing header file dependencies
55+
(this branch is used by jn/makedepend and jn/master-makedepend.)
56+
57+
These look sensible clean-up that could go to maint.
58+
59+
* jn/master-makedepend (2010-01-26) 0 commits
60+
(this branch uses jn/maint-makedepend; is used by jn/makedepend.)
61+
62+
This is to help merging the clean-up to "master".
63+
64+
* jn/makedepend (2010-01-31) 9 commits
65+
- Makefile: always remove .depend directories on 'make clean'
66+
- Makefile: tuck away generated makefile fragments in .depend
67+
- Teach Makefile to check header dependencies
68+
- Makefile: list standalone program object files in PROGRAM_OBJS
69+
- Makefile: lazily compute header dependencies
70+
- Makefile: list generated object files in OBJECTS
71+
- Makefile: disable default implicit rules
72+
- Makefile: rearrange dependency rules
73+
- Makefile: transport.o depends on branch.h now
74+
(this branch uses jn/maint-makedepend and jn/master-makedepend.)
75+
76+
And this is to build on top.
77+
78+
* ms/filter-branch-submodule (2010-01-28) 2 commits
79+
(merged to 'next' on 2010-01-28 at 226cbf8)
80+
+ filter-branch: Add tests for submodules in tree-filter
81+
+ filter-branch: Fix to allow replacing submodules with another content
82+
83+
* jc/checkout-detached (2010-01-29) 1 commit
84+
- Reword "detached HEAD" notification
85+
86+
* jc/maint-fix-test-perm (2010-01-30) 2 commits
87+
- lib-patch-mode.sh: Fix permission
88+
- t6000lib: Fix permission
89+
90+
* jh/gitweb-caching (2010-01-30) 8 commits
91+
- gitweb: Add an option to force version match
92+
- gitweb: Add optional extra parameter to die_error, for extended explanation
93+
- gitweb: add a "string" variant of print_sort_th
94+
- gitweb: add a "string" variant of print_local_time
95+
- gitweb: Check that $site_header etc. are defined before using them
96+
- gitweb: Makefile improvements
97+
- gitweb: Load checking
98+
- gitweb: Make running t9501 test with '--debug' reliable and usable
99+
100+
* jn/makefile-script-lib (2010-01-31) 1 commit
101+
- Do not install shell libraries executable
102+
103+
* mv/request-pull-modernize (2010-01-29) 1 commit
104+
- request-pull: avoid mentioning that the start point is a single commit
105+
106+
* sp/maint-fast-import-large-blob (2010-01-29) 1 commit
107+
- fast-import: Stream very large blobs directly to pack
108+
(this branch is used by sp/fast-import-large-blob.)
50109

51-
I think this and Jens Lehmann's follow-up patch to avoid calling
52-
is_submodule_modified() are needed before 1.7.0
110+
Importing a large blob via fast-import may bust the pack size limit (or
111+
2GB filesize limit found on some filesystems).
112+
113+
* sp/fast-import-large-blob (2010-01-29) 0 commits
114+
(this branch uses sp/maint-fast-import-large-blob.)
115+
116+
And this is to help merging the topic to newer codebase.
117+
118+
--------------------------------------------------
119+
[Cooking]
53120

54121
* cc/reset-keep (2010-01-19) 5 commits
55122
- reset: disallow using --keep when there are unmerged entries
@@ -64,11 +131,14 @@ perhaps queuing it to pu to give it wider visibility may help somebody
64131
coming up with a better way to defend the feature and introduce it to
65132
users without confusing them than Christan nor I managed to.
66133

67-
* jh/notes (2010-01-17) 20 commits
68-
- builtin-gc: Teach the new --notes option to garbage-collect notes
69-
- Notes API: gc_notes(): Prune notes that belong to non-existing objects
134+
* jh/notes (2010-01-27) 23 commits
135+
- builtin-notes: Add "add" subcommand for appending to note objects
136+
- builtin-notes: Add "list" subcommand for listing note objects
137+
- Documentation: Generalize git-notes docs to 'objects' instead of 'commits'
138+
- builtin-notes: Add "prune" subcommand for removing notes for missing objects
139+
- Notes API: prune_notes(): Prune notes that belong to non-existing objects
70140
- t3305: Verify that removing notes triggers automatic fanout consolidation
71-
- builtin-notes: Teach -d option for deleting existing notes
141+
- builtin-notes: Add "remove" subcommand for removing existing notes
72142
- Teach builtin-notes to remove empty notes
73143
- Teach notes code to properly preserve non-notes in the notes tree
74144
- t3305: Verify that adding many notes with git-notes triggers increased fanout
@@ -84,25 +154,7 @@ users without confusing them than Christan nor I managed to.
84154
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
85155
- Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef
86156
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
87-
- Minor non-functional fixes to notes.c
88-
89-
The changes to test vector this series makes to t3301 breaks tests that
90-
are in 'master', so 'pu' doesn't pass it.
91-
92-
* jh/gitweb-cached (2010-01-13) 9 commits
93-
- gitweb: File based caching layer (from git.kernel.org)
94-
- gitweb: Convert output to using indirect file handle
95-
- gitweb: cleanup error message produced by undefined $site_header
96-
- gitweb: add a get function to compliment print_sort_th
97-
- gitweb: add a get function to compliment print_local_time
98-
- gitweb: Makefile improvements
99-
- gitweb: Add option to force version match
100-
- gitweb: change die_error to take "extra" argument for extended die information
101-
- gitweb: Load checking
102-
103-
I know there is a series to split the later ones into smaller chunks that
104-
are being discussed on the list, but they don't appear here. I'd prefer
105-
to pick the series up after all the dust from the discussion settles.
157+
- Cosmetic fixes to notes.c
106158

107159
* jc/grep-author-all-match-implicit (2010-01-17) 1 commit
108160
- "log --author=me --grep=it" should find intersection, not union

0 commit comments

Comments
 (0)