What's cooking (2012/04 #09)
Junio C Hamano committed
Apr 23, 2012 at 15:03 UTC
b47529bd751fafc191f94511441b428f486e1e15
1 file changed
+221
-247
whats-cooking.txt
+221
-247
@@ -1,15 +1,15 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2012, #08; Fri, 20)
3
-X-master-at: d1ca788fcd34962a65924843ef1d0c773d565030
4
-X-next-at: 4eb253494767b9ede34703bfb1ceadefbc7924ed
2
+Subject: What's cooking in git.git (Apr 2012, #09; Mon, 23)
3
+X-master-at: aa39b858a35d99135e1403575a358b97d26ff466
4
+X-next-at: 8de07476bf9d007657eaa0b87f26678540e92092
5
6
-What's cooking in git.git (Apr 2012, #08; Fri, 20)
6
+What's cooking in git.git (Apr 2012, #09; 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
-The third batch of topics in this cycle is now in 'master'.
12
+The fourth batch of topics in this cycle is now in 'master'.
13
14
You can find the changes described here in the integration branches of the
15
repositories listed at
@@ -19,90 +19,147 @@ repositories listed at
19
--------------------------------------------------
20
[Graduated to "master"]
21
22
-* bw/submodule-sed-solaris (2012-04-09) 1 commit
23
- (merged to 'next' on 2012-04-12 at 3bf1d83)
24
- + Avoid bug in Solaris xpg4/sed as used in submodule
22
+* bw/test-fix-grep-gnuism (2012-04-19) 1 commit
23
+ (merged to 'next' on 2012-04-20 at ee7eec4)
24
+ + t9400: fix gnuism in grep
25
26
-* ct/advise-push-default (2012-04-12) 3 commits
27
- (merged to 'next' on 2012-04-12 at b0613cd)
28
- + Fix httpd tests that broke when non-ff push advice changed
29
- + clean up struct ref's nonfastforward field
30
- + push: Provide situational hints for non-fast-forward errors
31
- (this branch is used by mm/push-default-switch-warning.)
26
+Fix two places that were the only place in the test suite that gave "a\+"
27
+to platform grep and expected it to mean one or more "a", which is a
28
+blatant GNUism.
29
33
-Breaks down the cases in which "git push" fails due to non-ff into three
34
-categories, and gives separate advise messages. This should be a good
35
-change regardless of mm/push-default-switch-warning topic.
30
+* jc/maint-blame-minimal (2012-04-11) 1 commit
31
+ (merged to 'next' on 2012-04-20 at 2213284)
32
+ + blame: accept --need-minimal
33
37
-* jb/am-include (2012-03-28) 1 commit
38
- (merged to 'next' on 2012-04-12 at ddbf96d)
39
- + am: support --include option
34
+"git blame" started missing quite a few changes from the origin since we
35
+stopped using the diff minimalization by default in v1.7.2 era.
36
41
-"git am" learned the "--include" option, which is an opposite of existing
42
-the "--exclude" option.
37
+* jh/apply-free-patch (2012-04-11) 9 commits
38
+ (merged to 'next' on 2012-04-15 at 8cccf57)
39
+ + apply: document buffer ownership rules across functions
40
+ + apply: tighten constness of line buffer
41
+ + apply: drop unused macro
42
+ + apply: free unused fragments for submodule patch
43
+ + apply: free patch->result
44
+ + apply: release memory for fn_table
45
+ + apply: free patch->{def,old,new}_name fields
46
+ + apply: rename free_patch() to free_patch_list()
47
+ + apply: do not leak patches and fragments
48
44
-* jc/am-report-3way (2012-03-28) 1 commit
45
- (merged to 'next' on 2012-04-12 at cf5d599)
46
- + am -3: list the paths that needed 3-way fallback
49
+Valgrind reports quite a lot of discarded memory inside apply.
50
48
-When "git am -3" needs to fall back to an application to a synthesized
49
-preimage followed by a 3-way merge, the paths that needed such treatment
50
-are now reported to the end user, so that the result in them can be
51
-eyeballed with extra care.
51
+* jk/rebase-i-submodule-conflict-only (2012-04-09) 1 commit
52
+ (merged to 'next' on 2012-04-15 at 94367a8)
53
+ + rebase -i continue: don't skip commits that only change submodules
54
53
-* jc/fmt-merge-msg-people (2012-03-13) 1 commit
54
- (merged to 'next' on 2012-04-12 at 4c2031c)
55
- + fmt-merge-msg: show those involved in a merged series
55
+Giving "--continue" to a conflicted "rebase -i" session skipped a commit
56
+that only results in changes to submodules.
57
57
-The "fmt-merge-msg" command learns to list the primary contributors
58
-involved in the side topic you are merging.
58
+* jl/maint-submodule-recurse-fetch (2012-04-14) 1 commit
59
+ (merged to 'next' on 2012-04-20 at 2769d39)
60
+ + submodules: recursive fetch also checks new tags for submodule commits
61
60
-* jc/push-upstream-sanity (2012-04-05) 1 commit
61
- (merged to 'next' on 2012-04-12 at 288e1ad)
62
- + push: error out when the "upstream" semantics does not make sense
63
- (this branch is used by mm/push-default-switch-warning.)
62
+* jn/debian-customizes-default-editor (2012-04-10) 2 commits
63
+ (merged to 'next' on 2012-04-15 at 0fc85c3)
64
+ + var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings
65
+ + var doc: default editor and pager are configurable at build time
66
+
67
+* jn/fast-import-doc (2012-04-15) 1 commit
68
+ (merged to 'next' on 2012-04-20 at b9a7250)
69
+ + fast-import doc: cat-blob and ls responses need to be consumed quickly
70
+
71
+* jn/more-i18ncmp (2012-04-14) 3 commits
72
+ (merged to 'next' on 2012-04-20 at b5548a3)
73
+ + test: am of empty patch should not succeed
74
+ + test: use test_i18ncmp for "Patch format detection failed" message
75
+ + test: do not rely on US English tracking-info messages
76
+
77
+* lp/maint-diff-three-dash-with-graph (2012-03-20) 3 commits
78
+ (merged to 'next' on 2012-04-20 at b6cf0ff)
79
+ + t4202: add test for "log --graph --stat -p" separator lines
80
+ + log --graph: fix break in graph lines
81
+ + log --graph --stat: three-dash separator should come after graph lines
82
+
83
+* ms/remote-usage-string (2012-04-09) 1 commit
84
+ (merged to 'next' on 2012-04-15 at 704be8f)
85
+ + remote: update builtin usage
86
+
87
+As an independent follow-up, we may want to rethink how the overall usage
88
+string and subcommand usage strings are maintained.
89
+
90
+* pw/git-p4 (2012-04-09) 3 commits
91
+ (merged to 'next' on 2012-04-15 at 81ea41a)
92
+ + git p4: use "git p4" directly in tests
93
+ + git p4: update name in script
94
+ + git-p4: move to toplevel
95
+ (this branch is used by ld/git-p4-tags-and-labels.)
96
+
97
+* rj/mingw-isguid (2012-04-18) 1 commit
98
+ (merged to 'next' on 2012-04-20 at 9dbebca)
99
+ + compat/mingw.h: Set S_ISUID to prevent a fast-import test failure
100
65
-Fix broken 'push to upstream' implementation. "git push $there" without
66
-refspec, when the current branch is set to push to a remote different from
67
-$there, used to push to $there using the upstream information to a remote
68
-unreleated to $there.
101
+* rj/sh-setup-mswin-pwd (2012-04-18) 1 commit
102
+ (merged to 'next' on 2012-04-20 at 6125f8d)
103
+ + git-sh-setup.sh: Add an pwd() function for MinGW
104
70
-* jk/run-command-eacces (2012-04-05) 2 commits
71
- (merged to 'next' on 2012-04-12 at ef3782e)
72
- + run-command: treat inaccessible directories as ENOENT
73
- + compat/mingw.[ch]: Change return type of exec functions to int
105
+* rj/submodule-mswin-path (2012-04-18) 1 commit
106
+ (merged to 'next' on 2012-04-20 at fd9f8b3)
107
+ + git-submodule.sh: Don't use $path variable in eval_gettext string
108
75
-When PATH contains an unreadable directory, alias expansion code did not
76
-kick in, and failed with an error that said "git-subcmd" was not found.
109
+* rl/show-empty-prefix (2012-04-10) 1 commit
110
+ (merged to 'next' on 2012-04-15 at b2e5938)
111
+ + rev-parse --show-prefix: add in trailing newline
112
78
-* js/spawn-via-shell-path-fix (2012-04-17) 1 commit
79
- (merged to 'next' on 2012-04-19 at 3e04ef6)
80
- + Do not use SHELL_PATH from build system in prepare_shell_cmd on Windows
113
+* rs/commit-list-sort-in-batch (2012-04-17) 4 commits
114
+ (merged to 'next' on 2012-04-17 at 21208e9)
115
+ + mergesort: rename it to llist_mergesort()
116
+ (merged to 'next' on 2012-04-15 at 39fe527)
117
+ + revision: insert unsorted, then sort in prepare_revision_walk()
118
+ + commit: use mergesort() in commit_list_sort_by_date()
119
+ + add mergesort() for linked lists
120
82
-Mops up an unfortunate fallout from bw/spawn-via-shell-path topic.
121
+* sl/test-wc-l-line-count (2012-04-11) 1 commit
122
+ (merged to 'next' on 2012-04-15 at 40797d9)
123
+ + tests: modernise style: more uses of test_line_count
124
125
--------------------------------------------------
126
[New Topics]
127
87
-* bw/test-fix-grep-gnuism (2012-04-19) 1 commit
88
- (merged to 'next' on 2012-04-20 at ee7eec4)
89
- + t9400: fix gnuism in grep
128
+* cc/fix-missing-va-end-in-revert (2012-04-21) 1 commit
129
+ (merged to 'next' on 2012-04-23 at b90eb70)
130
+ + revert: add missing va_end
131
91
-Fix two places that were the only place in the test suite that gave "a\+"
92
-to platform grep and expected it to mean one or more "a", which is a
93
-blatant GNUism.
132
+Will merge to 'master'.
133
95
-* rt/cherry-revert-conflict-summary (2012-04-19) 1 commit
96
- - sequencer: remove additional blank line
134
+* pw/t5800-import-race-fix (2012-04-22) 2 commits
135
+ - fixup! git-remote-testgit: fix race when spawning fast-import
136
+ - git-remote-testgit: fix race when spawning fast-import
137
98
-In the older days, the header "Conflicts:" in "cherry-pick" and
99
-"merge" was separated by a blank line from the list of paths that
100
-follow for readability, but when "merge" was rewritten in C, we lost
101
-it by mistake. Remove the newline from "cherry-pick" to make them
102
-match again.
138
+Will merge to 'next' after squashing the fixup!
139
104
-* js/fast-import-test-9300 (2012-04-20) 1 commit
105
- - t9300-fast-import: avoid 'exit' in test_expect_success snippets
140
+* nd/i18n (2012-04-23) 11 commits
141
+ - i18n: bundle: mark strings for translation
142
+ - i18n: index-pack: mark strings for translation
143
+ - i18n: apply: update say_patch_name to give translators complete sentence
144
+ - i18n: apply: mark strings for translation
145
+ - i18n: remote: mark strings for translation
146
+ - i18n: make warn_dangling_symref() automatically append \n
147
+ - i18n: help: mark strings for translation
148
+ - i18n: mark relative dates for translation
149
+ - fixup! strbuf: convenience format functions with \n automatically appended
150
+ - strbuf: convenience format functions with \n automatically appended
151
+ - Makefile: feed all header files to xgettext
152
+
153
+Will merge to 'next' after squashing the fixup!
154
+We can address the pseudo-underline of section headers in "git help --all"
155
+as a follow-up patch.
156
+
157
+* rk/git-svn-ignore-sigpipe (2012-04-23) 3 commits
158
+ - git-svn: drop redundant blocking of SIGPIPE
159
+ - git-svn: ignore SIGPIPE
160
+ - git-svn: use POSIX::sigprocmask to block signals
161
+
162
+Waiting for an Ack from Eric.
163
164
--------------------------------------------------
165
[Stalled]
@@ -142,53 +199,66 @@ not working :-(.
199
--------------------------------------------------
200
[Cooking]
201
202
+* nh/empty-rebase (2012-04-20) 7 commits
203
+ - fixup! git-rebase: add keep_empty flag
204
+ - git-rebase: add keep_empty flag
205
+ - fixup! git-cherry-pick: Add test to validate new options
206
+ - git-cherry-pick: Add test to validate new options
207
+ - fixup! git-cherry-pick: Add keep-redundant-commits option
208
+ - git-cherry-pick: Add keep-redundant-commits option
209
+ - git-cherry-pick: add allow-empty option
210
+
211
+Will merge to 'next' after squashing the fixup!
212
+
213
+* rt/cherry-revert-conflict-summary (2012-04-19) 1 commit
214
+ (merged to 'next' on 2012-04-23 at e7766c2)
215
+ + sequencer: remove additional blank line
216
+
217
+In the older days, the header "Conflicts:" in "cherry-pick" and
218
+"merge" was separated by a blank line from the list of paths that
219
+follow for readability, but when "merge" was rewritten in C, we lost
220
+it by mistake. Remove the newline from "cherry-pick" to make them
221
+match again.
222
+
223
+Will merge to 'master'.
224
+
225
+* js/fast-import-test-9300 (2012-04-20) 1 commit
226
+ (merged to 'next' on 2012-04-23 at a9bd236)
227
+ + t9300-fast-import: avoid 'exit' in test_expect_success snippets
228
+
229
+Will merge to 'master'.
230
+
231
* jm/maint-strncpy-diff-no-index (2012-04-16) 1 commit
232
(merged to 'next' on 2012-04-20 at 638ed9f)
233
+ diff: avoid stack-buffer-read-overrun for very long name
234
235
+Will merge to 'master'.
236
+
237
* lp/diffstat-with-graph (2012-04-18) 6 commits
150
- - Prevent graph_width of stat width from falling below min
151
- - t4052: Test diff-stat output with minimum columns
152
- - t4052: Adjust --graph --stat output for prefixes
153
- - Adjust stat width calculations to take --graph output into account
154
- - Add output_prefix_length to diff_options
155
- - t4052: test --stat output with --graph
238
+ (merged to 'next' on 2012-04-23 at 8de0747)
239
+ + Prevent graph_width of stat width from falling below min
240
+ + t4052: Test diff-stat output with minimum columns
241
+ + t4052: Adjust --graph --stat output for prefixes
242
+ + Adjust stat width calculations to take --graph output into account
243
+ + Add output_prefix_length to diff_options
244
+ + t4052: test --stat output with --graph
245
246
Looked reasonable.
158
-Will merge to 'next'.
247
+Will merge to 'master'.
248
249
* jc/merge-reduce-parents-early (2012-04-18) 5 commits
161
- - fmt-merge-msg: discard needless merge parents
162
- - builtin/merge.c: reduce parents early
163
- - builtin/merge.c: collect other parents early
164
- - builtin/merge.c: remove "remoteheads" global variable
165
- - merge tests: octopus with redundant parents
166
- (this branch is tangled with lt/octopus-simplify.)
167
-
168
-I based this and Linus's on top of the same test script, but it
169
-turns out that this is more correct way to deal with the issue, so
170
-I'll drop the other one.
250
+ (merged to 'next' on 2012-04-23 at 16e7e53)
251
+ + fmt-merge-msg: discard needless merge parents
252
+ + builtin/merge.c: reduce parents early
253
+ + builtin/merge.c: collect other parents early
254
+ + builtin/merge.c: remove "remoteheads" global variable
255
+ + merge tests: octopus with redundant parents
256
172
-* rj/mingw-isguid (2012-04-18) 1 commit
173
- (merged to 'next' on 2012-04-20 at 9dbebca)
174
- + compat/mingw.h: Set S_ISUID to prevent a fast-import test failure
175
-
176
-* rj/sh-setup-mswin-pwd (2012-04-18) 1 commit
177
- (merged to 'next' on 2012-04-20 at 6125f8d)
178
- + git-sh-setup.sh: Add an pwd() function for MinGW
179
-
180
-* rj/submodule-mswin-path (2012-04-18) 1 commit
181
- (merged to 'next' on 2012-04-20 at fd9f8b3)
182
- + git-submodule.sh: Don't use $path variable in eval_gettext string
183
-
184
-* lp/maint-diff-three-dash-with-graph (2012-03-20) 3 commits
185
- (merged to 'next' on 2012-04-20 at b6cf0ff)
186
- + t4202: add test for "log --graph --stat -p" separator lines
187
- + log --graph: fix break in graph lines
188
- + log --graph --stat: three-dash separator should come after graph lines
257
+Will merge to 'master'.
258
259
* cb/cherry-pick-rev-path-confusion (2012-04-15) 1 commit
191
- - cherry-pick: do not expect file arguments
260
+ (merged to 'next' on 2012-04-23 at f872ba5)
261
+ + cherry-pick: do not expect file arguments
262
263
The command line parser choked "git cherry-pick $name" when $name can be
264
both revision name and a pathname, even though $name can never be a path
@@ -198,42 +268,32 @@ The issue the patch addresses is real, but the way it is implemented felt
268
unnecessarily invasive a bit. It may be cleaner for this caller to add
269
the "--" to the end of the argv_array it passes to setup_revisions().
270
271
+Will merge to 'master'.
272
+
273
* cb/daemon-test-race-fix (2012-04-19) 1 commit
274
- git-daemon wrapper to wait until daemon is ready
275
276
Fix race condition between starting and waiting for git-daemon in the
277
test.
278
207
-Re-queued with a fix.
279
+Will merge to 'next'.
280
281
* cb/maint-report-mount-point-correctly-in-setup (2012-04-15) 1 commit
210
- - properly keep track of current working directory
282
+ (merged to 'next' on 2012-04-23 at 9e0c8b4)
283
+ + properly keep track of current working directory
284
285
The filesystem boundary was not correctly reported when .git directory
286
discovery stopped at a mount point.
287
215
-Will merge to 'next'.
216
-
217
-* jl/maint-submodule-recurse-fetch (2012-04-14) 1 commit
218
- (merged to 'next' on 2012-04-20 at 2769d39)
219
- + submodules: recursive fetch also checks new tags for submodule commits
220
-
221
-* jn/fast-import-doc (2012-04-15) 1 commit
222
- (merged to 'next' on 2012-04-20 at b9a7250)
223
- + fast-import doc: cat-blob and ls responses need to be consumed quickly
224
-
225
-* jn/more-i18ncmp (2012-04-14) 3 commits
226
- (merged to 'next' on 2012-04-20 at b5548a3)
227
- + test: am of empty patch should not succeed
228
- + test: use test_i18ncmp for "Patch format detection failed" message
229
- + test: do not rely on US English tracking-info messages
288
+Will merge to 'master'.
289
290
* rl/maint-stash-i18n-save-error (2012-04-14) 1 commit
232
- - stash: use eval_gettextln correctly
291
+ (merged to 'next' on 2012-04-23 at 3692fec)
292
+ + stash: use eval_gettextln correctly
293
234
-Will merge to 'next'.
294
+Will merge to 'master'.
295
236
-* nd/columns (2012-04-15) 9 commits
296
+* nd/columns (2012-04-20) 9 commits
297
- tag: add --column
298
- column: support piping stdout to external git-column process
299
- status: add --column
@@ -264,6 +324,8 @@ to peek into $ENV{HTTPS_PROXY}.
324
+ fetch: describe new refs based on where it came from
325
+ fetch: Give remote_ref to update_local_ref() as well
326
327
+Will merge to 'master'.
328
+
329
* mh/ref-api (2012-04-10) 13 commits
330
(merged to 'next' on 2012-04-20 at 94e9384)
331
+ do_for_each_ref(): only iterate over the subtree that was requested
@@ -282,12 +344,7 @@ to peek into $ENV{HTTPS_PROXY}.
344
345
Allows walking only a sub-hierarchy in refs/*.
346
285
-* jc/maint-blame-minimal (2012-04-11) 1 commit
286
- (merged to 'next' on 2012-04-20 at 2213284)
287
- + blame: accept --need-minimal
288
-
289
-"git blame" started missing quite a few changes from the origin since we
290
-stopped using the diff minimalization by default in v1.7.2 era.
347
+Will merge to 'master'.
348
349
* jk/repack-no-explode-objects-from-old-pack (2012-04-18) 4 commits
350
(merged to 'next' on 2012-04-20 at 4eb2534)
@@ -301,25 +358,9 @@ stopped using the diff minimalization by default in v1.7.2 era.
358
(merged to 'next' on 2012-04-15 at 1b1e9a1)
359
+ git p4: import/export of labels to/from p4
360
+ git p4: Fixing script editor checks
304
- (this branch uses pw/git-p4.)
361
306
-A review from Pete Wyckoff needs to be addressed.
307
-Message-ID: <20120418113422.GB19994@padd.com>
308
-
309
-* nh/empty-rebase (2012-04-20) 7 commits
310
- - fixup! git-rebase: add keep_empty flag
311
- - git-rebase: add keep_empty flag
312
- - fixup! git-cherry-pick: Add test to validate new options
313
- - git-cherry-pick: Add test to validate new options
314
- - fixup! git-cherry-pick: Add keep-redundant-commits option
315
- - git-cherry-pick: Add keep-redundant-commits option
316
- - git-cherry-pick: add allow-empty option
317
-
318
-* sl/test-wc-l-line-count (2012-04-11) 1 commit
319
- (merged to 'next' on 2012-04-15 at 40797d9)
320
- + tests: modernise style: more uses of test_line_count
321
-
322
-Will merge to 'master'.
362
+Waiting for a follow-up to address the review comments
363
+by Pete Wyckoff Message-ID: <20120418113422.GB19994@padd.com>
364
365
* zj/upstream-error-message (2012-04-15) 5 commits
366
(merged to 'next' on 2012-04-20 at 1ed9682)
@@ -329,30 +370,19 @@ Will merge to 'master'.
370
+ Provide branch name in error message when using @{u}
371
+ t1507: add tests to document @{upstream} behaviour
372
332
-* fc/completion-tests (2012-04-18) 7 commits
333
- - tests: add tests for the __gitcomp() completion helper function
334
- - completion: fix completion after 'git --option <TAB>'
335
- - completion: avoid trailing space for --exec-path
336
- - completion: add missing general options
337
- - completion: simplify by using $prev
338
- - completion: simplify __gitcomp_1
339
- - tests: add initial bash completion tests
373
+Will merge to 'master'.
374
341
-Will merge to 'next'.
375
+* fc/completion-tests (2012-04-21) 7 commits
376
+ (merged to 'next' on 2012-04-23 at 9b42326)
377
+ + completion: fix completion after 'git --option <TAB>'
378
+ + completion: avoid trailing space for --exec-path
379
+ + completion: add missing general options
380
+ + completion: simplify by using $prev
381
+ + completion: simplify __gitcomp_1
382
+ + tests: add tests for the __gitcomp() completion helper function
383
+ + tests: add initial bash completion tests
384
343
-* jh/apply-free-patch (2012-04-11) 9 commits
344
- (merged to 'next' on 2012-04-15 at 8cccf57)
345
- + apply: document buffer ownership rules across functions
346
- + apply: tighten constness of line buffer
347
- + apply: drop unused macro
348
- + apply: free unused fragments for submodule patch
349
- + apply: free patch->result
350
- + apply: release memory for fn_table
351
- + apply: free patch->{def,old,new}_name fields
352
- + apply: rename free_patch() to free_patch_list()
353
- + apply: do not leak patches and fragments
354
-
355
-Valgrind reports quite a lot of discarded memory inside apply.
385
+Will merge to 'master'.
386
387
* nd/threaded-index-pack (2012-04-19) 4 commits
388
- index-pack: disable threading if NO_PREAD is defined
@@ -361,51 +391,21 @@ Valgrind reports quite a lot of discarded memory inside apply.
391
- compat/win32/pthread.h: Add an pthread_key_delete() implementation
392
393
* cb/http-multi-curl-auth (2012-04-14) 4 commits
364
- - http: use newer curl options for setting credentials
365
- - http: clean up leak in init_curl_http_auth
366
- - fix http auth with multiple curl handles
367
- - http auth fails with multiple curl handles
394
+ (merged to 'next' on 2012-04-23 at b0259be)
395
+ + http: use newer curl options for setting credentials
396
+ + http: clean up leak in init_curl_http_auth
397
+ + fix http auth with multiple curl handles
398
+ + http auth fails with multiple curl handles
399
400
Fixes http authentication breakage when we keep multiple HTTP requests in
401
flight using curl-multi.
402
372
-Will merge to 'next'.
373
-
374
-* jk/rebase-i-submodule-conflict-only (2012-04-09) 1 commit
375
- (merged to 'next' on 2012-04-15 at 94367a8)
376
- + rebase -i continue: don't skip commits that only change submodules
377
-
378
-Giving "--continue" to a conflicted "rebase -i" session skipped a commit
379
-that only results in changes to submodules.
380
-
381
-Will merge to 'master'.
382
-
383
-* ms/remote-usage-string (2012-04-09) 1 commit
384
- (merged to 'next' on 2012-04-15 at 704be8f)
385
- + remote: update builtin usage
386
-
387
-As an independent follow-up, we may want to rethink how the overall usage
388
-string and subcommand usage strings are maintained.
389
-
403
Will merge to 'master'.
404
405
* pw/fast-import-dataref-parsing (2012-04-10) 1 commit
406
(merged to 'next' on 2012-04-20 at c299a63)
407
+ fast-import: tighten parsing of datarefs
408
396
-* pw/git-p4 (2012-04-09) 3 commits
397
- (merged to 'next' on 2012-04-15 at 81ea41a)
398
- + git p4: use "git p4" directly in tests
399
- + git p4: update name in script
400
- + git-p4: move to toplevel
401
- (this branch is used by ld/git-p4-tags-and-labels.)
402
-
403
-Will merge to 'master'.
404
-
405
-* rl/show-empty-prefix (2012-04-10) 1 commit
406
- (merged to 'next' on 2012-04-15 at b2e5938)
407
- + rev-parse --show-prefix: add in trailing newline
408
-
409
Will merge to 'master'.
410
411
* tr/xdiff-fast-hash (2012-04-09) 1 commit
@@ -447,6 +447,8 @@ jc/split-blob topic.
447
+ gitweb: esc_html_hl_regions(): Don't create empty <span> elements
448
+ gitweb: Use descriptive names in esc_html_hl_regions()
449
450
+Will merge to 'master'.
451
+
452
* it/fetch-pack-many-refs (2012-04-10) 4 commits
453
(merged to 'next' on 2012-04-20 at e2126d7)
454
+ remote-curl: main test case for the OS command line overflow
@@ -454,28 +456,17 @@ jc/split-blob topic.
456
+ remote-curl: send the refs to fetch-pack on stdin
457
+ fetch-pack: new --stdin option to read refs from stdin
458
457
-* jn/debian-customizes-default-editor (2012-04-10) 2 commits
458
- (merged to 'next' on 2012-04-15 at 0fc85c3)
459
- + var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings
460
- + var doc: default editor and pager are configurable at build time
461
-
459
Will merge to 'master'.
460
464
-* rs/commit-list-sort-in-batch (2012-04-17) 4 commits
465
- (merged to 'next' on 2012-04-17 at 21208e9)
466
- + mergesort: rename it to llist_mergesort()
467
- (merged to 'next' on 2012-04-15 at 39fe527)
468
- + revision: insert unsorted, then sort in prepare_revision_walk()
469
- + commit: use mergesort() in commit_list_sort_by_date()
470
- + add mergesort() for linked lists
471
-
461
* hv/submodule-recurse-push (2012-03-30) 3 commits
462
(merged to 'next' on 2012-04-20 at fe99e3d)
463
+ push: teach --recurse-submodules the on-demand option
464
+ Refactor submodule push check to use string list instead of integer
465
+ Teach revision walking machinery to walk multiple times sequencially
466
478
-* th/difftool-diffall (2012-04-14) 8 commits
467
+Will merge to 'master'.
468
+
469
+* th/difftool-diffall (2012-04-23) 8 commits
470
- difftool: print list of valid tools with '--tool-help'
471
- difftool: teach difftool to handle directory diffs
472
- difftool: eliminate setup_environment function
@@ -498,40 +489,23 @@ Not urgent.
489
Updates run_hook() API to be much less specific to "commit". It would
490
only be useful if people start doing more interesting things with hooks.
491
501
-* mm/push-default-switch-warning (2012-04-20) 4 commits
492
+* mm/push-default-switch-warning (2012-04-23) 10 commits
493
+ - fixup! push: introduce new push.default mode "simple"
494
+ - fixup! t5528-push-default.sh: add helper functions
495
+ - push: suggested updates to push configuration documentation
496
- push: start warning upcoming default change for push.default
497
+ - push: document the future default change for push.default (matching -> simple)
498
- t5570: use explicit push refspec
499
- push: introduce new push.default mode "simple"
500
+ - t5528-push-default.sh: add helper functions
501
+ - Undocument deprecated alias 'push.default=tracking'
502
- Documentation: explain push.default option a bit more
503
507
-This resurrects an ancient patch I wrote during a discussion we had in the
508
-1.6.3-1.6.4 era. This should probably come after ct/advise-push-default
509
-topic and at that point the advise messages need to be rephrased, taking
510
-the future default change into account.
511
-
512
---------------------------------------------------
513
-[Discarded]
514
-
515
-* cn/apply-fix-ws-can-lengthen-lines (2012-03-11) 1 commit
516
- . apply: reallocate the postimage buffer when needed
517
-
518
-Attempts to address an ancient bug that dates back to the addition
519
-of an oddball "tab-in-indent" whitespace breakage class that wants
520
-to have longer lines than the original when fixing things up; broken
521
-and results in double-frees.
522
-
523
-* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits
524
- . fixup! 15eaaf4
525
- . git-svn, perl/Git.pm: extend Git::prompt helper for querying users
526
- . perl/Git.pm: "prompt" helper to honor GIT_ASKPASS and SSH_ASKPASS
527
-
528
-Has been stalled for too long.
504
+Introduces 'simple' mode to be used as the push.default in a future
505
+version of git. I think the series is almost there modulo some minor
506
+nits.
507
530
-* lt/octopus-simplify (2012-04-17) 3 commits
531
- . git-merge: Reduce heads before trying to merge them
532
- . Make 'git merge' simplify parents earlier
533
- - merge tests: octopus with redundant parents
534
- (this branch is tangled with jc/merge-reduce-parents-early.)
508
+This topic should be renamed to "mm/push-simple-method" and the last
509
+step to start warning made into a separate topic that build on it, but
510
+the review comments need to be addressed in a reroll before that
511
536
-Octopus merge strategy did not reduce heads that are recorded in the final
537
-commit, but follow-up broke badly.