What's cooking (2012/07 #07)
Junio C Hamano committed
Jul 23, 2012 at 22:09 UTC
4058b834e74da15ed61f077e8d5247b417738de4
1 file changed
+160
-186
whats-cooking.txt
+160
-186
@@ -1,17 +1,18 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jul 2012, #06; Sun, 22)
3
-X-master-at: e7719469154fc9bbf910df89b80a5145c7d93959
4
-X-next-at: 70d4bc158cb1d6d848984267f267177390e71989
2
+Subject: What's cooking in git.git (Jul 2012, #07; Mon, 23)
3
+X-master-at: ccc1188fa34cd9519185a22b13599256ccfac7e1
4
+X-next-at: ef256fcf12b3e3fdb5f9a5b3185d9727e9415afa
5
6
-What's cooking in git.git (Jul 2012, #06; Sun, 22)
6
+What's cooking in git.git (Jul 2012, #07; Mon, 23)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
11
12
-I think we are more or less done for this cycle except for a handful
13
-of topics that are to be rerolled, even though I haven't tagged the
14
-tip of the 'master' with 1.7.12-rc0 yet.
12
+The tip of 'master' has been tagged as 1.7.12-rc0; this deliberately
13
+contains a few topics that have been in 'next' only for a few days,
14
+so please make sure to spot any possible issues and report soonish
15
+to avoid regressions in the upcoming release.
16
17
You can find the changes described here in the integration branches of the
18
repositories listed at
@@ -21,124 +22,6 @@ repositories listed at
22
--------------------------------------------------
23
[Graduated to "master"]
24
24
-* as/t4012-style-updates (2012-07-16) 8 commits
25
- (merged to 'next' on 2012-07-16 at 86c14f6)
26
- + t4012: Use test_must_fail instead of if-else
27
- + t4012: use 'printf' instead of 'dd' to generate a binary file
28
- + t4012: Re-indent test snippets
29
- + t4012: Make --shortstat test more robust
30
- + t4012: Break up pipe into serial redirections
31
- + t4012: Actually quote the sed script
32
- + t4012: Unquote git command fragment in test title
33
- + t4012: modernize style for quoting
34
-
35
-* jc/maint-filter-branch-epoch-date (2012-07-12) 3 commits
36
- (merged to 'next' on 2012-07-13 at d144342)
37
- + t7003: add test to filter a branch with a commit at epoch
38
- + date.c: Fix off by one error in object-header date parsing
39
- (merged to 'next' on 2012-07-10 at f9774ca)
40
- + filter-branch: do not forget the '@' prefix to force git-timestamp
41
-
42
-In 1.7.9 era, we taught "git rebase" about the raw timestamp format
43
-but we did not teach the same trick to "filter-branch", which rolled
44
-a similar logic on its own.
45
-
46
-* jc/sha1-name-more (2012-07-13) 27 commits
47
- (merged to 'next' on 2012-07-13 at 534e6fe)
48
- + t1512: match the "other" object names
49
- (merged to 'next' on 2012-07-11 at d30ef51)
50
- + t1512: ignore whitespaces in wc -l output
51
- (merged to 'next' on 2012-07-10 at 669dd92)
52
- + rev-parse --disambiguate=<prefix>
53
- + rev-parse: A and B in "rev-parse A..B" refer to committish
54
- + reset: the command takes committish
55
- + commit-tree: the command wants a tree and commits
56
- + apply: --build-fake-ancestor expects blobs
57
- + sha1_name.c: add support for disambiguating other types
58
- + revision.c: the "log" family, except for "show", takes committish
59
- + revision.c: allow handle_revision_arg() to take other flags
60
- + sha1_name.c: introduce get_sha1_committish()
61
- + sha1_name.c: teach lookup context to get_sha1_with_context()
62
- + sha1_name.c: many short names can only be committish
63
- + sha1_name.c: get_sha1_1() takes lookup flags
64
- + sha1_name.c: get_describe_name() by definition groks only commits
65
- + sha1_name.c: teach get_short_sha1() a commit-only option
66
- + sha1_name.c: allow get_short_sha1() to take other flags
67
- + get_sha1(): fix error status regression
68
- + sha1_name.c: restructure disambiguation of short names
69
- + sha1_name.c: correct misnamed "canonical" and "res"
70
- + sha1_name.c: refactor find_short_packed_object()
71
- + sha1_name.c: rename "now" to "current"
72
- + sha1_name.c: clarify what "fake" is for in find_short_object_filename()
73
- + sha1_name.c: get rid of get_sha1_with_mode()
74
- + sha1_name.c: get rid of get_sha1_with_mode_1()
75
- + sha1_name.c: hide get_sha1_with_context_1() ugliness
76
- + sha1_name.c: indentation fix
77
-
78
-Logic to disambiguate abbreviated object names have been taught to
79
-take advantage of object types that are expected in the context,
80
-e.g. XXXXXX in the "git describe" output v1.2.3-gXXXXXX must be a
81
-commit object, not a blob nor a tree. This will help us prolong the
82
-lifetime of abbreviated object names.
83
-
84
-* jk/revision-walk-stop-at-max-count (2012-07-13) 1 commit
85
- (merged to 'next' on 2012-07-16 at 603975d)
86
- + revision: avoid work after --max-count is reached
87
-
88
-"git log -n 1 -- rarely-touched-path" was spending unnecessary
89
-cycles after showing the first change to find the next one, only to
90
-discard it.
91
-
92
-* jl/maint-1.7.10-recurse-submodules-with-symlink (2012-07-12) 1 commit
93
- (merged to 'next' on 2012-07-16 at 2e10caf)
94
- + submodules: don't stumble over symbolic links when cloning recursively
95
-
96
-When "git submodule add" clones a submodule repository, it can get
97
-confused where to store the resulting submodule repository in the
98
-superproject's .git/ directory when there is a symbolic link in the
99
-path to the current directory.
100
-
101
-* lk/more-helpful-status-hints (2012-07-16) 1 commit
102
- (merged to 'next' on 2012-07-16 at 8f9b3cc)
103
- + status: color in-progress message like other header messages
104
-
105
-Finishing touches.
106
-
107
-* mm/config-xdg (2012-07-16) 1 commit
108
- (merged to 'next' on 2012-07-16 at 1a75d75)
109
- + config: fix several access(NULL) calls
110
-
111
-Finishing touches.
112
-
113
-* ms/daemon-doc-typo (2012-07-16) 1 commit
114
- (merged to 'next' on 2012-07-16 at 3976434)
115
- + Documentation/git-daemon: add missing word
116
-
117
-* pg/maint-1.7.9-am-where-is-patch (2012-07-13) 1 commit
118
- (merged to 'next' on 2012-07-16 at 32f1e30)
119
- + am: indicate where a failed patch is to be found
120
-
121
-When "git am" failed, old timers knew to check .git/rebase-apply/patch
122
-to see what went wrong, but we never told the users about it.
123
-
124
---------------------------------------------------
125
-[New Topics]
126
-
127
-* mm/mediawiki-usability (2012-07-17) 10 commits
128
- (merged to 'next' on 2012-07-22 at fe66a95)
129
- + git-remote-mediawiki: allow page names with a ':'
130
- + git-remote-mediawiki: fix incorrect test usage in test
131
- + git-remote-mediawiki: properly deal with invalid remote revisions
132
- + git-remote-mediawiki: show progress information when getting last remote revision
133
- + git-remote-mediawiki: show progress information when listing pages
134
- + git-remote-mediawiki: use --force when adding notes
135
- + git-remote-mediawiki: get rid of O(N^2) loop
136
- + git-remote-mediawiki: make mediafiles export optional
137
- + git-remote-mediawiki: actually send empty comment when they're empty
138
- + git-remote-mediawiki: don't split namespaces with spaces
139
-
140
-Will merge to 'master'.
141
-
25
* jk/mediawiki-credential (2012-07-18) 4 commits
26
(merged to 'next' on 2012-07-22 at 2cb99b2)
27
+ mw-to-git: use git-credential's URL parser
@@ -146,7 +29,22 @@ Will merge to 'master'.
29
+ mw-to-git: check blank credential attributes via length
30
+ docs/credential: minor clarity fixups
31
149
-Will merge to 'master'.
32
+Mediawiki importer updates.
33
+
34
+* jn/block-sha1 (2012-07-23) 3 commits
35
+ (merged to 'next' on 2012-07-23 at a11a08b)
36
+ + Makefile: BLK_SHA1 does not require fast htonl() and unaligned loads
37
+ + block-sha1: put expanded macro parameters in parentheses
38
+ + block-sha1: avoid pointer conversion that violates alignment constraints
39
+
40
+The code to load a word one-byte-at-a-time was optimized into a
41
+word-wide load instruction even when the pointer was not aligned,
42
+which caused issues on architectures that do not like unaligned
43
+access.
44
+
45
+* jn/make-assembly-in-right-directory (2012-07-22) 1 commit
46
+ (merged to 'next' on 2012-07-23 at 3c155cc)
47
+ + Makefile: fix location of listing produced by "make subdir/foo.s"
48
49
* jv/maint-no-ext-diff (2012-07-19) 2 commits
50
(merged to 'next' on 2012-07-22 at eefcf45)
@@ -156,8 +54,6 @@ Will merge to 'master'.
54
"git diff --no-ext-diff" did not output anything for a typechange
55
filepair when GIT_EXTERNAL_DIFF is in effect.
56
159
-Will merge to 'master'.
160
-
57
* kk/maint-1.7.9-commit-tree (2012-07-17) 1 commit
58
+ commit-tree: resurrect command line parsing updates
59
(this branch is used by kk/maint-commit-tree.)
@@ -172,57 +68,144 @@ was introduced long time ago, but we accidentally broke it in the
68
+ Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-tree
69
(this branch uses kk/maint-1.7.9-commit-tree.)
70
175
-Will merge to 'master'.
71
+The same as above, for merging to the upcoming release.
72
177
-* mz/rebase-range (2012-07-18) 7 commits
178
- - rebase (without -p): correctly calculate patches to rebase
179
- - rebase -p: don't request --left-right only to ignore left side
180
- - rebase -p: use --cherry-mark for todo file
181
- - git-rebase--interactive.sh: look up subject in add_pick_line
182
- - git-rebase--interactive: group all $preserve_merges code
183
- - git-rebase--interactive.sh: extract function for adding "pick" line
184
- - git-rebase--am.sh: avoid special-casing --keep-empty
73
+* mm/mediawiki-usability (2012-07-17) 10 commits
74
+ (merged to 'next' on 2012-07-22 at fe66a95)
75
+ + git-remote-mediawiki: allow page names with a ':'
76
+ + git-remote-mediawiki: fix incorrect test usage in test
77
+ + git-remote-mediawiki: properly deal with invalid remote revisions
78
+ + git-remote-mediawiki: show progress information when getting last remote revision
79
+ + git-remote-mediawiki: show progress information when listing pages
80
+ + git-remote-mediawiki: use --force when adding notes
81
+ + git-remote-mediawiki: get rid of O(N^2) loop
82
+ + git-remote-mediawiki: make mediafiles export optional
83
+ + git-remote-mediawiki: actually send empty comment when they're empty
84
+ + git-remote-mediawiki: don't split namespaces with spaces
85
+
86
+Mediawiki importer updates.
87
+
88
+* nk/maint-gitweb-log-by-lines (2012-07-05) 3 commits
89
+ (merged to 'next' on 2012-07-13 at 780e16a)
90
+ + gitweb: Add support to Link: tag
91
+ + gitweb: Handle other types of tag in git_print_log
92
+ + gitweb: Cleanup git_print_log()
93
+
94
+Teach gitweb to pay attention to various forms of credits that are
95
+similar to "Signed-off-by:" lines.
96
+
97
+Needs to be eyeballed for the correctness of the esc_html() in the tip one.
98
99
* sl/autoconf (2012-07-19) 7 commits
187
- - build: reconfigure automatically if configure.ac changes
188
- - build: "make clean" should not remove configure-generated files
189
- - autoconf: use AC_CONFIG_COMMANDS instead of ad-hoc 'config.mak.append'
190
- - autoconf: remove few redundant semicolons
191
- - autoconf: remove some redundant shell indirections
192
- - autoconf: GIT_CONF_APPEND_LINE -> GIT_CONF_SUBST
193
- - autoconf: GIT_CONF_APPEND_LINE: change signature
100
+ (merged to 'next' on 2012-07-23 at dc94990)
101
+ + build: reconfigure automatically if configure.ac changes
102
+ + build: "make clean" should not remove configure-generated files
103
+ + autoconf: use AC_CONFIG_COMMANDS instead of ad-hoc 'config.mak.append'
104
+ + autoconf: remove few redundant semicolons
105
+ + autoconf: remove some redundant shell indirections
106
+ + autoconf: GIT_CONF_APPEND_LINE -> GIT_CONF_SUBST
107
+ + autoconf: GIT_CONF_APPEND_LINE: change signature
108
195
-Will merge to 'next'.
109
+* sn/doc-typofix (2012-07-14) 1 commit
110
+ (merged to 'next' on 2012-07-22 at 168bba9)
111
+ + doc: A few minor copy edits.
112
197
-* jx/i18n-1.7.11 (2012-07-22) 7 commits
198
- - i18n: merge-recursive: mark strings for translation
199
- - Remove unused and bad gettext block from git-am
200
- - i18n: am: mark more strings for translation
201
- - Remove obsolete LONG_USAGE which breaks xgettext
202
- - i18n: Rewrite gettext messages start with dash
203
- - i18n: rebase: mark strings for translation
204
- - i18n: New keywords for xgettext extraction from sh
113
+* tg/ce-namelen-field (2012-07-11) 2 commits
114
+ (merged to 'next' on 2012-07-22 at 2d85b05)
115
+ + Strip namelen out of ce_flags into a ce_namelen field
116
+ + Merge branch 'tg/maint-cache-name-compare' into tg/ce-namelen-field
117
+
118
+Split lower bits of ce_flags field and creates a new ce_namelen
119
+field in the in-core index structure.
120
121
* th/difftool-diffall (2012-07-19) 1 commit
207
- - difftool: only copy back files modified during directory diff
122
+ (merged to 'next' on 2012-07-23 at db62371)
123
+ + difftool: only copy back files modified during directory diff
124
+ (this branch is used by da/difftool-updates.)
125
209
-Will merge to 'next'.
126
+Finishing touches to "difftool --dir-diff".
127
+
128
+--------------------------------------------------
129
+[New Topics]
130
+
131
+* da/difftool-updates (2012-07-23) 5 commits
132
+ (merged to 'next' on 2012-07-23 at 96528a7)
133
+ + difftool: Use symlinks when diffing against the worktree
134
+ + difftool: Call the temp directory "git-difftool"
135
+ + difftool: Move option values into a hash
136
+ + difftool: Eliminate global variables
137
+ + difftool: Simplify print_tool_help()
138
+
139
+"git difftool --dir-diff" learned to use symbolic links to prepare
140
+temporary copy of the working tree when available.
141
+
142
+Will merge to 'master'.
143
+
144
+* jc/mergetool-tool-help (2012-07-23) 1 commit
145
+ (merged to 'next' on 2012-07-23 at ef256fc)
146
+ + mergetool: support --tool-help option like difftool does
147
+
148
+"git mergetool" did not support --tool-help option to give the list
149
+of supported backends, like "git difftool" does.
150
+
151
+Will merge to 'master'.
152
+
153
+* jk/maint-advise-vaddf (2012-07-23) 1 commit
154
+ (merged to 'next' on 2012-07-23 at 5b13a77)
155
+ + advice: pass varargs to strbuf_vaddf, not strbuf_addf
156
+ (this branch is used by jk/maint-commit-abandoned-message.)
157
+
158
+The advise() function did not use varargs correctly to format
159
+its message.
160
+
161
+Will merge to 'master' and soon to 'maint'.
162
+
163
+* jk/maint-commit-abandoned-message (2012-07-23) 2 commits
164
+ - commit: give a hint when a commit message has been abandoned
165
+ - Merge commit 'b2eda9b' into jk/maint-commit-abandoned-message
166
+ (this branch uses jk/maint-advise-vaddf.)
167
+
168
+Will drop.
169
+
170
+* jk/maint-commit-check-committer-early (2012-07-23) 1 commit
171
+ (merged to 'next' on 2012-07-23 at a2c7133)
172
+ + commit: check committer identity more strictly
173
+
174
+"git commit --amend" let the user edit the log message and then died
175
+when the human-readable committer name was given insufficiently by
176
+getpwent(3).
177
+
178
+Will merge to 'master' and soon to 'maint'.
179
+
180
+* jk/maint-commit-document-editmsg (2012-07-23) 1 commit
181
+ (merged to 'next' on 2012-07-23 at 06307fb)
182
+ + commit: document the temporary commit message file
183
+
184
+Document $GIT_DIR/COMMIT_EDITMSG file.
185
+
186
+Will merge to 'master' and soon to 'maint'.
187
188
--------------------------------------------------
189
[Stalled]
190
191
+* mz/rebase-range (2012-07-18) 7 commits
192
+ - rebase (without -p): correctly calculate patches to rebase
193
+ - rebase -p: don't request --left-right only to ignore left side
194
+ - rebase -p: use --cherry-mark for todo file
195
+ - git-rebase--interactive.sh: look up subject in add_pick_line
196
+ - git-rebase--interactive: group all $preserve_merges code
197
+ - git-rebase--interactive.sh: extract function for adding "pick" line
198
+ - git-rebase--am.sh: avoid special-casing --keep-empty
199
+
200
+Performance concerns from Windows folks. Also the series lacks
201
+proper sign-offs.
202
+
203
* jl/submodule-rm (2012-07-05) 2 commits
204
- rm: remove submodules from the index and the .gitmodules file
205
- rm: don't fail when removing populated submodules
206
207
Expecting a reroll.
208
220
-* mh/maint-revisions-doc (2012-07-05) 2 commits
221
- - Document rev^! and rev^@ as revision specifiers
222
- - Make <refname> documentation more consistent.
223
-
224
-Expecting a reroll of the tip one.
225
-
209
* ph/stash-rerere (2012-07-08) 2 commits
210
- stash: invoke rerere in case of conflict
211
- test: git-stash conflict sets up rerere
@@ -240,17 +223,6 @@ sense" heuristics "git mailinfo" already uses.
223
A draft from Linus received privately without a log message.
224
Expecting a reroll.
225
243
-* nk/maint-gitweb-log-by-lines (2012-07-05) 3 commits
244
- (merged to 'next' on 2012-07-13 at 780e16a)
245
- + gitweb: Add support to Link: tag
246
- + gitweb: Handle other types of tag in git_print_log
247
- + gitweb: Cleanup git_print_log()
248
-
249
-Teach gitweb to pay attention to various forms of credits that are
250
-similar to "Signed-off-by:" lines.
251
-
252
-Needs to be eyeballed for the correctness of the esc_html() in the tip one.
253
-
226
* jc/test-lib-source-build-options-early (2012-06-24) 1 commit
227
- test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier
228
@@ -320,24 +292,26 @@ not working :-(.
292
--------------------------------------------------
293
[Cooking]
294
323
-* sn/doc-typofix (2012-07-14) 1 commit
324
- (merged to 'next' on 2012-07-22 at 168bba9)
325
- + doc: A few minor copy edits.
326
-
327
-Will merge to 'master'.
328
-
329
-* tg/ce-namelen-field (2012-07-11) 2 commits
330
- (merged to 'next' on 2012-07-22 at 2d85b05)
331
- + Strip namelen out of ce_flags into a ce_namelen field
332
- + Merge branch 'tg/maint-cache-name-compare' into tg/ce-namelen-field
295
+* mh/maint-revisions-doc (2012-07-23) 3 commits
296
+ - fixup-amend: Enumerate revision range specifiers in the documentation
297
+ - Document rev^! and rev^@ as revision specifiers
298
+ - Make <refname> documentation more consistent.
299
334
-Split lower bits of ce_flags field and creates a new ce_namelen
335
-field in the in-core index structure.
300
+Getting tired of waiting, so I rewrote the tip one.
301
+Waiting for some feedback.
302
337
-Will merge to 'master'.
303
+* jx/i18n-1.7.11 (2012-07-22) 7 commits
304
+ - i18n: merge-recursive: mark strings for translation
305
+ - Remove unused and bad gettext block from git-am
306
+ - i18n: am: mark more strings for translation
307
+ - Remove obsolete LONG_USAGE which breaks xgettext
308
+ - i18n: Rewrite gettext messages start with dash
309
+ - i18n: rebase: mark strings for translation
310
+ - i18n: New keywords for xgettext extraction from sh
311
312
* jk/no-more-pre-exec-callback (2012-06-05) 1 commit
340
- - pager: drop "wait for output to run less" hack
313
+ (merged to 'next' on 2012-07-23 at fe59cb6)
314
+ + pager: drop "wait for output to run less" hack
315
316
Will defer for 6 months until ancient "less" goes extinct.
317