What's cooking (2008/09 #02)
Junio C Hamano committed
Sep 18, 2008 at 20:12 UTC
7a06f968d50a9bd34448e22131257b0f4ee8ca42
1 file changed
+102
-162
whats-cooking.txt
+102
-162
@@ -1,8 +1,8 @@
1
-Subject: What's cooking in git.git (Sep 2008, #01; Sat, 06)
2
-X-master-at: ec3a4ba519c0012d58584d23f407c302e7b80eb6
3
-X-next-at: d2470dbfc97c972e54913e3d3c622118526c9cc2
1
+Subject: What's cooking in git.git (Sep 2008, #02; Wed, 10)
2
+X-master-at: ede4caf6e3204f9d63758d6410d0f124b0caab32
3
+X-next-at: c8d31b67b3f0e13f6b8ad782dadc6e8a8bc06bbb
4
5
-What's cooking in git.git (Sep 2008, #01; Sat, 06)
5
+What's cooking in git.git (Sep 2008, #02; Wed, 10)
6
--------------------------------------------------
7
8
Here are the topics that have been cooking. Commits prefixed
@@ -15,93 +15,68 @@ meant to be merged to the maintenance series have "maint-" in their names.
15
----------------------------------------------------------------
16
[New Topics]
17
18
-* np/pack (Tue Sep 2 10:22:22 2008 -0400) 4 commits
19
- + t5300: improve SHA1 collision test
20
- + pack-objects: don't include missing preferred base objects
21
- + sha1write: don't copy full sized buffers
22
- + Merge branch 'np/maint-safer-pack' into np/pack
18
+Many 'maint' material to go through the usual 'next' to 'master' to
19
+'maint' cycle..
20
24
-* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
25
- + diff --dirstat-by-file: count changed files, not lines
21
+* mh/maint-honor-no-ssl-verify (Thu Feb 21 15:10:37 2008 -0800) 1 commit
22
+ + Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
23
27
-* bw/shortref (Fri Sep 5 23:16:23 2008 +0200) 1 commit
28
- - for-each-ref: `:short` format for `refname`
24
+* dp/maint-rebase-fix (Tue Sep 9 16:05:26 2008 +0400) 2 commits
25
+ + git-rebase--interactive: auto amend only edited commit
26
+ + git-rebase-interactive: do not squash commits on abort
27
30
-* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit
31
- + safe_create_leading_directories(): make it about "leading"
32
- directories
28
+* jc/maint-checkout-keep-remove (Sun Sep 7 19:49:25 2008 -0700) 1 commit
29
+ + checkout: do not lose staged removal
30
34
-* jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit
35
- + daemon.c: avoid setlinebuf()
31
+* jc/maint-template-permbits (Thu Aug 21 19:31:50 2008 -0500) 1 commit
32
+ + Fix permission bits on sources checked out with an overtight umask
33
37
-* jc/maint-diff-quiet (Mon Sep 1 23:20:26 2008 -0700) 2 commits
38
- + diff --quiet: make it synonym to --exit-code >/dev/null
39
- + diff Porcelain: do not disable auto index refreshing on -C -C
34
+* am/status (Mon Sep 8 00:05:03 2008 +0200) 2 commits
35
+ - wt-status: Teach how to discard changes in the working directory
36
+ - wt-status: Split header generation into three functions
37
41
-* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
42
- - git-apply:--include=pathspec
38
+This is what I commented as "making status output even chattier", but
39
+parked here to see what people think.
40
44
-* rs/decorate (Thu Sep 4 23:40:03 2008 +0200) 3 commits
45
- + add '%d' pretty format specifier to show decoration
46
- + move load_ref_decorations() to log-tree.c and export it
47
- + log: add load_ref_decorations()
41
+* mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits
42
+ - t7603: add new testcases to ensure builtin-commit uses
43
+ reduce_heads()
44
+ - builtin-commit: use commit_tree()
45
+ - commit_tree(): add a new author parameter
46
+
47
+* pb/autocorrect-wrapper (Wed Sep 10 14:44:20 2008 -0700) 2 commits
48
+ - Fixup -- waiting for response
49
+ - git wrapper: also uses aliases to suggest mistyped commands
50
49
-* pb/commit-where (Fri Sep 5 19:13:05 2008 +0200) 1 commit
50
- - Builtin-commit: show on which branch a commit was added
51
+* jc/alternate-push (Tue Sep 9 01:27:10 2008 -0700) 4 commits
52
+ - push: receiver end advertises refs from alternate repositories
53
+ - push: prepare sender to receive extended ref information from the
54
+ receiver
55
+ - receive-pack: make it a builtin
56
+ - is_directory(): a generic helper function
57
58
----------------------------------------------------------------
59
[Graduated to "master"]
60
55
-* np/safer-pack (Fri Aug 29 16:08:02 2008 -0400) 5 commits
56
- + fixup_pack_header_footer(): use nicely aligned buffer sizes
57
- + index-pack: use fixup_pack_header_footer()'s validation mode
58
- + pack-objects: use fixup_pack_header_footer()'s validation mode
59
- + improve reliability of fixup_pack_header_footer()
60
- + pack-objects: improve returned information from write_one()
61
-
62
-* rf/man-env (Fri Aug 29 17:00:43 2008 +0200) 1 commit
63
- + builtin-help: fallback to GIT_MAN_VIEWER before man
64
-
65
-* ho/dashless (Sun Aug 31 09:39:19 2008 -0700) 2 commits
66
- + 'git foo' program identifies itself without dash in die() messages
67
- + Start conforming code to "git subcmd" style
68
-
69
-* jc/author-nickname (Tue Aug 26 23:13:13 2008 -0700) 1 commit
70
- + git commit --author=$name: look $name up in existing commits
71
-
72
-* dp/pid-uintmax (Sun Aug 31 14:09:39 2008 +0200) 1 commit
73
- + cast pid_t's to uintmax_t to improve portability
74
-
75
-* nd/worktree (Sat Aug 30 16:15:32 2008 +0700) 5 commits
76
- - setup_git_directory(): fix move to worktree toplevel directory
77
- - update-index: fix worktree setup
78
- + read-tree: setup worktree if merge is required
79
- + grep: fix worktree setup
80
- + diff*: fix worktree setup
81
-
82
-The last two fail test suite.
83
-
84
-* tr/filter-branch (Sun Aug 31 10:41:01 2008 -0700) 14 commits
85
- + Merge branch 'tr/rev-list-docs' into tr/filter-branch
86
- + Merge branch 'jc/post-simplify' (early part) into tr/filter-branch
87
- + revision --simplify-merges: make it a no-op without pathspec
88
- + revision --simplify-merges: do not leave commits unprocessed
89
- + revision --simplify-merges: use decoration instead of commit->util
90
- field
91
- + Documentation: rev-list-options: move --simplify-merges
92
- documentation
93
- + Merge branch 'jc/post-simplify' into tr/rev-list-docs
94
- + filter-branch: use --simplify-merges
95
- + Merge branch 'jc/post-simplify' into tr/filter-branch
96
- + filter-branch: fix ref rewriting with --subdirectory-filter
97
- + filter-branch: Extend test to show rewriting bug
98
- + Topo-sort before --simplify-merges
99
- + revision traversal: show full history with merge simplification
100
- + revision.c: whitespace fix
101
-
102
-This now merges up all (and only) the necessary pieces from the
103
-post-simplify topic and the documentation updates, ready to be merged to
104
-"master".
61
+* jc/hide-cr-in-diff-from-less (Wed Aug 27 19:48:01 2008 -0700) 1 commit
62
+ + diff: Help "less" hide ^M from the output
63
+
64
+* jc/maint-checkout-fix (Fri Aug 29 13:40:36 2008 -0700) 1 commit
65
+ + checkout: do not check out unmerged higher stages randomly
66
+
67
+This is the same one as the bottom of "better conflict resolution" series.
68
+
69
+* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
70
+ + configure: auto detect dynamic library path switches
71
+ + Makefile: Allow CC_LD_DYNPATH to be overriden
72
+
73
+I decided to push this forward; it might break minority configurations,
74
+but it appears nobody pays attention until it actually hurts, so let's see
75
+what happens when this hits 'master'.
76
+
77
+* ar/autospell (Sun Aug 31 15:54:58 2008 +0200) 2 commits
78
+ + Add help.autocorrect to enable/disable autocorrecting
79
+ + git wrapper: DWIM mistyped commands
80
81
----------------------------------------------------------------
82
[Stalled -- Needs Action to Proceed (or to be dropped)]
@@ -118,38 +93,67 @@ Réne had good comments on how the callback should be structured.
93
* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit
94
- git-am: Pass the --directory option through to git-apply
95
96
+I think this is still buggy and drops the option when am stops with
97
+conflicts.
98
+
99
+* dk/emacs (Tue Aug 26 22:24:40 2008 -0500) 2 commits
100
+ - Teach git.el to mark/unmark files by regexp
101
+ - git.el: Diff only file at point by default
102
+
103
+These are still queued but Alexandre had improvement requests so these
104
+will likely be dropped.
105
+
106
----------------------------------------------------------------
107
[Will be merged to "master" soon]
108
124
-* jc/hide-cr-in-diff-from-less (Wed Aug 27 19:48:01 2008 -0700) 1 commit
125
- + diff: Help "less" hide ^M from the output
109
+* np/pack (Tue Sep 2 10:22:22 2008 -0400) 4 commits
110
+ + t5300: improve SHA1 collision test
111
+ + pack-objects: don't include missing preferred base objects
112
+ + sha1write: don't copy full sized buffers
113
+ + Merge branch 'np/maint-safer-pack' into np/pack
114
127
-* jc/maint-checkout-fix (Fri Aug 29 13:40:36 2008 -0700) 1 commit
128
- + checkout: do not check out unmerged higher stages randomly
115
+* bw/shortref (Fri Sep 5 23:16:23 2008 +0200) 1 commit
116
+ + for-each-ref: `:short` format for `refname`
117
130
-This is the same one as the bottom of "better conflict resolution" series;
131
-it is a bugfix meant to be applied on 'maint'.
118
+* rs/decorate (Thu Sep 4 23:40:03 2008 +0200) 3 commits
119
+ + add '%d' pretty format specifier to show decoration
120
+ + move load_ref_decorations() to log-tree.c and export it
121
+ + log: add load_ref_decorations()
122
133
-* jc/cc-ld-dynpath (Sat Aug 16 15:01:23 2008 +0200) 2 commits
134
- + configure: auto detect dynamic library path switches
135
- + Makefile: Allow CC_LD_DYNPATH to be overriden
123
+* tr/rev-list-reverse (Mon Sep 1 00:31:37 2008 +0200) 2 commits
124
+ + t6013: replace use of 'tac' with equivalent Perl
125
+ + rev-list: fix --reverse interaction with --parents
126
137
-I decided to push this forward; it might break minority configurations,
138
-but it appears nobody pays attention until it actually hurts, so let's see
139
-what happens when this hits 'master'.
127
+* cc/bisect (Sat Sep 6 07:27:03 2008 +0200) 3 commits
128
+ + bisect: remove "checkout_done" variable used when checking merge
129
+ bases
130
+ + bisect: only check merge bases when needed
131
+ + bisect: test merge base if good rev is not an ancestor of bad rev
132
141
-* ar/autospell (Sun Aug 31 15:54:58 2008 +0200) 2 commits
142
- + Add help.autocorrect to enable/disable autocorrecting
143
- + git wrapper: DWIM mistyped commands
133
+* jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit
134
+ + daemon.c: avoid setlinebuf()
135
+
136
+* jc/maint-diff-quiet (Mon Sep 1 23:20:26 2008 -0700) 2 commits
137
+ + diff --quiet: make it synonym to --exit-code >/dev/null
138
+ + diff Porcelain: do not disable auto index refreshing on -C -C
139
140
----------------------------------------------------------------
141
[Actively Cooking]
142
148
-* tr/rev-list-reverse (Mon Sep 1 00:31:37 2008 +0200) 2 commits
149
- + t6013: replace use of 'tac' with equivalent Perl
150
- + rev-list: fix --reverse interaction with --parents
143
+* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
144
+ + diff --dirstat-by-file: count changed files, not lines
145
+
146
+* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit
147
+ + safe_create_leading_directories(): make it about "leading"
148
+ directories
149
152
-* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 16 commits
150
+* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
151
+ - git-apply:--include=pathspec
152
+
153
+* pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit
154
+ + builtin-commit.c: show on which branch a commit was added
155
+
156
+* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 15 commits
157
+ Fix AsciiDoc errors in merge documentation
158
+ git-merge documentation: describe how conflict is presented
159
+ checkout --conflict=<style>: recreate merge in a non-default style
@@ -169,7 +173,6 @@ what happens when this hits 'master'.
173
conflicting merge
174
+ checkout -f: allow ignoring unmerged paths when checking out of
175
the index
172
- + checkout: do not check out unmerged higher stages randomly
176
177
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
178
+ date/time: do not get confused by fractional seconds
@@ -190,12 +193,6 @@ case insensitive filesystems. I dunno.
193
Teaches "git add" to record only the intent to add a path later.
194
I rerolled this without the fake empty blob object.
195
193
-* cc/bisect (Sat Sep 6 07:27:03 2008 +0200) 3 commits
194
- + bisect: remove "checkout_done" variable used when checking merge
195
- bases
196
- + bisect: only check merge bases when needed
197
- + bisect: test merge base if good rev is not an ancestor of bad rev
198
-
196
* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
197
+ builtin-merge: release the lockfile in try_merge_strategy()
198
+ merge-recursive: get rid of virtual_id
@@ -225,13 +222,6 @@ I started making this incremental but the progress is not so great.
222
----------------------------------------------------------------
223
[On Hold]
224
228
-* dk/emacs (Tue Aug 26 22:24:40 2008 -0500) 2 commits
229
- - Teach git.el to mark/unmark files by regexp
230
- - git.el: Diff only file at point by default
231
-
232
-These are still queued but Alexandre had improvement requests so these
233
-will likely be dropped.
234
-
225
* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits
226
- git-am --forge: add Signed-off-by: line for the author
227
- git-am: clean-up Signed-off-by: lines
@@ -270,53 +260,3 @@ have been hearing, it might not be a bad idea to drop this.
260
261
This would be the right thing to do for command line use, but gitk will be
262
hit due to tcl/tk's limitation, so I am holding this back for now.
273
-
274
-----------------------------------------------------------------
275
-[Graduated to "master"]
276
-
277
-* np/safer-pack (Fri Aug 29 16:08:02 2008 -0400) 5 commits
278
- + fixup_pack_header_footer(): use nicely aligned buffer sizes
279
- + index-pack: use fixup_pack_header_footer()'s validation mode
280
- + pack-objects: use fixup_pack_header_footer()'s validation mode
281
- + improve reliability of fixup_pack_header_footer()
282
- + pack-objects: improve returned information from write_one()
283
-
284
-* rf/man-env (Fri Aug 29 17:00:43 2008 +0200) 1 commit
285
- + builtin-help: fallback to GIT_MAN_VIEWER before man
286
-
287
-* ho/dashless (Sun Aug 31 09:39:19 2008 -0700) 2 commits
288
- + 'git foo' program identifies itself without dash in die() messages
289
- + Start conforming code to "git subcmd" style
290
-
291
-* jc/author-nickname (Tue Aug 26 23:13:13 2008 -0700) 1 commit
292
- + git commit --author=$name: look $name up in existing commits
293
-
294
-* dp/pid-uintmax (Sun Aug 31 14:09:39 2008 +0200) 1 commit
295
- + cast pid_t's to uintmax_t to improve portability
296
-
297
-* nd/worktree (Sat Aug 30 16:15:32 2008 +0700) 5 commits
298
- - setup_git_directory(): fix move to worktree toplevel directory
299
- - update-index: fix worktree setup
300
- + read-tree: setup worktree if merge is required
301
- + grep: fix worktree setup
302
- + diff*: fix worktree setup
303
-
304
-The last two fail test suite.
305
-
306
-* tr/filter-branch (Sun Aug 31 10:41:01 2008 -0700) 14 commits
307
- + Merge branch 'tr/rev-list-docs' into tr/filter-branch
308
- + Merge branch 'jc/post-simplify' (early part) into tr/filter-branch
309
- + revision --simplify-merges: make it a no-op without pathspec
310
- + revision --simplify-merges: do not leave commits unprocessed
311
- + revision --simplify-merges: use decoration instead of commit->util
312
- field
313
- + Documentation: rev-list-options: move --simplify-merges
314
- documentation
315
- + Merge branch 'jc/post-simplify' into tr/rev-list-docs
316
- + filter-branch: use --simplify-merges
317
- + Merge branch 'jc/post-simplify' into tr/filter-branch
318
- + filter-branch: fix ref rewriting with --subdirectory-filter
319
- + filter-branch: Extend test to show rewriting bug
320
- + Topo-sort before --simplify-merges
321
- + revision traversal: show full history with merge simplification
322
- + revision.c: whitespace fix