What's cooking (2010/01 #01)
Junio C Hamano committed
Jan 4, 2010 at 00:37 UTC
99779d12076447d438225ec5dffa6355d1410b13
1 file changed
+88
-88
whats-cooking.txt
+88
-88
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2009, #06; Thu, 31)
3
-X-master-at: 37bae10e38a66e4f1ddd5350daded00b21735126
4
-X-next-at: 442ff22addab31be84a7a93a389d265fc8a49f93
2
+Subject: What's cooking in git.git (Jan 2010, #01; Mon, 04)
3
+X-master-at: bd757c18597789d4f01cbd2ffc7c1f55e90cfcd0
4
+X-next-at: 8802c2c062c167ec9c81e811dd90791ed3fdc74b
5
6
-What's cooking in git.git (Dec 2009, #06; Thu, 31)
6
+What's cooking in git.git (Jan 2010, #01; Mon, 04)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,24 +11,51 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones
11
marked with '.' do not appear in any of the integration branches, but I am
12
still holding onto them.
13
14
-The tip of 'next' will soon be rebuilt on top of the current 'master'.
15
-
16
-This will be the last "What's cooking" message in year 2009 ;-)
14
+The tip of 'next' has been rebuilt on top of the current 'master'.
15
16
--------------------------------------------------
17
[New Topics]
18
21
-* cc/reset-more (2009-12-30) 4 commits
22
- - reset: use "unpack_trees()" directly instead of "git read-tree"
23
- - reset: add a few tests for "git reset --merge"
24
- - Documentation: reset: add some tables to describe the different options
25
- - reset: improve mixed reset error message when in a bare repo
19
+* da/difftool (2009-12-22) 2 commits
20
+ - git-difftool: Add '--gui' for selecting a GUI tool
21
+ - t7800-difftool: Set a bogus tool for use by tests
22
+
23
+* jh/gitweb-cached (2010-01-03) 4 commits
24
+ - gitweb: Makefile improvements
25
+ - gitweb: Optionally add "git" links in project list page
26
+ - gitweb: Add option to force version match
27
+ - gitweb: Load checking
28
+
29
+* tc/test-locate-httpd (2010-01-02) 1 commit
30
+ - t/lib-http.sh: Restructure finding of default httpd location
31
+
32
+* jc/fix-tree-walk (2009-09-14) 7 commits
33
+ - read-tree --debug-unpack
34
+ - unpack-trees.c: look ahead in the index
35
+ - unpack-trees.c: prepare for looking ahead in the index
36
+ - Aggressive three-way merge: fix D/F case
37
+ - traverse_trees(): handle D/F conflict case sanely
38
+ - more D/F conflict tests
39
+ - tests: move convenience regexp to match object names to test-lib.sh
40
+
41
+Resurrected from "Ejected" category.
42
+
43
+--------------------------------------------------
44
+[Cooking]
45
27
-Resurrected from "Ejected" category. Haven't looked at it yet myself,
28
-though...
46
+* cc/reset-more (2010-01-04) 6 commits
47
+ (merged to 'next' on 2010-01-04 at 8802c2c)
48
+ + Fix bit assignment for CE_CONFLICTED
49
+ (merged to 'next' on 2010-01-03 at f83d4c6)
50
+ + "reset --merge": fix unmerged case
51
+ + reset: use "unpack_trees()" directly instead of "git read-tree"
52
+ + reset: add a few tests for "git reset --merge"
53
+ + Documentation: reset: add some tables to describe the different options
54
+ + reset: improve mixed reset error message when in a bare repo
55
56
* bg/maint-remote-update-default (2009-12-31) 1 commit
31
- - Fix "git remote update" with remotes.defalt set
57
+ (merged to 'next' on 2010-01-03 at 113009e)
58
+ + Fix "git remote update" with remotes.defalt set
59
60
* jc/branch-d (2009-12-29) 1 commit
61
- branch -d: base the "already-merged" safety on the branch it merges with
@@ -37,13 +64,16 @@ though...
64
- Teach --[no-]rerere-autoupdate option to merge, revert and friends
65
66
* jk/maint-1.6.5-reset-hard (2009-12-30) 1 commit
40
- (merged to 'next' on 2009-12-30 at de97679)
67
+ (merged to 'next' on 2010-01-02 at 190d63b)
68
+ reset: unbreak hard resets with GIT_WORK_TREE
69
70
* jk/push-to-delete (2009-12-30) 1 commit
44
- - builtin-push: add --delete as syntactic sugar for :foo
71
+ (merged to 'next' on 2010-01-03 at 9ee293b)
72
+ + builtin-push: add --delete as syntactic sugar for :foo
73
46
-* jk/run-command-use-shell (2009-12-30) 6 commits
74
+* jk/run-command-use-shell (2010-01-01) 8 commits
75
+ - t4030, t4031: work around bogus MSYS bash path conversion
76
+ - t0021: use $SHELL_PATH for the filter script
77
- diff: run external diff helper with shell
78
- textconv: use shell to run helper
79
- editor: use run_command's shell feature
@@ -51,17 +81,25 @@ though...
81
- run-command: convert simple callsites to use_shell
82
- run-command: add "use shell" option
83
84
+ Xref: news.gmane.org gmane.comp.version-control.git:136128
85
+ * check t0021: drop one to t4030;
86
+ * reorder and move t0021 up, immediately after run-command: optimize
87
+
88
* mm/config-path (2009-12-30) 1 commit
55
- - builtin-config: add --path option doing ~ and ~user expansion.
89
+ (merged to 'next' on 2010-01-03 at 9c0e81a)
90
+ + builtin-config: add --path option doing ~ and ~user expansion.
91
92
* pm/cvs-environ (2009-12-30) 1 commit
58
- - CVS Server: Support reading base and roots from environment
93
+ (merged to 'next' on 2010-01-03 at 4c22932)
94
+ + CVS Server: Support reading base and roots from environment
95
96
* rs/maint-archive-match-pathspec (2009-12-12) 1 commit
61
- - archive: complain about path specs that don't match anything
97
+ (merged to 'next' on 2010-01-03 at 92d7d15)
98
+ + archive: complain about path specs that don't match anything
99
100
* so/cvsserver-update (2009-12-07) 1 commit
64
- - cvsserver: make the output of 'update' more compatible with cvs.
101
+ (merged to 'next' on 2010-01-03 at 99959b6)
102
+ + cvsserver: make the output of 'update' more compatible with cvs.
103
104
* tc/clone-v-progress (2009-12-26) 4 commits
105
- clone: use --progress to force progress reporting
@@ -69,16 +107,15 @@ though...
107
- git-clone.txt: reword description of progress behaviour
108
- check stderr with isatty() instead of stdout when deciding to show progress
109
72
-* tc/smart-http-restrict (2009-12-30) 3 commits
110
+* tc/smart-http-restrict (2010-01-02) 4 commits
111
- Smart-http tests: Test http-backend without curl or a webserver
112
- Smart-http tests: Break test t5560-http-backend into pieces
113
+ - Smart-http tests: Improve coverage in test t5560
114
- Smart-http: check if repository is OK to export before serving it
115
116
* tr/maint-1.6.5-bash-prompt-show-submodule-changes (2009-12-31) 1 commit
78
- - bash completion: factor submodules into dirty state
79
-
80
---------------------------------------------------
81
-[Cooking]
117
+ (merged to 'next' on 2010-01-03 at b785974)
118
+ + bash completion: factor submodules into dirty state
119
120
* jc/cache-unmerge (2009-12-25) 9 commits
121
- rerere forget path: forget recorded resolution
@@ -92,21 +129,24 @@ though...
129
- builtin-merge.c: use standard active_cache macros
130
131
* js/filter-branch-prime (2009-12-15) 1 commit
95
- - filter-branch: remove an unnecessary use of 'git read-tree'
132
+ (merged to 'next' on 2010-01-03 at 7c90319)
133
+ + filter-branch: remove an unnecessary use of 'git read-tree'
134
135
* mg/tag-d-show (2009-12-10) 1 commit
98
- - tag -d: print sha1 of deleted tag
136
+ (merged to 'next' on 2010-01-03 at 87657d2)
137
+ + tag -d: print sha1 of deleted tag
138
139
* sb/maint-octopus (2009-12-11) 3 commits
101
- - octopus: remove dead code
102
- - octopus: reenable fast-forward merges
103
- - octopus: make merge process simpler to follow
140
+ (merged to 'next' on 2010-01-03 at ffe77d6)
141
+ + octopus: remove dead code
142
+ + octopus: reenable fast-forward merges
143
+ + octopus: make merge process simpler to follow
144
145
* jh/commit-status (2009-12-07) 1 commit
146
- [test?] Add commit.status, --status, and --no-status
147
148
* jc/checkout-merge-base (2009-11-20) 2 commits
109
- (merged to 'next' on 2009-12-24 at ff4d1d4)
149
+ (merged to 'next' on 2010-01-02 at 6a8f6fc)
150
+ "rebase --onto A...B" replays history on the merge base between A and B
151
+ "checkout A...B" switches to the merge base between A and B
152
@@ -119,13 +159,11 @@ though...
159
- t5541-http-push.sh: add tests for non-fast-forward pushes
160
161
* bg/maint-add-all-doc (2009-12-07) 4 commits
122
- - squash! rm documentation--also mention add-u where we mention commit-a
123
- - git-rm doc: Describe how to sync index & work tree
124
- - git-add/rm doc: Consistently back-quote
125
- - Documentation: 'git add -A' can remove files
126
-
127
-I didn't like the existing documentation for "add -u" myself (especially
128
-because I wrote the initial version) and this neatly fix it as well.
162
+ (merged to 'next' on 2010-01-03 at b19a323)
163
+ + squash! rm documentation--also mention add-u where we mention commit-a
164
+ + git-rm doc: Describe how to sync index & work tree
165
+ + git-add/rm doc: Consistently back-quote
166
+ + Documentation: 'git add -A' can remove files
167
168
* il/vcs-helper (2009-12-09) 8 commits
169
- Remove special casing of http, https and ftp
@@ -165,7 +203,7 @@ improvement to skip opening the editor if a pick is followed only by
203
- Notes API: init_notes(): Initialize the notes tree from the given notes ref
204
- Notes API: get_commit_notes() -> format_note() + remove the commit restriction
205
- Minor style fixes to notes.c
168
- (merged to 'next' on 2009-12-29 at c89a730)
206
+ (merged to 'next' on 2010-01-02 at ae42130)
207
+ Add more testcases to test fast-import of notes
208
+ Rename t9301 to t9350, to make room for more fast-import tests
209
+ fast-import: Proper notes tree manipulation
@@ -174,8 +212,9 @@ improvement to skip opening the editor if a pick is followed only by
212
- General --quiet improvements
213
214
* mv/commit-date (2009-12-03) 2 commits
177
- - Document date formats accepted by parse_date()
178
- - builtin-commit: add --date option
215
+ (merged to 'next' on 2010-01-03 at 1c45fdf)
216
+ + Document date formats accepted by parse_date()
217
+ + builtin-commit: add --date option
218
219
* sr/gfi-options (2009-12-04) 7 commits
220
- fast-import: add (non-)relative-marks feature
@@ -198,27 +237,24 @@ improvement to skip opening the editor if a pick is followed only by
237
but otherwise seemed good.
238
239
* mo/bin-wrappers (2009-12-02) 3 commits
201
- - INSTALL: document a simpler way to run uninstalled builds
202
- - run test suite without dashed git-commands in PATH
203
- - build dashless "bin-wrappers" directory similar to installed bindir
240
+ (merged to 'next' on 2010-01-03 at 8c5fa27)
241
+ + INSTALL: document a simpler way to run uninstalled builds
242
+ + run test suite without dashed git-commands in PATH
243
+ + build dashless "bin-wrappers" directory similar to installed bindir
244
245
* tr/http-updates (2009-12-28) 4 commits
206
- (merged to 'next' on 2009-12-30 at e143bc9)
246
+ (merged to 'next' on 2010-01-02 at cf25698)
247
+ Remove http.authAny
208
- (merged to 'next' on 2009-12-07 at f08d447)
248
+ Allow curl to rewind the RPC read buffer
249
+ Add an option for using any HTTP authentication scheme, not only basic
250
+ http: maintain curl sessions
251
252
* nd/sparse (2009-12-30) 23 commits
214
- (merged to 'next' on 2009-12-31 at 442ff22)
253
+ (merged to 'next' on 2010-01-02 at 5499bbe)
254
+ grep: do not do external grep on skip-worktree entries
216
- (merged to 'next' on 2009-12-24 at 1fa9ff3)
255
+ commit: correctly respect skip-worktree bit
256
+ ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
219
- (merged to 'next' on 2009-11-25 at 71380f5)
257
+ tests: rename duplicate t1009
221
- (merged to 'next' on 2009-11-23 at f712a41)
258
+ sparse checkout: inhibit empty worktree
259
+ Add tests for sparse checkout
260
+ read-tree: add --no-sparse-checkout to disable sparse checkout support
@@ -238,39 +274,3 @@ but otherwise seemed good.
274
+ Introduce "skip-worktree" bit in index, teach Git to get/set this bit
275
+ Add test-index-version
276
+ update-index: refactor mark_valid() in preparation for new options
241
-
242
---------------------------------------------------
243
-[Ejected]
244
-
245
-* il/exec-error-report (2009-12-30) 2 commits
246
- . Improve transport helper exec failure reporting
247
- . Report exec errors from run-command
248
-
249
-Freezes "git log" or anything that uses pager; J6t made quite a many good
250
-suggestions. Expecting more rounds of reroll.
251
-
252
-* je/send-email-no-subject (2009-08-05) 1 commit
253
- (merged to 'next' on 2009-10-11 at 1b99c56)
254
- + send-email: confirm on empty mail subjects
255
-
256
-* jc/fix-tree-walk (2009-10-22) 8 commits
257
- (merged to 'next' on 2009-10-22 at 10c0c8f)
258
- + Revert failed attempt since 353c5ee
259
- + read-tree --debug-unpack
260
- (merged to 'next' on 2009-10-11 at 0b058e2)
261
- + unpack-trees.c: look ahead in the index
262
- + unpack-trees.c: prepare for looking ahead in the index
263
- + Aggressive three-way merge: fix D/F case
264
- + traverse_trees(): handle D/F conflict case sanely
265
- + more D/F conflict tests
266
- + tests: move convenience regexp to match object names to test-lib.sh
267
-
268
-This has some stupid bugs and reverted from 'next' until I can fix it, but
269
-the "temporarily" turned out to be very loooong.
270
-
271
-* jc/grep-full-tree (2009-11-24) 1 commit
272
- . grep: --full-tree
273
-
274
-The interaction with this option and pathspecs need to be worked out
275
-better. I _think_ "grep --full-tree -e pattern -- '*.h'" should find from
276
-all the header files in the tree, for example.