What's cooking (2009/08 #03)
Junio C Hamano committed
Aug 20, 2009 at 18:21 UTC
99cb457a0b204359a969405c3e1c88901333c527
1 file changed
+275
-231
whats-cooking.txt
+275
-231
@@ -1,15 +1,15 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2009, #02; Wed, 12)
3
-X-master-at: 6ffd781226f04629eff63a684b47ad7555143312
4
-X-next-at: e5cd0abadfa20eaf7a76784ad5802115c75eff2f
2
+Subject: What's cooking in git.git (Aug 2009, #03; Thu, 20)
3
+X-master-at: 044239b0a1fbdcccefafe1dab5f9c21e5a2a9150
4
+X-next-at: ea167d76afdd01db4b4f4cbd6429abff15cc2ccc
5
6
-What's cooking in git.git (Aug 2009, #02; Wed, 12)
6
+What's cooking in git.git (Aug 2009, #03; Thu, 20)
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 branches, but I am still
12
-holding onto them.
11
+marked with '.' do not appear in any of the integration branches, but I am
12
+still holding onto them.
13
14
After the 1.6.5 cycle, the next release will be 1.7.0, and we will push
15
out the planned "push safety" change. 1.7.0 would be a good time to
@@ -17,75 +17,197 @@ introduce "justifiable" changes that are not strictly backward compatible.
17
18
During 1.6.5 cycle, 'next' will hold topics meant for 1.6.5 and 1.7.0.
19
20
-----------------------------------------------------------------
20
+--------------------------------------------------
21
[New Topics]
22
23
-* ld/p4 (Thu Jul 30 00:13:46 2009 +0100) 1 commit
24
- - git-p4: stream from perforce to speed up clones
25
-
26
-Waiting for Ack/Nack from stakeholders. Probably I should merge this to
27
-'next' soon, keep it there for a week and see if anybody screams, aka
28
-"Nack now or forever hold your peace" ;-).
29
-
30
-* mr/gitweb-xz (Thu Aug 6 10:28:25 2009 -0400) 3 commits
31
- - gitweb: add support for XZ compressed snapshots
32
- - gitweb: update INSTALL regarding specific snapshot settings
33
- - gitweb: support to globally disable a snapshot format
23
+* aj/fix-read-tree-from-scratch (2009-08-17) 1 commit
24
+ (merged to 'next' on 2009-08-20 at 7a04133)
25
+ + read-tree: Fix regression with creation of a new index file.
26
35
-This should be safe as long as it does not silently enable itself for
36
-folks who merely updated gitweb to this version without explicitly asking
37
-for the new format (but I do not remember if that is what the patch does).
27
+* as/maint-graph-interesting-fix (2009-08-18) 1 commit.
28
+ - graph API: fix bug in graph_is_interesting()
29
39
-* jh/cvs-helper (Wed Aug 12 02:13:51 2009 +0200) 4 commits
40
- - Add simple selftests of git-remote-cvs functionality
41
- - Third draft of CVS remote helper program
42
- - Add Python support library for CVS remote helper
43
- - Basic build infrastructure for Python scripts
30
+* jc/1.7.0-status (2009-08-15) 7 commits
31
+ - git-status: adjust tests
32
+ - git status: not "commit --dry-run" anymore
33
+ - git stat -s: short status output
34
+ - git stat: pathspec limits, unlike traditional "git status"
35
+ - git stat: show traditional status headers and trailers as well
36
+ - git stat: honor relative paths setting
37
+ - git stat: the beginning
38
+ (this branch uses jc/shortstatus.)
39
+
40
+* jc/maint-checkout-index-to-prefix (2009-08-16) 1 commit
41
+ (merged to 'next' on 2009-08-20 at 2f6aea2)
42
+ + check_path(): allow symlinked directories to checkout-index --prefix
43
+
44
+* jc/maint-unpack-objects-strict (2009-08-13) 1 commit.
45
+ - Fix "unpack-objects --strict"
46
+
47
+* jh/submodule-foreach (2009-08-20) 9 commits
48
+ (merged to 'next' on 2009-08-20 at 671bea4)
49
+ + git clone: Add --recursive to automatically checkout (nested) submodules
50
+ + t7407: Use 'rev-parse --short' rather than bash's substring expansion notation
51
+ (merged to 'next' on 2009-08-18 at f4a881d)
52
+ + git submodule status: Add --recursive to recurse into nested submodules
53
+ + git submodule update: Introduce --recursive to update nested submodules
54
+ + git submodule foreach: Add --recursive to recurse into nested submodules
55
+ + git submodule foreach: test access to submodule name as '$name'
56
+ + Add selftest for 'git submodule foreach'
57
+ + git submodule: Cleanup usage string and add option parsing to cmd_foreach()
58
+ + git submodule foreach: Provide access to submodule name, as '$name'
59
+
60
+* jl/submodule-summary-diff-files (2009-08-15) 2 commits
61
+ (merged to 'next' on 2009-08-15 at 165bd8e)
62
+ + Documentaqtion/git-submodule.txt: Typofix
63
+ (merged to 'next' on 2009-08-14 at a702e78)
64
+ + git submodule summary: add --files option
65
+
66
+* lh/short-decorate (2009-08-15) 1 commit
67
+ (merged to 'next' on 2009-08-18 at b8c1d96)
68
+ + git-log: allow --decorate[=short|full]
69
+
70
+* oa/stash-na (2009-08-11) 1 commit
71
+ (merged to 'next' on 2009-08-14 at 12c2e2b)
72
+ + git stash: Give friendlier errors when there is nothing to apply
73
+
74
+* sr/gfi-options (2009-08-13) 3 commits
75
+ - fast-import: test the new option command
76
+ - fast-import: add option command
77
+ - fast-import: put option parsing code in seperate functions
78
45
-Builds on db/vcs-helper. The last round failed its own selftest for me,
46
-but this one seems to be Ok. Documentation/git-remote-cvs.txt needs to be
47
-fixed to build, though.
79
+--------------------------------------------------
80
+[Graduated to "master"]
81
82
* bc/maint-am-email (Thu Aug 6 20:08:13 2009 -0500) 2 commits
83
+ git-am: print fair error message when format detection fails
84
+ am: allow individual e-mail files as input
85
86
It seems that the "not mbox but a single piece of e-mail" format was
54
-something many people relied on. I'm cooking this in 'next', and
55
-hopefully it can graduate both to 'master' and 'maint'.
87
+something many people relied on. Hopefully this can also be sent
88
+to 'maint'.
89
90
* js/maint-cover-letter-non-ascii (Mon Aug 10 18:22:22 2009 +0200) 2 commits
91
+ Correctly mark cover letters' encodings if they are not pure ASCII
92
+ Expose the has_non_ascii() function
93
61
-* jc/verify-pack-stat (Fri Aug 7 15:45:30 2009 -0700) 2 commits
94
+* jk/maint-merge-msg-fix (Sun Aug 9 06:02:51 2009 -0400) 3 commits
95
+ + merge: indicate remote tracking branches in merge message
96
+ + merge: fix incorrect merge message for ambiguous tag/branch
97
+ + add tests for merge message headings
98
+
99
+* jc/maint-clean-nested-dir-safety (Tue Jun 30 15:33:45 2009 -0700) 1 commit
100
+ + clean: require double -f options to nuke nested git repository and
101
+ work tree
102
+
103
+--------------------------------------------------
104
+[Stalled]
105
+
106
+* cc/sequencer-rebase-i (2009-08-05) 8 commits.
107
+ - rebase -i: use "git sequencer--helper --reset-hard"
108
+ - sequencer: add "--reset-hard" option to "git sequencer--helper"
109
+ - sequencer: add comments about reset_almost_hard()
110
+ - sequencer: add "reset_almost_hard()" and related functions
111
+ - rebase -i: use "git sequencer--helper --make-patch"
112
+ - sequencer: free memory used in "make_patch" function
113
+ - sequencer: add "make_patch" function to save a patch
114
+ - sequencer: add "builtin-sequencer--helper.c"
115
+
116
+More sequencer updates. I didn't look at the latest round that had a
117
+handful "oops, fix that earlier botch" patches, expecting a cleaner
118
+reroll (which hasn't happened yet).
119
+
120
+* pb/tracking (2009-07-16) 7 commits.
121
+ . branch.c: if remote is not config'd for branch, don't try delete push config
122
+ . branch, checkout: introduce autosetuppush
123
+ . move deletion of merge configuration to branch.c
124
+ . remote: add per-remote autosetupmerge and autosetuprebase configuration
125
+ . introduce a struct tracking_config
126
+ . branch: install_branch_config and struct tracking refactoring
127
+ . config: allow false and true values for branch.autosetuprebase
128
+
129
+Has been ejected from 'pu' for some time, expecting a reroll.
130
+
131
+* db/vcs-helper (2009-08-09) 17 commits
132
+ - Allow helpers to request marks for fast-import
133
+ - Allow helpers to report in "list" command that the ref is unchanged
134
+ - Add support for "import" helper command
135
+ - transport-helper_init(): fix a memory leak in error path
136
+ - Add a config option for remotes to specify a foreign vcs
137
+ - Allow programs to not depend on remotes having urls
138
+ - Allow fetch to modify refs
139
+ - Use a function to determine whether a remote is valid
140
+ - Use a clearer style to issue commands to remote helpers
141
+ (merged to 'next' on 2009-08-07 at f3533ba)
142
+ + Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
143
+ + Makefile: do not link three copies of git-remote-* programs
144
+ + Makefile: git-http-fetch does not need expat
145
+ (merged to 'next' on 2009-08-06 at 15da79d)
146
+ + http-fetch: Fix Makefile dependancies
147
+ + Add transport native helper executables to .gitignore
148
+ (merged to 'next' on 2009-08-05 at 33d491e)
149
+ + git-http-fetch: not a builtin
150
+ + Use an external program to implement fetching with curl
151
+ + Add support for external programs for handling native fetches
152
+ (this branch is used by jh/cvs-helper.)
153
+
154
+There was a discussion that suggests that the use of colon ':' before vcs
155
+helper name needs to be corrected. Nothing happened since.
156
+
157
+* je/send-email-no-subject (2009-08-05) 1 commit
158
+ - send-email: confirm on empty mail subjects
159
+
160
+This seems to break t9001. Near the tip of 'pu' I have a iffy
161
+workaround.
162
+
163
+--------------------------------------------------
164
+[Cooking]
165
+
166
+* ld/p4 (2009-07-30) 1 commit
167
+ (merged to 'next' on 2009-08-14 at 36d310d)
168
+ + git-p4: stream from perforce to speed up clones
169
+
170
+Should graduate to 'master' soon.
171
+
172
+* mr/gitweb-xz (2009-08-06) 3 commits
173
+ (merged to 'next' on 2009-08-14 at b63b8e6)
174
+ + gitweb: add support for XZ compressed snapshots
175
+ + gitweb: update INSTALL regarding specific snapshot settings
176
+ + gitweb: support to globally disable a snapshot format
177
+
178
+Should graduate to 'master' soon.
179
+
180
+* jh/cvs-helper (2009-08-18) 7 commits
181
+ - More fixes to the git-remote-cvs installation procedure
182
+ - Fix the Makefile-generated path to the git_remote_cvs package
183
+ in git-remote-cvs
184
+ - Add simple selftests of git-remote-cvs functionality
185
+ - git-remote-cvs: Remote helper program for CVS repositories
186
+ - 2/2: Add Python support library for CVS remote helper
187
+ - 1/2: Add Python support library for CVS remote helper
188
+ - Basic build infrastructure for Python scripts
189
+ (this branch uses db/vcs-helper.)
190
+
191
+Builds on db/vcs-helper. The testing of Python part seemed to be
192
+still fragile even with the latest fix on one of my boches with an
193
+earlier round already installed, but I didn't look very deeply before
194
+removing the older installation.
195
+
196
+* jc/verify-pack-stat (2009-08-07) 1 commit
197
+ (merged to 'next' on 2009-08-10 at f80d0e9)
198
+ verify-pack --stat-only: show histogram without verifying
63
- + Merge branch 'maint' into jc/verify-pack-stat
64
-
65
-* lt/block-sha1 (Wed Aug 12 15:47:55 2009 -0400) 15 commits
66
- + block-sha1: support for architectures with memory alignment
67
- restrictions
68
- + block-sha1: split the different "hacks" to be individually
69
- selected
70
- + block-sha1: move code around
71
- + block-sha1: improve code on large-register-set machines
72
- + block-sha1: improved SHA1 hashing
73
- + block-sha1: perform register rotation using cpp
74
- + block-sha1: get rid of redundant 'lenW' context
75
- + block-sha1: Use '(B&C)+(D&(B^C))' instead of '(B&C)|(D&(B|C))' in
76
- round 3
77
- + block-sha1: macroize the rounds a bit further
78
- + block-sha1: re-use the temporary array as we calculate the SHA1
79
- + block-sha1: make the 'ntohl()' part of the first SHA1 loop
80
- + block-sha1: minor fixups
81
- + block-sha1: try to use rol/ror appropriately
82
- + block-sha1: undo ctx->size change
83
- + Add new optimized C 'block-sha1' routines
84
-
85
-Linus's "written in C, faster than handcrafted asm" SHA-1 implementation
86
-with clean-up and ARM support from Nico.
87
-
88
-* nd/sparse (Tue Aug 11 22:44:06 2009 +0700) 8 commits
199
+
200
+* lt/block-sha1 (2009-08-17) 4 commits
201
+ (merged to 'next' on 2009-08-18 at 67a1ce8)
202
+ + remove ARM and Mozilla SHA1 implementations
203
+ + block-sha1: guard gcc extensions with __GNUC__
204
+ + make sure byte swapping is optimal for git
205
+ + block-sha1: make the size member first in the context struct
206
+
207
+Finishing touches ;-) There were a few Solaris portability patches
208
+floated around that I didn't pick up, waiting for them to finalize.
209
+
210
+* nd/sparse (2009-08-11) 8 commits
211
. --sparse for porcelains
212
. Support sparse checkout in unpack_trees() and read-tree
213
. unpack-trees.c: generalize verify_* functions
@@ -93,61 +215,29 @@ with clean-up and ARM support from Nico.
215
. excluded_1(): support exclude "directories" in index
216
. Read .gitignore from index if it is assume-unchanged
217
. Avoid writing to buffer in add_excludes_from_file_1()
96
- . Prevent diff machinery from examining assume-unchanged entries on
97
- worktree
98
-
99
-Privately applied but not yet queued to 'pu', expecting a minor reroll
100
-near the tip.
101
-
102
-* jk/maint-merge-msg-fix (Sun Aug 9 06:02:51 2009 -0400) 3 commits
103
- + merge: indicate remote tracking branches in merge message
104
- + merge: fix incorrect merge message for ambiguous tag/branch
105
- + add tests for merge message headings
218
+ (merged to 'next' on 2009-08-20 at ea167d7)
219
+ + Prevent diff machinery from examining assume-unchanged entries on worktree
220
107
-----------------------------------------------------------------
108
-[Graduated to "master"]
221
+The first one was an independent fix; the rest will be discarded and
222
+replaced with the "return of no-checkout" series.
223
110
-* zf/maint-gitweb-acname (Sun Aug 2 09:42:24 2009 +0200) 1 commit
111
- - gitweb: parse_commit_text encoding fix
112
-
113
-* jc/maint-merge-recursive-fix (Thu Jul 30 17:38:15 2009 -0700) 1 commit
114
- - merge-recursive: don't segfault while handling rename clashes
115
-
116
-* js/run-command-updates (Tue Aug 4 11:28:40 2009 +0200) 7 commits
117
- + run-command.c: squelch a "use before assignment" warning
118
- + receive-pack: remove unnecessary run_status report
119
- + run_command: report failure to execute the program, but optionally
120
- don't
121
- + run_command: encode deadly signal number in the return value
122
- + run_command: report system call errors instead of returning error
123
- codes
124
- + run_command: return exit code as positive value
125
- + MinGW: simplify waitpid() emulation macros
126
-
127
-* mk/grep-max-depth (Wed Jul 22 19:52:15 2009 +0200) 1 commit
128
- + grep: Add --max-depth option.
129
-
130
-* jp/symlink-dirs (Wed Jul 29 20:22:25 2009 -0700) 3 commits
131
- + git-checkout: be careful about untracked symlinks
132
- + lstat_cache: guard against full match of length of 'name'
133
- parameter
134
- + Demonstrate bugs when a directory is replaced with a symlink
135
-
136
-----------------------------------------------------------------
137
-[In 'next']
138
-
139
-* bc/mailsplit-cr-at-eol (Tue Aug 4 22:31:59 2009 -0500) 4 commits
140
- + Allow mailsplit (and hence git-am) to handle mails with CRLF line-
141
- endings
142
- + builtin-mailsplit.c: remove read_line_with_nul() since it is no
143
- longer used
224
+* bc/mailsplit-cr-at-eol (2009-08-04) 4 commits
225
+ (merged to 'next' on 2009-08-06 at 6bc7c5c)
226
+ + Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings
227
+ + builtin-mailsplit.c: remove read_line_with_nul() since it is no longer used
228
+ builtin-mailinfo,builtin-mailsplit: use strbufs
229
+ strbuf: add new function strbuf_getwholeline()
230
147
-* gb/apply-ignore-whitespace (Tue Aug 4 13:16:49 2009 +0200) 1 commit
231
+Will merge.
232
+
233
+* gb/apply-ignore-whitespace (2009-08-04) 1 commit
234
+ (merged to 'next' on 2009-08-06 at 59e2c86)
235
+ git apply: option to ignore whitespace differences
236
150
-* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits
237
+Will merge.
238
+
239
+* cc/replace (2009-05-27) 14 commits.
240
+ (merged to 'next' on 2009-08-02 at b9c4bc0)
241
+ t6050: check pushing something based on a replaced commit
242
+ Documentation: add documentation for "git replace"
243
+ Add git-replace to .gitignore
@@ -160,103 +250,52 @@ near the tip.
250
+ replace_object: add a test case
251
+ object: call "check_sha1_signature" with the replacement sha1
252
+ sha1_file: add a "read_sha1_file_repl" function
163
- + replace_object: add mechanism to replace objects found in
164
- "refs/replace/"
253
+ + replace_object: add mechanism to replace objects found in "refs/replace/"
254
+ refs: add a "for_each_replace_ref" function
255
167
-* jc/1.7.0-diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits
256
+Will merge.
257
+
258
+* jc/1.7.0-diff-whitespace-only-status (2009-05-23) 2 commits.
259
+ (merged to 'next' on 2009-08-02 at 9c08420)
260
+ diff: Rename QUIET internal option to QUICK
261
+ diff: change semantics of "ignore whitespace" options
262
171
-This changes exit code from "git diff --ignore-whitespace" and friends
172
-when there is no actual output. It is a backward incompatible change, but
173
-we could argue that it is a bugfix.
263
+For 1.7.0. This changes exit code from "git diff --ignore-whitespace" and
264
+friends when there is no actual output. It is a backward incompatible
265
+change, but we could argue that it is a bugfix.
266
175
-* jc/1.7.0-push-safety (Mon Feb 9 00:19:46 2009 -0800) 2 commits
267
+* jc/1.7.0-push-safety (2009-02-09) 2 commits
268
+ (merged to 'next' on 2009-08-02 at 38b82fe)
269
+ Refuse deleting the current branch via push
177
- + Refuse updating the current branch in a non-bare repository via
178
- push
270
+ + Refuse updating the current branch in a non-bare repository via push
271
180
-----------------------------------------------------------------
181
-[In 'pu']
272
+For 1.7.0.
273
183
-* jn/gitweb-blame (Thu Aug 6 19:11:52 2009 +0200) 14 commits
184
- - gitweb: Create links leading to 'blame_incremental' using
185
- JavaScript
186
- - gitweb: Incremental blame (proof of concept)
274
+* jn/gitweb-blame (2009-08-06) 3 commits
275
+ - gitweb: Create links leading to 'blame_incremental' using JavaScript
276
+ - gitweb: Incremental blame (WIP)
277
- gitweb: Add optional "time to generate page" info in footer
188
- + Revert the four topmost commits from jn/gitweb-blame topic
189
- + gitweb: Create links leading to 'blame_incremental' using
190
- JavaScript
191
- + gitweb: Incremental blame (proof of concept)
192
- + gitweb: Add optional "time to generate page" info in footer
193
- + gitweb: Add -partial_query option to href() subroutine
194
- + gitweb: Use light/dark for class names also in 'blame' view
195
- + gitweb: Add author initials in 'blame' view, a la "git gui blame"
196
- + gitweb: Mark commits with no "previous" in 'blame' view
197
- + gitweb: Use "previous" header of git-blame -p in 'blame' view
198
- + gitweb: Mark boundary commits in 'blame' view
199
- + gitweb: Make .error style generic
200
-
201
-I haven't picked up Jakub's replacement to the second one from the tip.
202
-We probably should merge up to "Use light/dark" (aef3768) to 'master' and
203
-start the rest over.
204
-
205
-* jc/maint-clean-nested-dir-safety (Tue Jun 30 15:33:45 2009 -0700) 1 commit
206
- + clean: require double -f options to nuke nested git repository and
207
- work tree
278
209
-This probably should go in 'master' soonish.
210
-
211
-* jc/shortstatus (Tue Aug 4 23:55:22 2009 -0700) 12 commits
212
- - git stat -s: short status output
213
- - git stat: pathspec limits, unlike traditional "git status"
214
- - git stat: the beginning
279
+* jc/shortstatus (2009-08-15) 11 commits
280
+ (merged to 'next' on 2009-08-15 at 7e40766)
281
+ + git commit --dry-run -v: show diff in color when asked
282
+ + Documentation/git-commit.txt: describe --dry-run
283
+ (merged to 'next' on 2009-08-12 at 53bda17)
284
+ wt-status: collect untracked files in a separate "collect" phase
285
+ Make git_status_config() file scope static to builtin-commit.c
286
+ wt-status: move wt_status_colors[] into wt_status structure
287
+ wt-status: move many global settings to wt_status structure
288
+ commit: --dry-run
289
+ (merged to 'next' on 2009-08-06 at fe8cb94)
290
+ status: show worktree status of conflicted paths separately
221
- + wt-status.c: rework the way changes to the index and work tree are
222
- summarized
291
+ + wt-status.c: rework the way changes to the index and work tree are summarized
292
+ diff-index: keep the original index intact
293
+ diff-index: report unmerged new entries
294
+ (this branch is used by jc/1.7.0-status.)
295
226
-Slowly progressing. I've addressed issues pointed out by Jeff in his
227
-review, and hopefully the whole thing would be ready to go.
296
+Will cook for a bit more and then merge.
297
229
-* db/vcs-helper (Sun Aug 9 15:28:28 2009 -0400) 17 commits
230
- - Allow helpers to request marks for fast-import
231
- - Allow helpers to report in "list" command that the ref is
232
- unchanged
233
- - Add support for "import" helper command
234
- - transport-helper_init(): fix a memory leak in error path
235
- - Add a config option for remotes to specify a foreign vcs
236
- - Allow programs to not depend on remotes having urls
237
- - Allow fetch to modify refs
238
- - Use a function to determine whether a remote is valid
239
- - Use a clearer style to issue commands to remote helpers
240
- + Makefile: install hardlinks for git-remote-<scheme> supported by
241
- libcurl if possible
242
- + Makefile: do not link three copies of git-remote-* programs
243
- + Makefile: git-http-fetch does not need expat
244
- + http-fetch: Fix Makefile dependancies
245
- + Add transport native helper executables to .gitignore
246
- + git-http-fetch: not a builtin
247
- + Use an external program to implement fetching with curl
248
- + Add support for external programs for handling native fetches
249
-
250
-This consolidates various previous rounds from Daniel and Johan. It seems
251
-that the use of colon ':' before vcs helper name needs to be corrected
252
-before this series can go further.
253
-
254
-* je/send-email-no-subject (Wed Aug 5 18:49:54 2009 +0200) 1 commit
255
- - send-email: confirm on empty mail subjects
256
-
257
-This seems to break t9001. Near the tip of 'pu' I have a iffy workaround.
258
-
259
-* jh/notes (Wed Jul 29 04:25:26 2009 +0200) 8 commits
298
+* jh/notes (2009-07-29) 8 commits.
299
- t3302-notes-index-expensive: Speed up create_repo()
300
- fast-import: Add support for importing commit notes
301
- First draft of notes tree parser with support for fanout subtrees
@@ -266,54 +305,59 @@ This seems to break t9001. Near the tip of 'pu' I have a iffy workaround.
305
- Add a script to edit/inspect notes
306
- Introduce commit notes
307
269
-* cc/sequencer-rebase-i (Wed Aug 5 22:53:00 2009 +0200) 8 commits
270
- - rebase -i: use "git sequencer--helper --reset-hard"
271
- - sequencer: add "--reset-hard" option to "git sequencer--helper"
272
- - sequencer: add comments about reset_almost_hard()
273
- - sequencer: add "reset_almost_hard()" and related functions
274
- - rebase -i: use "git sequencer--helper --make-patch"
275
- - sequencer: free memory used in "make_patch" function
276
- - sequencer: add "make_patch" function to save a patch
277
- - sequencer: add "builtin-sequencer--helper.c"
278
-
279
-More sequencer updates. I didn't look at the latest round that had a
280
-handful "oops, fix that earlier botch" patches, expecting a cleaner
281
-reroll.
282
-
283
-* jc/mailinfo-remove-brackets (Wed Jul 15 15:31:12 2009 -0700) 1 commit
284
- - mailinfo: -b option keeps [bracketed] strings that is not a
285
- [PATCH] marker
286
-
287
-* tr/reset-checkout-patch (Tue Jul 28 23:20:12 2009 +0200) 8 commits
288
- - DWIM 'git stash save -p' for 'git stash -p'
289
- - Merge branch 'js/stash-dwim' into tr/reset-checkout-patch
290
- - Make 'git stash -k' a short form for 'git stash save --keep-index'
291
- - Implement 'git stash save --patch'
292
- - Implement 'git checkout --patch'
293
- - Implement 'git reset --patch'
294
- - builtin-add: refactor the meat of interactive_add()
295
- - git-apply--interactive: Refactor patch mode code
296
-
297
-Progress?
298
-
299
-* js/stash-dwim (Mon Jul 27 20:37:10 2009 +0200) 1 commit
300
- - Make 'git stash -k' a short form for 'git stash save --keep-index'
301
-
302
-This should be merged to 'next' soonish, but I keep forgetting.
303
-
304
-* pb/tracking (Thu Jul 16 16:26:15 2009 -0500) 7 commits
305
- . branch.c: if remote is not config'd for branch, don't try delete
306
- push config
307
- . branch, checkout: introduce autosetuppush
308
- . move deletion of merge configuration to branch.c
309
- . remote: add per-remote autosetupmerge and autosetuprebase
310
- configuration
311
- . introduce a struct tracking_config
312
- . branch: install_branch_config and struct tracking refactoring
313
- . config: allow false and true values for branch.autosetuprebase
314
-
315
-Has been ejected from 'pu' for some time, expecting a reroll.
316
-
317
-* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit
308
+The cvs-helper series depends on this one.
309
+
310
+* tr/reset-checkout-patch (2009-08-18) 8 commits.
311
+ (merged to 'next' on 2009-08-18 at e465bb3)
312
+ + tests: disable interactive hunk selection tests if perl is not available
313
+ (merged to 'next' on 2009-08-16 at 67896c4)
314
+ + DWIM 'git stash save -p' for 'git stash -p'
315
+ + Implement 'git stash save --patch'
316
+ + Implement 'git checkout --patch'
317
+ + Implement 'git reset --patch'
318
+ + builtin-add: refactor the meat of interactive_add()
319
+ + Add a small patch-mode testing library
320
+ + git-apply--interactive: Refactor patch mode code
321
+ (this branch uses js/stash-dwim.)
322
+
323
+There was a discussion on better DWIMmery to (1) forbid "git stash save
324
+--anything-with-dash" and (2) redirect with any option "git stash --opt"
325
+to "git stash save --opt", to keep it flexible and safe at the same time.
326
+I think it is a sane thing to do.
327
+
328
+* js/stash-dwim (2009-07-27) 1 commit.
329
+ (merged to 'next' on 2009-08-16 at 67896c4)
330
+ + Make 'git stash -k' a short form for 'git stash save --keep-index'
331
+ (this branch is used by tr/reset-checkout-patch.)
332
+
333
+* jc/log-tz (2009-03-03) 1 commit.
334
- Allow --date=local --date=other-format to work as expected
335
336
+* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
337
+ - mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
338
+
339
+--------------------------------------------------
340
+[I have been too busy to purge these]
341
+
342
+* ar/maint-1.6.2-merge-recursive-d-f (2009-05-11) 2 commits.
343
+ . Fix for a merge where a branch has an F->D transition
344
+ . Add a reminder test case for a merge with F/D transition
345
+
346
+* jc/merge-convert (2009-01-26) 1 commit.
347
+ . git-merge-file: allow converting the results for the work tree
348
+
349
+* lt/read-directory (2009-05-15) 3 commits.
350
+ . Add initial support for pathname conversion to UTF-8
351
+ . read_directory(): infrastructure for pathname character set conversion
352
+ . Add 'fill_directory()' helper function for directory traversal
353
+
354
+* ne/rev-cache (2009-08-17) 6 commits
355
+ . support for path name caching of blobs/trees in rev-cache
356
+ . full integration of rev-cache into git's revision walker, completed test suite
357
+ . administrative functions for rev-cache, and start of integration into git
358
+ . non-commit object support for rev-cache
359
+ . bare minimum revision cache system, no integration with git
360
+ . revision caching documentation: man page and technical discussion
361
+
362
+* ps/blame (2009-03-12) 1 commit.
363
+ . blame.c: start libifying the blame infrastructure