What's cooking (2008/09 #04)
Junio C Hamano committed
Sep 22, 2008 at 12:41 UTC
cfb0f122bb91a692c3425179a33ba7e29b547233
1 file changed
+105
-101
whats-cooking.txt
+105
-101
@@ -1,8 +1,8 @@
1
-Subject: What's cooking in git.git (Sep 2008, #03; Fri, 19)
2
-X-master-at: 3791f77c28f233df121da2f83abf7eefc7b49b69
3
-X-next-at: 724951a306cebd5ce76602b9a0394df74ce52174
1
+Subject: What's cooking in git.git (Sep 2008, #04; Mon, 22)
2
+X-master-at: c76dc9592d1c770212d50ee7a7028a74f472f23b
3
+X-next-at: 7f0eb98a28d41e28f6a7b72e118d72de01bab1a7
4
5
-What's cooking in git.git (Sep 2008, #03; Fri, 19)
5
+What's cooking in git.git (Sep 2008, #04; Mon, 22)
6
--------------------------------------------------
7
8
Here are the topics that have been cooking. Commits prefixed
@@ -12,109 +12,40 @@ in 'next'.
12
The topics list the commits in reverse chronological order. The topics
13
meant to be merged to the maintenance series have "maint-" in their names.
14
15
-By the way, I'll be on vacation from Sep 24 til Oct 08, but e-mail based
16
-proposal/review/discussion/improvement cycle and the distributed nature of
17
-git mean that it shouldn't keep the participants from further working on
18
-the system. Hopefully when I come back I'll see a much improved git ;-).
15
+I'll be on vacation til Oct 08; proposal/review/discussion/improvement
16
+cycle based on e-mails and the distributed nature of git mean that it
17
+shouldn't keep the participants from further improving the system. I've
18
+asked Shawn to look after in-flight patches during the time, so hopefully
19
+when I come back I'll see a much better git ;-).
20
21
----------------------------------------------------------------
22
[New Topics]
23
23
-* mg/maint-remote-fix (Thu Sep 18 18:11:02 2008 +0200) 1 commit
24
- - make "git remote" report multiple URLs
24
+* nd/narrow (Sun Sep 14 20:07:59 2008 +0700) 9 commits
25
+ - grep: skip files that have not been checked out
26
+ - checkout_entry(): CE_NO_CHECKOUT on checked out entries.
27
+ - Prevent diff machinery from examining worktree outside narrow
28
+ checkout
29
+ - Add tests for updating no-checkout entries in index
30
+ - ls-files: add --narrow-checkout option to "will checkout" entries
31
+ - update-index: add --checkout/--no-checkout to update
32
+ CE_NO_CHECKOUT bit
33
+ - update-index: refactor mark_valid() in preparation for new options
34
+ - Introduce CE_NO_CHECKOUT bit
35
+ - Extend index to save more flags
36
+
37
+This is an early half of the earlier series (I haven't had chance to look
38
+at the updated series yet), and should be replaced with the updated one
39
+posted recently.
40
26
-Still with a minor nit but I think this is an improvement.
41
+----------------------------------------------------------------
42
+[Stalled -- Needs Action to Proceed (or to be dropped)]
43
44
* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit
45
- t7400: Add short "git submodule add" testsuite
46
47
Waiting for a reroll.
48
33
-* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
34
- + Documentation: Refer to git-rebase(1) to warn against rewriting
35
- + Documentation: new upstream rebase recovery section in git-rebase
36
-
37
-I think the last one on "recommended practice" needs discussion. I do not
38
-think it describes _the_ recommended workflow, although I think (1) what
39
-is recommended in the draft does make sense within its own scope, and (2)
40
-it may be impossible to come up with _the_ recommended workflow anyway.
41
-
42
-* bc/maint-diff-hunk-header-fix (Thu Sep 18 17:44:33 2008 -0500) 3 commits
43
- + diff.*.xfuncname which uses "extended" regex's for hunk header
44
- selection
45
- + diff.c: associate a flag with each pattern and use it for
46
- compiling regex
47
- + diff.c: return pattern entry pointer rather than just the hunk
48
- header pattern
49
-
50
-* bc/master-diff-hunk-header-fix (Thu Sep 18 20:32:50 2008 -0700) 4 commits
51
- + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
52
- hunk-header-fix
53
- + diff.*.xfuncname which uses "extended" regex's for hunk header
54
- selection
55
- + diff.c: associate a flag with each pattern and use it for
56
- compiling regex
57
- + diff.c: return pattern entry pointer rather than just the hunk
58
- header pattern
59
-
60
-I've commented on these two branches in a separate message.
61
-
62
-----------------------------------------------------------------
63
-[Graduated to "master"]
64
-
65
-* mh/maint-honor-no-ssl-verify (Thu Feb 21 15:10:37 2008 -0800) 1 commit
66
- + Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
67
-
68
-* dp/maint-rebase-fix (Tue Sep 9 16:05:26 2008 +0400) 2 commits
69
- + git-rebase--interactive: auto amend only edited commit
70
- + git-rebase-interactive: do not squash commits on abort
71
-
72
-* jc/maint-checkout-keep-remove (Sun Sep 7 19:49:25 2008 -0700) 1 commit
73
- + checkout: do not lose staged removal
74
-
75
-* jc/maint-template-permbits (Thu Aug 21 19:31:50 2008 -0500) 1 commit
76
- + Fix permission bits on sources checked out with an overtight umask
77
-
78
-* np/pack (Tue Sep 2 10:22:22 2008 -0400) 4 commits
79
- + t5300: improve SHA1 collision test
80
- + pack-objects: don't include missing preferred base objects
81
- + sha1write: don't copy full sized buffers
82
- + Merge branch 'np/maint-safer-pack' into np/pack
83
-
84
-* bw/shortref (Fri Sep 5 23:16:23 2008 +0200) 1 commit
85
- + for-each-ref: `:short` format for `refname`
86
-
87
-* rs/decorate (Thu Sep 4 23:40:03 2008 +0200) 3 commits
88
- + add '%d' pretty format specifier to show decoration
89
- + move load_ref_decorations() to log-tree.c and export it
90
- + log: add load_ref_decorations()
91
-
92
-* tr/rev-list-reverse (Mon Sep 1 00:31:37 2008 +0200) 2 commits
93
- + t6013: replace use of 'tac' with equivalent Perl
94
- + rev-list: fix --reverse interaction with --parents
95
-
96
-* cc/bisect (Sat Sep 6 07:27:03 2008 +0200) 3 commits
97
- + bisect: remove "checkout_done" variable used when checking merge
98
- bases
99
- + bisect: only check merge bases when needed
100
- + bisect: test merge base if good rev is not an ancestor of bad rev
101
-
102
-* jc/setlinebuf-setvbuf (Wed Sep 3 20:33:29 2008 -0700) 1 commit
103
- + daemon.c: avoid setlinebuf()
104
-
105
-* jc/maint-diff-quiet (Mon Sep 1 23:20:26 2008 -0700) 2 commits
106
- + diff --quiet: make it synonym to --exit-code >/dev/null
107
- + diff Porcelain: do not disable auto index refreshing on -C -C
108
-
109
-* jc/maint-name-hash-clear (Sat Aug 23 13:05:10 2008 -0700) 1 commit
110
- + discard_cache: reset lazy name_hash bit
111
-
112
-* jc/diff-prefix (Mon Aug 18 20:08:09 2008 -0700) 1 commit
113
- + diff: vary default prefix depending on what are compared
114
-
115
-----------------------------------------------------------------
116
-[Stalled -- Needs Action to Proceed (or to be dropped)]
117
-
49
* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits
50
- Use xdiff caching to improve git blame performance
51
- Allow xdiff machinery to cache hash results for a file
@@ -131,7 +62,7 @@ I think this is still buggy and drops the option when am stops with
62
conflicts.
63
64
----------------------------------------------------------------
134
-[Will be merged to "master" soon]
65
+[Will be merged to 'master/maint' soon]
66
67
* mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits
68
+ builtin-merge: release the lockfile in try_merge_strategy()
@@ -147,27 +78,36 @@ conflicts.
78
+ merge-recursive.c: Add more generic merge_recursive_generic()
79
+ Split out merge_recursive() to merge-recursive.c
80
81
+(Tip at 4271666)
82
+
83
* ho/dirstat-by-file (Fri Sep 5 22:27:35 2008 +0300) 1 commit
84
+ diff --dirstat-by-file: count changed files, not lines
85
86
+(Tip at fd33777)
87
+
88
* jc/safe-c-l-d (Tue Sep 2 14:10:15 2008 -0700) 1 commit
89
+ safe_create_leading_directories(): make it about "leading"
90
directories
91
92
+(Tip at 5f0bdf5)
93
+
94
* jc/apply-include-exclude (Mon Aug 25 01:05:31 2008 -0700) 1 commit
95
+ git-apply:--include=pathspec
96
97
+(Tip at 6ecb1ee)
98
+
99
* mv/commit-tree (Wed Sep 10 22:10:33 2008 +0200) 3 commits
100
+ t7603: add new testcases to ensure builtin-commit uses
101
reduce_heads()
102
+ builtin-commit: use commit_tree()
103
+ commit_tree(): add a new author parameter
104
105
+(Tip at 7a172b0)
106
+
107
* pb/autocorrect-wrapper (Wed Sep 10 17:54:28 2008 +0200) 1 commit
108
+ git wrapper: also use aliases to correct mistyped commands
109
169
-* pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit
170
- + builtin-commit.c: show on which branch a commit was added
110
+(Tip at 746c221)
111
112
* jc/better-conflict-resolution (Thu Sep 4 23:48:48 2008 +0200) 15 commits
113
+ Fix AsciiDoc errors in merge documentation
@@ -190,6 +130,8 @@ conflicts.
130
+ checkout -f: allow ignoring unmerged paths when checking out of
131
the index
132
133
+(Tip at 3407a7a)
134
+
135
* jc/alternate-push (Tue Sep 9 01:27:10 2008 -0700) 4 commits
136
+ push: receiver end advertises refs from alternate repositories
137
+ push: prepare sender to receive extended ref information from the
@@ -197,13 +139,75 @@ conflicts.
139
+ receive-pack: make it a builtin
140
+ is_directory(): a generic helper function
141
200
-----------------------------------------------------------------
201
-[Actively Cooking]
142
+(Tip at d79796b)
143
+
144
+* bc/master-diff-hunk-header-fix (Sat Sep 20 18:36:22 2008 -0700) 10 commits
145
+ + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
146
+ hunk-header-fix
147
+ + diff hunk pattern: fix misconverted "\{" tex macro introducers
148
+ + diff: fix "multiple regexp" semantics to find hunk header comment
149
+ + diff: use extended regexp to find hunk headers
150
+ + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
151
+ hunk-header-fix
152
+ + diff: use extended regexp to find hunk headers
153
+ + Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-
154
+ hunk-header-fix
155
+ + diff.*.xfuncname which uses "extended" regex's for hunk header
156
+ selection
157
+ + diff.c: associate a flag with each pattern and use it for
158
+ compiling regex
159
+ + diff.c: return pattern entry pointer rather than just the hunk
160
+ header pattern
161
+
162
+(Tip at 92bb978)
163
164
* am/status (Mon Sep 8 00:05:03 2008 +0200) 2 commits
165
+ wt-status: Teach how to discard changes in the working directory
166
+ wt-status: Split header generation into three functions
167
168
+(Tip at 4d6e4c4)
169
+
170
+I think the above are all ready for 'master'.
171
+
172
+* mg/maint-remote-fix (Mon Sep 22 10:57:51 2008 +0200) 1 commit
173
+ + make "git remote" report multiple URLs
174
+
175
+(Tip at 7d20e21)
176
+
177
+* bc/maint-diff-hunk-header-fix (Sat Sep 20 15:30:12 2008 -0700) 5 commits
178
+ + diff hunk pattern: fix misconverted "\{" tex macro introducers
179
+ + diff: use extended regexp to find hunk headers
180
+ + diff.*.xfuncname which uses "extended" regex's for hunk header
181
+ selection
182
+ + diff.c: associate a flag with each pattern and use it for
183
+ compiling regex
184
+ + diff.c: return pattern entry pointer rather than just the hunk
185
+ header pattern
186
+
187
+(Tip at 96d1a8e)
188
+
189
+The above two are ready for 'maint'.
190
+
191
+----------------------------------------------------------------
192
+[Actively Cooking]
193
+
194
+* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits
195
+ + Documentation: Refer to git-rebase(1) to warn against rewriting
196
+ + Documentation: new upstream rebase recovery section in git-rebase
197
+
198
+My impression from the last round of discusson on the third patch in this
199
+series (not queued here) was that as long as we do not present it as "One
200
+True Workflow", the description was a good starting point, possibly others
201
+to add other recommended flows later.
202
+
203
+* pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit
204
+ + builtin-commit.c: show on which branch a commit was added
205
+
206
+Tentatively kicked back to "still cooking" status after Jeff voiced his
207
+annoyance. I personally do not like making this multi-line as Jeff
208
+suggested as an alternative (the message already is too verbose to my
209
+taste).
210
+
211
* lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit
212
+ date/time: do not get confused by fractional seconds
213