What's cooking

Junio C Hamano committed Nov 22, 2009 at 22:15 UTC 854fc0309ab410b1a57b5eaf1c5766afa6b42aea
1 file changed +565
whats/cooking/2009/11/05.txt new
+565
@@ -0,0 +1,565 @@
1 +To: git@vger.kernel.org
2 +Subject: What's cooking in git.git (Nov 2009, #05; Sun, 22)
3 +X-master-at: 12fb25dce80f6804da73e0b9451caeeddb1b16d9
4 +X-next-at: 7074fe79a7635c32006bb5f62bfbfb3c84e69f43
5 +
6 +What's cooking in git.git (Nov 2009, #05; Sun, 22)
7 +--------------------------------------------------
8 +
9 +Here are the topics that have been cooking. Commits prefixed with '-' are
10 +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 +In 1.7.0, we plan to correct handful of warts in the interfaces everybody
15 +agrees that they were mistakes. The resulting system may not be strictly
16 +backward compatible. Currently planned changes are:
17 +
18 + * refuse push to update the checked out branch in a non-bare repo by
19 + default
20 +
21 + Make "git push" into a repository to update the branch that is checked
22 + out fail by default. You can countermand this default by setting a
23 + configuration variable in the receiving repository.
24 +
25 + http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
26 +
27 + * refuse push to delete the current branch by default
28 +
29 + Make "git push $there :$killed" to delete the branch that is pointed at
30 + by its HEAD fail by default. You can countermand this default by
31 + setting a configuration variable in the receiving repository.
32 +
33 + http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
34 +
35 + * "git send-email" won't make deep threads by default
36 +
37 + Many people said that by default when sending more than 2 patches the
38 + threading git-send-email makes by default is hard to read, and they
39 + prefer the default be one cover letter and each patch as a direct
40 + follow-up to the cover letter. You can countermand this by setting a
41 + configuration variable.
42 +
43 + http://article.gmane.org/gmane.comp.version-control.git/109790
44 +
45 + * git-status won't be "git-commit --dry-run" anymore
46 +
47 + http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
48 +
49 + * "git diff -w --exit-code" will exit success if only differences it
50 + found are whitespace changes that are stripped away from the output.
51 +
52 + http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
53 +
54 + * "git diff -w/-b" won't even produce "diff --git" header when all changes
55 + are about whitespaces.
56 +
57 + http://thread.gmane.org/gmane.comp.version-control.git/133256
58 +
59 +Tonight's tip of 'master' is at v1.6.6-rc0. I am aware of a handful of
60 +patches sent today but they didn't arraive before I started today's
61 +integration cycle and are left out from today's tree.
62 +
63 +--------------------------------------------------
64 +[Graduated to "master"]
65 +
66 +* ls/maint-mailinfo-no-inbody (2009-11-20) 1 commit.
67 + (merged to 'next' on 2009-11-21 at dba8141)
68 + + git am/mailinfo: Don't look at in-body headers when rebasing
69 +
70 +* rj/maint-t9700 (2009-11-19) 1 commit.
71 + (merged to 'next' on 2009-11-21 at 29e149b)
72 + + t9700-perl-git.sh: Fix a test failure on Cygwin
73 +
74 +* jn/faster-completion-startup (2009-11-17) 1 commit.
75 + + Speed up bash completion loading
76 +
77 +* th/maint-remote-update-help-string (2009-11-15) 1 commit.
78 + + Update 'git remote update' usage string to match man page.
79 +
80 +* tc/format-attribute (2009-11-14) 1 commit
81 + + Check the format of more printf-type functions
82 +
83 +* jk/maint-break-rename-reduce-memory (2009-11-16) 2 commits.
84 + (merged to 'next' on 2009-11-16 at 5b5a93f)
85 + + diffcore-break: save cnt_data for other phases
86 + + diffcore-break: free filespec data as we go
87 +
88 +* bc/grep-i-F (2009-11-06) 1 commit.
89 + (merged to 'next' on 2009-11-17 at a9b138c)
90 + + grep: Allow case insensitive search of fixed-strings
91 +
92 +* mm/config-pathname-tilde-expand (2009-11-17) 1 commit.
93 + (merged to 'next' on 2009-11-17 at 7ba213d)
94 + + Expand ~ and ~user in core.excludesfile, commit.template
95 +
96 +* pb/maint-use-custom-perl (2009-11-17) 1 commit.
97 + (merged to 'next' on 2009-11-17 at 1ee8d46)
98 + + Make sure $PERL_PATH is defined when the test suite is run.
99 +
100 +* th/remote-usage (2009-11-16) 1 commit.
101 + + git remote: Separate usage strings for subcommands
102 +
103 +* mo/maint-crlf-doc (2009-11-14) 1 commit.
104 + (merged to 'next' on 2009-11-17 at abd9133)
105 + + core.autocrlf documentation: mention the crlf attribute
106 +
107 +* rj/cygwin-msvc (2009-11-09) 2 commits.
108 + + MSVC: Add support for building with NO_MMAP
109 + + Makefile: keep MSVC and Cygwin configuration separate
110 + (this branch uses rj/maint-simplify-cygwin-makefile.)
111 +
112 +* jp/fetch-cull-many-refs (2009-11-13) 3 commits
113 + (merged to 'next' on 2009-11-15 at db0f967)
114 + + remote: fix use-after-free error detected by glibc in ref_remove_duplicates
115 + (merged to 'next' on 2009-11-01 at 1f09ce9)
116 + + fetch: Speed up fetch of large numbers of refs
117 + + remote: Make ref_remove_duplicates faster for large numbers of refs
118 +
119 +* jn/help-everywhere (2009-11-09) 21 commits
120 + (merged to 'next' on 2009-11-17 at 3a2dffe)
121 + + diff --no-index: make the usage string less scary
122 + + merge-{recursive,subtree}: use usagef() to print usage
123 + + Introduce usagef() that takes a printf-style format
124 + + Let 'git <command> -h' show usage without a git dir
125 + + Show usage string for 'git http-push -h'
126 + + Let 'git http-fetch -h' show usage outside any git repository
127 + + Show usage string for 'git stripspace -h'
128 + + Show usage string for 'git unpack-file -h'
129 + + Show usage string for 'git show-index -h'
130 + + Show usage string for 'git rev-parse -h'
131 + + Show usage string for 'git merge-one-file -h'
132 + + Show usage string for 'git mailsplit -h'
133 + + Show usage string for 'git imap-send -h'
134 + + Show usage string for 'git get-tar-commit-id -h'
135 + + Show usage string for 'git fast-import -h'
136 + + Show usage string for 'git check-ref-format -h'
137 + + Show usage string for 'git show-ref -h'
138 + + Show usage string for 'git merge-ours -h'
139 + + Show usage string for 'git commit-tree -h'
140 + + Show usage string for 'git cherry -h'
141 + + Show usage string for 'git grep -h'
142 + (this branch uses jn/maint-http-fetch-mingw and jn/remove-fetch--tool.)
143 +
144 +* jn/maint-http-fetch-mingw (2009-11-09) 1 commit.
145 + (merged to 'next' on 2009-11-17 at cd35125)
146 + + http-fetch: add missing initialization of argv0_path
147 + (this branch is used by jn/help-everywhere.)
148 +
149 +* jn/remove-fetch--tool (2009-11-09) 1 commit
150 + (merged to 'next' on 2009-11-17 at 72f6c3b)
151 + + Retire fetch--tool helper to contrib/examples
152 + (this branch is used by jn/help-everywhere.)
153 +
154 +* jn/gitweb-log-history (2009-11-13) 3 commits
155 + (merged to 'next' on 2009-11-17 at d225f7d)
156 + + gitweb: Make 'history' view (re)use git_log_generic()
157 + + gitweb: Refactor common parts of 'log' and 'shortlog' views
158 + + gitweb: Refactor 'log' action generation, adding git_log_body()
159 +
160 +* rg/doc-workflow (2009-11-17) 1 commit.
161 + + Add branch management for releases to gitworkflows
162 +
163 +* sb/ls-tree-parseopt (2009-11-13) 2 commits.
164 + (merged to 'next' on 2009-11-17 at c383204)
165 + + ls-tree: migrate to parse-options
166 + + t3101: test more ls-tree options
167 +
168 +* jl/submodule-add-noname (2009-09-22) 1 commit.
169 + (merged to 'next' on 2009-11-15 at 3a77d01)
170 + + git submodule add: make the <path> parameter optional
171 +
172 +Dscho started an interesting discussion regarding the larger workflow in
173 +which the "submodule add" is used. I think the patch itself makes sense
174 +but at the same time it probably makes sense to also take the <path> and
175 +infer the <repository> as Dscho suggested, probably in "git submodule
176 +add", not in "git add" proper, at least initially.
177 +
178 +* sc/protocol-doc (2009-11-03) 1 commit.
179 + (merged to 'next' on 2009-11-15 at 32d6de8)
180 + + Update packfile transfer protocol documentation
181 +
182 +* tr/filter-branch (2009-11-10) 2 commits.
183 + (merged to 'next' on 2009-11-15 at 79c6a1d)
184 + + filter-branch: nearest-ancestor rewriting outside subdir filter
185 + + filter-branch: stop special-casing $filter_subdir argument
186 +
187 +* bg/format-patch-doc-update (2009-11-07) 4 commits.
188 + (merged to 'next' on 2009-11-17 at 68b9056)
189 + + format-patch: Add "--no-stat" as a synonym for "-p"
190 + + format-patch documentation: Fix formatting
191 + + format-patch documentation: Remove diff options that are not useful
192 + + format-patch: Always generate a patch
193 +
194 +* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
195 + + Makefile: merge two Cygwin configuration sections into one
196 + (this branch is used by rj/cygwin-msvc.)
197 +
198 +* jn/editor-pager (2009-10-30) 9 commits
199 + (merged to 'next' on 2009-11-15 at 7f3e3ae)
200 + + Provide a build time default-pager setting
201 + + Provide a build time default-editor setting
202 + + am -i, git-svn: use "git var GIT_PAGER"
203 + + add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
204 + + Teach git var about GIT_PAGER
205 + + Teach git var about GIT_EDITOR
206 + + Suppress warnings from "git var -l"
207 + + Do not use VISUAL editor on dumb terminals
208 + + Handle more shell metacharacters in editor names
209 +
210 +* bw/autoconf-more (2009-11-04) 2 commits
211 + (merged to 'next' on 2009-11-15 at e86a8c9)
212 + + configure: add settings for gitconfig, editor and pager
213 + + configure: add macro to set arbitrary make variables
214 +
215 +* sp/smart-http (2009-11-14) 37 commits
216 + (merged to 'next' on 2009-11-17 at 11067eb)
217 + + http-backend: Let gcc check the format of more printf-type functions.
218 + + http-backend: Fix access beyond end of string.
219 + (merged to 'next' on 2009-11-15 at 2a326b2)
220 + + http-backend: Fix bad treatment of uintmax_t in Content-Length
221 + + t5551-http-fetch: Work around broken Accept header in libcurl
222 + + t5551-http-fetch: Work around some libcurl versions
223 + + http-backend: Protect GIT_PROJECT_ROOT from /../ requests
224 + + Git-aware CGI to provide dumb HTTP transport
225 + (merged to 'next' on 2009-11-06 at 666837c)
226 + + http-backend: Test configuration options
227 + + http-backend: Use http.getanyfile to disable dumb HTTP serving
228 + + test smart http fetch and push
229 + + http tests: use /dumb/ URL prefix
230 + + set httpd port before sourcing lib-httpd
231 + + t5540-http-push: remove redundant fetches
232 + + Smart HTTP fetch: gzip requests
233 + + Smart fetch over HTTP: client side
234 + + Smart push over HTTP: client side
235 + + Discover refs via smart HTTP server when available
236 + + http-backend: more explict LocationMatch
237 + + http-backend: add example for gitweb on same URL
238 + + http-backend: use mod_alias instead of mod_rewrite
239 + + http-backend: reword some documentation
240 + + http-backend: add GIT_PROJECT_ROOT environment var
241 + + Smart fetch and push over HTTP: server side
242 + + Add stateless RPC options to upload-pack, receive-pack
243 + + Git-aware CGI to provide dumb HTTP transport
244 + + remote-helpers: return successfully if everything up-to-date
245 + + Move WebDAV HTTP push under remote-curl
246 + + remote-helpers: Support custom transport options
247 + + remote-helpers: Fetch more than one ref in a batch
248 + + fetch: Allow transport -v -v -v to set verbosity to 3
249 + + remote-curl: Refactor walker initialization
250 + + Add multi_ack_detailed capability to fetch-pack/upload-pack
251 + + Move "get_ack()" back to fetch-pack
252 + + fetch-pack: Use a strbuf to compose the want list
253 + + pkt-line: Make packet_read_line easier to debug
254 + + pkt-line: Add strbuf based functions
255 + + http-push: fix check condition on http.c::finish_http_pack_request()
256 +
257 +--------------------------------------------------
258 +[New Topics]
259 +
260 +* bg/apply-doc (2009-11-22) 4 commits
261 + (merged to 'next' on 2009-11-22 at b42fece)
262 + + apply: Use the term "working tree" consistently
263 + + apply: Format all options using back-quotes
264 + + apply: apply works outside a repository
265 + + Clarify and correct -z
266 +
267 +* cc/replace (2009-11-19) 3 commits
268 + (merged to 'next' on 2009-11-21 at 2aaf84b)
269 + + Documentation: talk a little bit about GIT_NO_REPLACE_OBJECTS
270 + + Documentation: fix typos and spelling in replace documentation
271 + + replace: use a GIT_NO_REPLACE_OBJECTS env variable
272 +
273 +* fc/send-email-envelope (2009-11-22) 1 commit.
274 + - t9001: test --envelope-sender option of send-email
275 +
276 +The new feature itself looked promising; this is just an unrelated test
277 +patch.
278 +
279 +* gb/1.7.0-diff-whitespace-only-outout (2009-11-19) 1 commit
280 + (merged to 'next' on 2009-11-21 at 3375bf4)
281 + + No diff -b/-w output for all-whitespace changes
282 +
283 +* jc/checkout-merge-base (2009-11-20) 2 commits
284 + - "rebase --onto A...B" replays history on the merge base between A and B
285 + - "checkout A...B" switches to the merge base between A and B
286 +
287 +* mm/maint-hint-failed-merge (2009-11-22) 2 commits.
288 + (merged to 'next' on 2009-11-22 at c0f64c2)
289 + + user-manual: Document that "git merge" doesn't like uncommited changes.
290 + + merge-recursive: point the user to commit when file would be overwritten.
291 +
292 +* rj/maint-cygwin-count-objects (2009-11-19) 2 commits.
293 + (merged to 'next' on 2009-11-22 at 4ba5880)
294 + + ST_BLOCKS_COUNTS_IN_BLKSIZE to say on-disk size is (st_blksize * st_blocks)
295 + + git-count-objects: Fix a disk-space under-estimate on Cygwin
296 +
297 +* rs/color-escape-has-zero-width (2009-11-23) 1 commit
298 + - Teach %w() that color escape codes have zero width
299 +
300 +* tr/reset-checkout-patch (2009-11-19) 1 commit.
301 + (merged to 'next' on 2009-11-22 at b224950)
302 + + {checkout,reset} -p: make patch direction configurable
303 +
304 +--------------------------------------------------
305 +[Stalled]
306 +
307 +* jc/fix-tree-walk (2009-10-22) 8 commits
308 + (merged to 'next' on 2009-10-22 at 10c0c8f)
309 + + Revert failed attempt since 353c5ee
310 + + read-tree --debug-unpack
311 + (merged to 'next' on 2009-10-11 at 0b058e2)
312 + + unpack-trees.c: look ahead in the index
313 + + unpack-trees.c: prepare for looking ahead in the index
314 + + Aggressive three-way merge: fix D/F case
315 + + traverse_trees(): handle D/F conflict case sanely
316 + + more D/F conflict tests
317 + + tests: move convenience regexp to match object names to test-lib.sh
318 +
319 +This has some stupid bugs and reverted from 'next' until I can fix it, but
320 +the "temporarily" turned out to be very loooong. Sigh...
321 +
322 +* sr/gfi-options (2009-09-06) 6 commits.
323 + - fast-import: test the new option command
324 + - fast-import: add option command
325 + - fast-import: test the new feature command
326 + - fast-import: add feature command
327 + - fast-import: put marks reading in it's own function
328 + - fast-import: put option parsing code in separate functions
329 +
330 +It seemed to be moving again soon, but nothing has happened yet...
331 +
332 +* je/send-email-no-subject (2009-08-05) 1 commit.
333 + (merged to 'next' on 2009-10-11 at 1b99c56)
334 + + send-email: confirm on empty mail subjects
335 +
336 +The existing tests cover the positive case (i.e. as long as the user says
337 +"yes" to the "do you really want to send this message that lacks subject",
338 +the message is sent) of this feature, but the feature itself needs its own
339 +test to verify the negative case (i.e. does it correctly stop if the user
340 +says "no"?)
341 +
342 +--------------------------------------------------
343 +[Cooking]
344 +
345 +* jh/notes (2009-11-20) 10 commits
346 + - Add more testcases to test fast-import of notes
347 + - Rename t9301 to t9350, to make room for more fast-import tests
348 + - fast-import: Proper notes tree manipulation using the notes API
349 + - Refactor notes concatenation into a flexible interface for combining notes
350 + - Notes API: Allow multiple concurrent notes trees with new struct notes_tree
351 + - Notes API: for_each_note(): Traverse the entire notes tree with a callback
352 + - Notes API: get_note(): Return the note annotating the given object
353 + - Notes API: add_note(): Add note objects to the internal notes tree structure
354 + - Notes API: init_notes(): Initialize the notes tree from the given notes ref
355 + - Notes API: get_commit_notes() -> format_note() + remove the commit restriction
356 +
357 +Early part has been lived in 'next' for a while and has graduated. This
358 +is a reroll of the remainder. Is everybody happy with merging this to
359 +'next'? I saw some checkpatch style violations, but didn't find anything
360 +objectionable in the logic.
361 +
362 +* jn/gitweb-blame (2009-11-19) 6 commits.
363 + - gitweb.js: fix null object exception in initials calculation
364 + - gitweb: Minify gitweb.js if JSMIN is defined
365 + - gitweb: Create links leading to 'blame_incremental' using JavaScript
366 + (merged to 'next' on 2009-10-11 at 73c4a83)
367 + + gitweb: Colorize 'blame_incremental' view during processing
368 + + gitweb: Incremental blame (using JavaScript)
369 + + gitweb: Add optional "time to generate page" info in footer
370 +
371 +Ajax-y blame, with a few recent fixes.
372 +
373 +* tr/maint-merge-ours-clarification (2009-11-15) 1 commit
374 + (merged to 'next' on 2009-11-21 at fadaf7b)
375 + + rebase: refuse to rebase with -s ours
376 +
377 +* jc/log-stdin (2009-11-20) 4 commits
378 + (merged to 'next' on 2009-11-21 at c3e2e52)
379 + + Make --stdin option to "log" family read also pathspecs
380 + + setup_revisions(): do not call get_pathspec() too early
381 + + Teach --stdin option to "log" family
382 + + read_revision_from_stdin(): use strbuf
383 +
384 +Still no tests yet but with docs from Peff.
385 +
386 +* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
387 + - git-pull.sh --rebase: overhaul error handling when no candidates are found
388 +
389 +I heard this needs at least retitling among other changes?
390 +
391 +* em/commit-claim (2009-11-04) 1 commit
392 + - commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
393 +
394 +I just picked better bits from both versions, but this needs to be
395 +rethought.
396 +
397 +* bg/fetch-multi (2009-11-10) 9 commits.
398 + (merged to 'next' on 2009-11-21 at 282f464)
399 + + Re-implement 'git remote update' using 'git fetch'
400 + + builtin-fetch: add --dry-run option
401 + + builtin-fetch: add --prune option
402 + + teach warn_dangling_symref to take a FILE argument
403 + + remote: refactor some logic into get_stale_heads()
404 + + Add missing test for 'git remote update --prune'
405 + + Add the configuration option skipFetchAll
406 + + Teach the --multiple option to 'git fetch'
407 + + Teach the --all option to 'git fetch'
408 +
409 +* cc/bisect-doc (2009-11-08) 1 commit
410 + - Documentation: add "Fighting regressions with git bisect" article
411 +
412 +Any comments? Should it go to Documentation/technical instead?
413 +
414 +* sr/vcs-helper (2009-11-18) 12 commits
415 + - Add Python support library for remote helpers
416 + - Basic build infrastructure for Python scripts
417 + - Allow helpers to report in "list" command that the ref is unchanged
418 + - Fix various memory leaks in transport-helper.c
419 + - Allow helper to map private ref names into normal names
420 + - Add support for "import" helper command
421 + - Allow specifying the remote helper in the url
422 + - Add a config option for remotes to specify a foreign vcs
423 + - Allow fetch to modify refs
424 + - Use a function to determine whether a remote is valid
425 + - Allow programs to not depend on remotes having urls
426 + - Fix memory leak in helper method for disconnect
427 +
428 +Replaced again. Is everybody happy with merging this to 'next'?
429 +
430 +* mr/gitweb-snapshot (2009-11-07) 4 commits.
431 + (merged to 'next' on 2009-11-21 at e825ad9)
432 + + gitweb: Smarter snapshot names
433 + + gitweb: Document current snapshot rules via new tests
434 + + t/gitweb-lib.sh: Split gitweb output into headers and body
435 + (merged to 'next' on 2009-10-11 at 22ba047)
436 + + gitweb: check given hash before trying to create snapshot
437 +
438 +Soon in 'master'.
439 +
440 +* jc/pretty-lf (2009-10-04) 1 commit.
441 + - Pretty-format: %[+-]x to tweak inter-item newlines
442 +
443 +* ks/precompute-completion (2009-11-15) 4 commits.
444 + (merged to 'next' on 2009-11-15 at 23cdb96)
445 + + Revert ks/precompute-completion series
446 + (merged to 'next' on 2009-10-28 at cd5177f)
447 + + completion: ignore custom merge strategies when pre-generating
448 + (merged to 'next' on 2009-10-22 at f46a28a)
449 + + bug: precomputed completion includes scripts sources
450 + (merged to 'next' on 2009-10-14 at adf722a)
451 + + Speedup bash completion loading
452 +
453 +Reverted out of 'next', to be replaced with jn/faster-completion-startup
454 +topic.
455 +
456 +* nd/sparse (2009-08-20) 19 commits.
457 + - sparse checkout: inhibit empty worktree
458 + - Add tests for sparse checkout
459 + - read-tree: add --no-sparse-checkout to disable sparse checkout support
460 + - unpack-trees(): ignore worktree check outside checkout area
461 + - unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
462 + - unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
463 + - unpack-trees.c: generalize verify_* functions
464 + - unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
465 + - Introduce "sparse checkout"
466 + - dir.c: export excluded_1() and add_excludes_from_file_1()
467 + - excluded_1(): support exclude files in index
468 + - unpack-trees(): carry skip-worktree bit over in merged_entry()
469 + - Read .gitignore from index if it is skip-worktree
470 + - Avoid writing to buffer in add_excludes_from_file_1()
471 + - Teach Git to respect skip-worktree bit (writing part)
472 + - Teach Git to respect skip-worktree bit (reading part)
473 + - Introduce "skip-worktree" bit in index, teach Git to get/set this bit
474 + - Add test-index-version
475 + - update-index: refactor mark_valid() in preparation for new options
476 +
477 +The latest update I didn't look at very closely but I had an impression
478 +that it was touching very generic codepath that would affect non sparse
479 +cases, iow the patch looked very scary (the entire series already is).
480 +
481 +--------------------------------------------------
482 +[For 1.7.0]
483 +
484 +* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
485 + - git-merge: forbid fast-forward and up-to-date when --no-commit is given
486 +
487 +This makes "git merge --no-commit" fail when it results in fast-forward or
488 +up-to-date. I haven't described this at the beginning of this message
489 +yet, as it is not clear if this change is even necessary. Opinions?
490 +
491 +* jk/1.7.0-status (2009-09-05) 5 commits.
492 + (merged to 'next' on 2009-11-21 at 884bb56)
493 + + docs: note that status configuration affects only long format
494 + (merged to 'next' on 2009-10-11 at 65c8513)
495 + + commit: support alternate status formats
496 + + status: add --porcelain output format
497 + + status: refactor format option parsing
498 + + status: refactor short-mode printing to its own function
499 + (this branch uses jc/1.7.0-status.)
500 +
501 +Gives the --short output format to post 1.7.0 "git commit --dry-run" that
502 +is similar to that of post 1.7.0 "git status".
503 +
504 +* jc/1.7.0-status (2009-09-05) 4 commits.
505 + (merged to 'next' on 2009-10-11 at 9558627)
506 + + status: typo fix in usage
507 + + git status: not "commit --dry-run" anymore
508 + + git stat -s: short status output
509 + + git stat: the beginning of "status that is not a dry-run of commit"
510 + (this branch is used by jk/1.7.0-status.)
511 +
512 +With this, "git status" is no longer "git commit --dry-run".
513 +
514 +* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
515 + (merged to 'next' on 2009-10-11 at 043acdf)
516 + + send-email: make --no-chain-reply-to the default
517 +
518 +* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
519 + (merged to 'next' on 2009-10-11 at 546c74d)
520 + + diff.c: fix typoes in comments
521 + + Make test case number unique
522 + + diff: Rename QUIET internal option to QUICK
523 + + diff: change semantics of "ignore whitespace" options
524 +
525 +This changes exit code from "git diff --ignore-whitespace" and friends
526 +when there is no actual output. It is a backward incompatible change, but
527 +we could argue that it is a bugfix.
528 +
529 +* jc/1.7.0-push-safety (2009-02-09) 2 commits.
530 + (merged to 'next' on 2009-10-11 at 81b8128)
531 + + Refuse deleting the current branch via push
532 + + Refuse updating the current branch in a non-bare repository via push
533 +
534 +--------------------------------------------------
535 +[I have been too busy to purge these]
536 +
537 +* ne/rev-cache (2009-10-19) 7 commits.
538 + . support for commit grafts, slight change to general mechanism
539 + . support for path name caching in rev-cache
540 + . full integration of rev-cache into git, completed test suite
541 + . administrative functions for rev-cache, start of integration into git
542 + . support for non-commit object caching in rev-cache
543 + . basic revision cache system, no integration or features
544 + . man page and technical discussion for rev-cache
545 +
546 +The author indicated that there is another round coming. Does not seem to
547 +pass the tests when merged to 'pu', so it has been ejected for now.
548 +
549 +* jc/log-tz (2009-03-03) 1 commit.
550 + - Allow --date=local --date=other-format to work as expected
551 +
552 +Maybe some people care about this. I dunno.
553 +
554 +* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
555 + - mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
556 +
557 +Maybe some people care about this. I dunno.
558 +
559 +* pb/gitweb-no-project-list (2009-11-06) 3 commits.
560 + . gitweb: Polish the content tags support
561 + . gitweb: Support for no project list on gitweb front page
562 + . gitweb: Refactor project list routines
563 +
564 +I picked these up but didn't queue as Warthog9's comments made certain
565 +amount of sense to me.