What's cooking (2008/07 #04)
Junio C Hamano committed
Aug 5, 2008 at 21:44 UTC
62708729f58fe69629f93e393aeccd9cd076b247
1 file changed
+109
-124
whats-cooking.txt
+109
-124
@@ -1,6 +1,6 @@
1
-Subject: What's cooking in git.git (Jul 2008, issue #03; Mon, 07)
1
+Subject: What's cooking in git.git (Jul 2008, issue #04; Wed, 09)
2
3
-What's cooking in git.git (Jul 2008, issue #03; Mon, 07)
3
+What's cooking in git.git (Jul 2008, issue #04; Wed, 09)
4
--------------------------------------------------------
5
6
Here are the topics that have been cooking. Commits prefixed
@@ -11,25 +11,20 @@ The topics list the commits in reverse chronological order. The topics
11
meant to be applied to the maintenance series have "maint-" in their
12
names.
13
14
-It already is beginning to become clear what 1.6.0 will look like. Wha=
15
-t's
14
+It already is beginning to become clear what 1.6.0 will look like. What's
15
already in 'next' all are well intentioned (I do not guarantee they are
17
-already bug-free --- that is what cooking them in 'next' is for) and ar=
18
-e
16
+already bug-free --- that is what cooking them in 'next' is for) and are
17
good set of feature enhancements. Bigger changes will be:
18
19
* Port for MinGW.
20
21
* With the default Makefile settings, most of the programs will be
24
- installed outside your $PATH, except for "git", "gitk", "git-gui" an=
25
-d
22
+ installed outside your $PATH, except for "git", "gitk", "git-gui" and
23
some server side programs that need to be accessible for technical
24
reasons. Invoking a git subcommand as "git-xyzzy" from the command
28
- line has been deprecated since early 2006 (and officially announced =
29
-in
25
+ line has been deprecated since early 2006 (and officially announced in
26
1.5.4 release notes); use of them from your scripts after adding
31
- output from "git --exec-path" to the $PATH will still be supported i=
32
-n
27
+ output from "git --exec-path" to the $PATH will still be supported in
28
1.6.0, but users are again strongly encouraged to adjust their
29
scripts to use "git xyzzy" form, as we will stop installing
30
"git-xyzzy" hardlinks for built-in commands in later releases.
@@ -47,56 +42,51 @@ n
42
----------------------------------------------------------------
43
[New Topics]
44
50
-* jc/rebase-orig-head (Mon Jul 7 00:16:38 2008 -0700) 1 commit
51
- + Teach "am" and "rebase" to mark the original position with
52
- ORIG_HEAD
45
+* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits
46
+ + Teach git-merge -X<option> again.
47
+ + Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next
48
+ + builtin-merge.c: use parse_options_step() "incremental parsing"
49
+ machinery
50
+ + Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next
51
54
-* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
55
- . Migrate git-am to use git-sequencer
56
- . Add git-sequencer test suite (t3350)
57
- . Add git-sequencer prototype documentation
58
- . Add git-sequencer shell prototype
52
+I've described what this is in a separate message.
53
60
-* js/pick-root (Fri Jul 4 16:19:52 2008 +0100) 1 commit
61
- + Allow cherry-picking root commits
54
+* jc/branch-merged (Tue Jul 8 17:55:47 2008 -0700) 3 commits
55
+ + branch --merged/--no-merged: allow specifying arbitrary commit
56
+ + branch --contains: default to HEAD
57
+ + parse-options: add PARSE_OPT_LASTARG_DEFAULT flag
58
63
-* ab/bundle (Sat Jul 5 17:26:40 2008 -0400) 1 commit
64
- + Teach git-bundle to read revision arguments from stdin like git-
65
- rev-list.
59
+This builds on top of the parse-options enhancement series that
60
+has been cooking in 'next' for some time.
61
67
-----------------------------------------------------------------
68
-[Will merge to master soon]
62
+* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits
63
+ + Documentation: Improve documentation for git-imap-send(1)
64
+ + imap-send.c: more style fixes
65
+ + imap-send.c: style fixes
66
+ + git-imap-send: Support SSL
67
+ + git-imap-send: Allow the program to be run from subdirectories of
68
+ a git tree
69
70
-* js/apply-root (Sun Jul 6 18:36:01 2008 -0700) 3 commits
71
- + git-apply --directory: make --root more similar to GNU diff
72
- + apply --root: thinkofix.
73
- + Teach "git apply" to prepend a prefix with "--root=3D<root>"
70
+* om/rerere-careful (Mon Jul 7 14:42:48 2008 +0200) 1 commit
71
+ + builtin-rerere: more carefully find conflict markers
72
75
-* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits
76
- + Make default expiration period of reflog used for stash infinite
77
- + Per-ref reflog expiry configuration
78
-
79
-As 1.6.0 will be a good time to make backward incompatible changes, the
80
-tip commit makes the default expiry period of stash 'never', unless you
81
-configure them to expire explicitly using gc.refs/stash.* variables.
82
-Needs consensus, but I am guessing that enough people would want stash
83
-that does not expire.
73
+----------------------------------------------------------------
74
+[Will merge to master soon]
75
85
-* jk/pager-config (Thu Jul 3 07:46:57 2008 -0400) 1 commit
86
- + Allow per-command pager config
76
+* js/pick-root (Fri Jul 4 16:19:52 2008 +0100) 1 commit
77
+ + Allow cherry-picking root commits
78
88
-----------------------------------------------------------------
89
-[Actively Cooking]
79
+* ab/bundle (Sat Jul 5 17:26:40 2008 -0400) 1 commit
80
+ + Teach git-bundle to read revision arguments from stdin like git-
81
+ rev-list.
82
91
-* sg/stash-k-i (Fri Jun 27 16:37:15 2008 +0200) 1 commit
83
+* sg/stash-k-i (Tue Jul 8 00:40:56 2008 -0700) 2 commits
84
+ + Documentation: tweak use case in "git stash save --keep-index"
85
+ stash: introduce 'stash save --keep-index' option
86
94
-One weakness of our "partial commit" workflow support used to be that t=
95
-he
96
-user can incrementally build what is to be committed in the index but t=
97
-hat
98
-state cannot be tested as a whole in the working tree. This allows you=
99
- to
87
+One weakness of our "partial commit" workflow support used to be that the
88
+user can incrementally build what is to be committed in the index but that
89
+state cannot be tested as a whole in the working tree. This allows you to
90
temporarily stash the remaining changes in the working tree so that the
91
index state before running "stash save --keep-index" can be seen in the
92
working tree to be tested and then committed.
@@ -122,10 +112,42 @@ Adds 'e/dit' action to interactive add command.
112
+ git-status: show the remote tracking statistics
113
+ Refactor "tracking statistics" code used by "git checkout"
114
125
-Makes the "your branch is ahead of the tracked one by N commits" logic =
126
-and
115
+Makes the "your branch is ahead of the tracked one by N commits" logic and
116
messages available to other commands; status and branch are updated.
117
118
+----------------------------------------------------------------
119
+[Actively Cooking]
120
+
121
+* jc/rebase-orig-head (Tue Jul 8 00:12:22 2008 -0400) 2 commits
122
+ + Documentation: mention ORIG_HEAD in am, merge, and rebase
123
+ + Teach "am" and "rebase" to mark the original position with
124
+ ORIG_HEAD
125
+
126
+* ph/parseopt-step-blame (Wed Jul 9 23:38:34 2008 +0200) 18 commits
127
+ + revisions: refactor handle_revision_opt into parse_revision_opt.
128
+ + git-shortlog: migrate to parse-options partially.
129
+ + git-blame: fix lapsus
130
+ + git-blame: migrate to incremental parse-option [2/2]
131
+ + git-blame: migrate to incremental parse-option [1/2]
132
+ + revisions: split handle_revision_opt() from setup_revisions()
133
+ + Merge branch 'jc/blame' (early part) into HEAD
134
+ + parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
135
+ + parse-opt: fake short strings for callers to believe in.
136
+ + parse-opt: do not print errors on unknown options, return -2
137
+ intead.
138
+ + parse-opt: create parse_options_step.
139
+ + parse-opt: Export a non NORETURN usage dumper.
140
+ + parse-opt: have parse_options_{start,end}.
141
+ + git-blame --reverse
142
+ + builtin-blame.c: allow more than 16 parents
143
+ + builtin-blame.c: move prepare_final() into a separate function.
144
+ + rev-list --children
145
+ + revision traversal: --children option
146
+
147
+Became active again ;-) This probably is ready for 'master' already,
148
+except for the last two which I only looked at the patch and have not
149
+used heavily in production yet.
150
+
151
* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits
152
+ Make "subtree" part more orthogonal to the rest of merge-
153
recursive.
@@ -134,23 +156,14 @@ messages available to other commands; status and branch are updated.
156
+ git-merge-recursive-{ours,theirs}
157
+ git-merge-file --ours, --theirs
158
137
-Punting a merge by discarding your own work in conflicting parts but st=
138
-ill
139
-salvaging the parts that are cleanly automerged. It is likely that thi=
140
-s
141
-will result in nonsense mishmash, but somehow often people want this, s=
142
-o
143
-here they are. The interface to the backends is updated so that you ca=
144
-n
145
-say "git merge -Xours -Xsubtree=3Dfoo/bar/baz -s recursive other" now.
146
-
147
-The -X<option> part may change, Dscho mentions that a single-letter -X
148
-that take stuck option is against syntax rules, and I think he's right.
149
-
150
-This is more "because we can", not "because we need to".
159
+Punting a merge by discarding your own work in conflicting parts but still
160
+salvaging the parts that are cleanly automerged. It is likely that this
161
+will result in nonsense mishmash, but somehow often people want this, so
162
+here they are. The interface to the backends is updated so that you can
163
+say "git merge -Xours -Xsubtree=foo/bar/baz -s recursive other" now.
164
165
* mv/merge-in-c (Mon Jul 7 19:24:20 2008 +0200) 15 commits
153
- - Build in merge
166
+ + Build in merge
167
+ Fix t7601-merge-pull-config.sh on AIX
168
+ git-commit-tree: make it usable from other builtins
169
+ Add new test case to ensure git-merge prepends the custom merge
@@ -172,32 +185,23 @@ This is more "because we can", not "because we need to".
185
----------------------------------------------------------------
186
[Graduated to "master"]
187
175
-* js/import-zip (Mon Jun 30 19:50:44 2008 +0100) 1 commit
176
- + Add another fast-import example, this time for .zip files
177
-
178
-* db/no-git-config (Mon Jun 30 03:37:47 2008 -0400) 1 commit
179
- + Only use GIT_CONFIG in "git config", not other programs
180
-
181
-* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits
182
- + Eliminate an unnecessary chdir("..")
183
- + Add support for GIT_CEILING_DIRECTORIES
184
- + Fold test-absolute-path into test-path-utils
185
- + Implement normalize_absolute_path
186
-
187
-* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits
188
- + rerere.autoupdate
189
- + t4200: fix rerere test
190
- + rerere: remove dubious "tail_optimization"
191
- + git-rerere: detect unparsable conflicts
192
- + rerere: rerere_created_at() and has_resolution() abstraction
188
+* js/apply-root (Sun Jul 6 18:36:01 2008 -0700) 3 commits
189
+ + git-apply --directory: make --root more similar to GNU diff
190
+ + apply --root: thinkofix.
191
+ + Teach "git apply" to prepend a prefix with "--root=<root>"
192
194
-A new configuration will allow paths that have been resolved cleanly by
195
-rerere to be updated in the index automatically.
193
+* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits
194
+ + Make default expiration period of reflog used for stash infinite
195
+ + Per-ref reflog expiry configuration
196
197
-* js/maint-daemon-syslog (Thu Jul 3 16:27:24 2008 +0100) 1 commit
198
- + git daemon: avoid calling syslog() from a signal handler
197
+As 1.6.0 will be a good time to make backward incompatible changes, the
198
+tip commit makes the default expiry period of stash 'never', unless you
199
+configure them to expire explicitly using gc.refs/stash.* variables.
200
+Needs consensus, but I am guessing that enough people would want stash
201
+that does not expire.
202
200
-Meant for 'maint' as well.
203
+* jk/pager-config (Thu Jul 3 07:46:57 2008 -0400) 1 commit
204
+ + Allow per-command pager config
205
206
----------------------------------------------------------------
207
[On Hold]
@@ -206,11 +210,9 @@ Meant for 'maint' as well.
210
+ merge: remove deprecated summary and diffstat options and config
211
variables
212
209
-This was previously in "will be in master soon" category, but it turns =
210
-out
213
+This was previously in "will be in master soon" category, but it turns out
214
that the synonyms to the ones this one deletes are fairly new invention
212
-that happend in 1.5.6 timeframe, and we cannot do this just yet. Perha=
213
-ps
215
+that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps
216
in 1.7.0.
217
218
* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits
@@ -225,41 +227,28 @@ timeframe.
227
- diff: enable "too large a rename" warning when -M/-C is explicitly
228
asked for
229
228
-This would be the right thing to do for command line use, but gitk will=
229
- be
230
+This would be the right thing to do for command line use, but gitk will be
231
hit due to tcl/tk's limitation, so I am holding this back for now.
232
233
----------------------------------------------------------------
234
[Stalled/Needs more work]
235
236
+* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits
237
+ . Migrate git-am to use git-sequencer
238
+ . Add git-sequencer test suite (t3350)
239
+ . Add git-sequencer prototype documentation
240
+ . Add git-sequencer shell prototype
241
+
242
* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit
243
- [BROKEN wrt shallow clones] Ignore graft during object transfer
244
245
Cloning or fetching from a repository from grafts did not send objects
239
-that are hidden by grafts, but the commits in the resulting repository =
240
-do
246
+that are hidden by grafts, but the commits in the resulting repository do
247
need these to pass fsck. This fixes object transfer to ignore grafts.
248
249
Another fix is needed to git-prune so that it ignores grafts but treats
250
commits that are mentioned in grafts as reachable.
251
246
-* ph/parseopt-step-blame (Tue Jun 24 11:12:12 2008 +0200) 7 commits
247
- - Migrate git-blame to parse-option partially.
248
- + parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.
249
- + parse-opt: fake short strings for callers to believe in.
250
- + parse-opt: do not print errors on unknown options, return -2
251
- intead.
252
- + parse-opt: create parse_options_step.
253
- + parse-opt: Export a non NORETURN usage dumper.
254
- + parse-opt: have parse_options_{start,end}.
255
-
256
-I recall Pierre said something about cleaning up the last one when he
257
-finds time, but other than that vague recollection, I lost track of thi=
258
-s
259
-series. I am tempted to fork a few topics off of the pen=C3=BAltimo on=
260
-e to
261
-convert a few more commands as examples and merge the result to 'next'.
262
-
252
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits
253
- blame: show "previous" information in --porcelain/--incremental
254
format
@@ -270,16 +259,12 @@ convert a few more commands as examples and merge the result to 'next'.
259
+ rev-list --children
260
+ revision traversal: --children option
261
273
-The blame that finds where each line in the original lines moved to. T=
274
-his
275
-may help a GSoC project that wants to gather statistical overview of th=
276
-e
277
-history. The final presentation may need tweaking (see the log message=
278
- of
262
+The blame that finds where each line in the original lines moved to. This
263
+may help a GSoC project that wants to gather statistical overview of the
264
+history. The final presentation may need tweaking (see the log message of
265
the commit ""git-blame --reverse" on the series).
266
267
The tip two commits are for peeling to see what's behind the blamed
282
-commit, which we should be able to separate out into an independent top=
283
-ic
268
+commit, which we should be able to separate out into an independent topic
269
from the rest.
270