What's cooking (2013/06 #03)
Junio C Hamano committed
Jun 6, 2013 at 15:40 UTC
d4c93a4074fff9d395c9a3d9699d97eb574406a9
1 file changed
+371
-398
whats-cooking.txt
+371
-398
@@ -1,178 +1,222 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2013, #02; Tue, 4)
4
-X-master-at: 2fe2458370d9bfcc9a00ade21181dd8ac65ca0f0
5
-X-next-at: da085a372bc80f6746d0649a2d0bf281e853a7a2
3
+Subject: What's cooking in git.git (Jun 2013, #03; Thu, 6)
4
+X-master-at: 882e78c7f9c284408640347a4b1910ea73537a10
5
+X-next-at: 4be48e85aeafa12baca36edf3ee8cb0b7e970a16
6
7
-What's cooking in git.git (Jun 2013, #02; Tue, 4)
7
+What's cooking in git.git (Jun 2013, #03; Thu, 6)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-We are in the post-1.8.3 cycle. As promised, 'next' has been
15
-rewound. A few stalled topics have been ejected and bunch of new
16
-topics that have been cooking are now in it. I expect these on
17
-'next' to graduate to 'master' soonish, as I picked relatively easy
18
-ones in this round.
19
-
14
You can find the changes described here in the integration branches
15
of the repositories listed at
16
17
http://git-blame.blogspot.com/p/git-public-repositories.html
18
19
--------------------------------------------------
26
-[Graduated to "master"]
20
+[New Topics]
21
28
-* kb/status-ignored-optim-2 (2013-06-02) 1 commit
29
- (merged to 'next' on 2013-06-02 at 88ee588)
30
- + dir.c: fix ignore processing within not-ignored directories
22
+* jk/list-objects-sans-blobs (2013-06-06) 4 commits
23
+ - archive: ignore blob objects when checking reachability
24
+ - list-objects: optimize "revs->blob_objects = 0" case
25
+ - upload-archive: restrict remote objects with reachability check
26
+ - clear parsed flag when we free tree buffers
27
32
- Fix 1.8.3 regressions in the .gitignore path exclusion logic.
28
+ Attempt to allow "archive --remote=$there $arbitrary_sha1" while
29
+ keeping the reachability safety.
30
31
--------------------------------------------------
35
-[New Topics]
32
+[Graduated to "master"]
33
37
-* ar/wildmatch-foldcase (2013-06-02) 1 commit
38
- (merged to 'next' on 2013-06-04 at 3180bcc)
39
- + wildmatch: properly fold case everywhere
34
+* dm/unbash-subtree (2013-05-21) 1 commit
35
+ (merged to 'next' on 2013-06-03 at 2c9d2fb)
36
+ + contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash
37
41
- The wildmatch engine did not honor WM_CASEFOLD option correctly.
38
+ It turns out that git-subtree script does not have to be run with
39
+ bash.
40
43
- Will merge to 'master'.
41
45
-* cr/git-work-tree-sans-git-dir (2013-06-03) 1 commit
46
- (merged to 'next' on 2013-06-04 at bebedca)
47
- + git.txt: remove stale comment regarding GIT_WORK_TREE
42
+* fc/cleanups (2013-05-28) 3 commits
43
+ (merged to 'next' on 2013-06-03 at 527cf93)
44
+ + test: rebase: fix --interactive test
45
+ + test: trivial cleanups
46
+ + remote: trivial style cleanup
47
49
- These days, "git --work-tree=there cmd" without specifying an
50
- explicit --git-dir=here will do the usual discovery, but we had a
51
- description of older behaviour in the documentation.
48
53
- Will merge to 'master'.
49
+* fc/makefile (2013-05-26) 5 commits
50
+ (merged to 'next' on 2013-06-03 at d1074e4)
51
+ + build: do not install git-remote-testpy
52
+ + build: add NO_INSTALL variable
53
+ + build: cleanup using $<
54
+ + build: cleanup using $^
55
+ + build: trivial simplification
56
+ (this branch is used by fc/remote-helpers-use-specified-python.)
57
58
+ Stop installing the git-remote-testpy script that is only used for
59
+ testing. Also use handy magic variables to simplify rules.
60
56
-* fc/do-not-use-the-index-in-add-to-index (2013-06-03) 2 commits
57
- (merged to 'next' on 2013-06-04 at 94e7b60)
58
- + read-cache: trivial style cleanups
59
- + read-cache: fix wrong 'the_index' usage
61
61
- Will merge to 'master'.
62
+* fc/send-email-chainreplyto-warning (2013-05-28) 1 commit
63
+ (merged to 'next' on 2013-06-03 at e04764f)
64
+ + send-email: remove warning about unset chainreplyto
65
66
+ An overdue removal of "behaviour changed at 1.7.0; if you were
67
+ living in a cave, here is what you can adjust to it" message.
68
64
-* fc/sequencer-skip-quiet (2013-06-03) 8 commits
65
- - revert/cherry-pick: add --skip option
66
- - revert/cherry-pick: add --quiet option
67
- - sequencer: run post-rewrite hook
68
- - cherry-pick: store rewritten commits
69
- - SQUASH???
70
- - cherry-pick: add --skip-empty option
71
- - sequencer: trivial fix
72
- - sequencer: remove useless indentation
69
74
- I think the post-rewrite hook should not apply to revert, and
75
- revert should be taught about --skip-empty. The "copy-notes"
76
- change was nak'ed, and I agree with Thomas that the external
77
- interface to the mechanism should be aligned with existing
78
- notes.rewrite.<command>.
70
+* fc/show-branch-in-rebase-am (2013-05-29) 1 commit
71
+ (merged to 'next' on 2013-06-03 at 176f6b7)
72
+ + prompt: fix for simple rebase
73
80
- Waiting for a reroll.
74
+ The bash prompt code (in contrib/) displayed the name of the branch
75
+ being rebased when "rebase -i/-m/-p" modes are in use, but not the
76
+ plain vanilla "rebase".
77
82
- $gmane/225676, $gmane/226263, $gmane/226271
78
79
+* fc/transport-helper-no-refspec (2013-05-21) 2 commits
80
+ (merged to 'next' on 2013-06-03 at 8763bda)
81
+ + transport-helper: check if the dry-run is supported
82
+ + transport-helper: barf when user tries old:new
83
85
-* js/test-ln-s-add (2013-06-02) 11 commits
86
- - t6035: use test_ln_s_add to remove SYMLINKS prerequisite
87
- - t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite
88
- - t3100: use test_ln_s_add to remove SYMLINKS prerequisite
89
- - t3030: use test_ln_s_add to remove SYMLINKS prerequisite
90
- - t2100: use test_ln_s_add to remove SYMLINKS prerequisite
91
- - t0000: use test_ln_s_add to remove SYMLINKS prerequisite
92
- - tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
93
- - tests: introduce test_ln_s and test_ln_s_add
94
- - t3010: modernize style
95
- - t2100: modernize style and unroll a loop of test cases
96
- - test-chmtime: Fix exit code on Windows
84
+ With "export" remote-helper protocol, (1) a push that tries to
85
+ update a remote ref whose name is different from the pushing side
86
+ does not work yet, and (2) the helper may not know how to do
87
+ --dry-run, so detect such problematic cases and disable them for
88
+ now.
89
98
- Many tests that check the behaviour of symbolic links stored in the
99
- index or the tree objects do not have to be skipped on a filesystem
100
- that lack symbolic link support.
90
102
- There seem to be some misconversion, mostly around the use of the
103
- new test_ln_s helper.
91
+* jc/core-checkstat (2013-05-06) 1 commit
92
+ (merged to 'next' on 2013-06-03 at 2166cb3)
93
+ + deprecate core.statinfo at Git 2.0 boundary
94
+ (this branch is used by jc/core-checkstat-2.0.)
95
105
- Waiting for responses to reviews.
106
- $gmane/226417 and others.
96
+ The configuration variable core.checkstat was advertised in the
97
+ documentation but the code expected core.statinfo instead.
98
99
+ For now, we accept both core.checkstat and core.statinfo, but the
100
+ latter will be removed in the longer term.
101
109
-* mt/send-email-cc-match-fix (2013-06-03) 6 commits
110
- - t/send-email: test suppress-cc=self with non-ascii
111
- - t/send-email: add test with quoted sender
112
- - send-email: make --suppress-cc=self sanitize input
113
- - t/send-email: test suppress-cc=self on cccmd
114
- - send-email: fix suppress-cc=self on cccmd
115
- - t/send-email.sh: add test for suppress-cc=self
102
117
- It may want to have an additional test case for --from='"A U. Thor"
118
- <author@example.xz>' to make sure we do not doubly escape what is
119
- already escaped.
103
+* ks/difftool-dir-diff-copy-fix (2013-05-29) 1 commit
104
+ (merged to 'next' on 2013-06-03 at ca0cae0)
105
+ + difftool --dir-diff: allow changing any clean working tree file
106
121
- Some changes in patch 2/6 and a later patch may need to be flipped
122
- around.
107
+ "difftool --dir-diff" did not copy back changes made by the
108
+ end-user in the diff tool backend to the working tree in some
109
+ cases.
110
111
125
-* rr/complete-difftool (2013-06-03) 2 commits
126
- (merged to 'next' on 2013-06-04 at 01c7611)
127
- + completion: clarify ls-tree, archive, show completion
128
- + completion: difftool takes both revs and files
112
+* nd/clone-connectivity-shortcut (2013-05-28) 4 commits
113
+ (merged to 'next' on 2013-06-03 at 812bd80)
114
+ + clone: open a shortcut for connectivity check
115
+ + index-pack: remove dead code (it should never happen)
116
+ + fetch-pack: prepare updated shallow file before fetching the pack
117
+ + clone: let the user know when check_everything_connected is run
118
130
- Update command line completion (in contrib/) to use a better named
131
- completion helper function for commands that take revisions and
132
- paths.
119
+ "git clone" uses a lighter-weight implementation when making sure
120
+ that the history behind refs are complete.
121
134
- Will merge to 'master'.
122
123
+* nd/prune-packed-dryrun-verbose (2013-05-28) 1 commit
124
+ (merged to 'next' on 2013-06-03 at 3445b27)
125
+ + prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()
126
137
-* rr/diffcore-pickaxe-doc (2013-06-03) 2 commits
138
- (merged to 'next' on 2013-06-04 at 67d1fc7)
139
- + diffcore-pickaxe doc: document -S and -G properly
140
- + diffcore-pickaxe: make error messages more consistent
127
142
- Update the low-level diffcore documentation on -S/-G and --pickaxe-all.
128
+* nd/urls-doc-no-file-hyperlink-fix (2013-05-24) 1 commit
129
+ (merged to 'next' on 2013-06-03 at 54903b2)
130
+ + urls.txt: avoid auto converting to hyperlink
131
144
- Will merge to 'master'.
132
+ An entry for "file://" scheme in the enumeration of URL types Git
133
+ can take in the HTML documentation was made into a clickable link
134
+ by mistake.
135
136
147
-* tr/sha1-file-silence-loose-object-info-under-prune-race (2013-06-03) 1 commit
148
- (merged to 'next' on 2013-06-04 at e891bb8)
149
- + sha1_file: silence sha1_loose_object_info
137
+* rj/mingw-compat-st-mode-bits (2013-05-29) 1 commit
138
+ (merged to 'next' on 2013-06-03 at 2efe84c)
139
+ + path: Fix a sparse warning
140
151
- Will merge to 'master'.
141
142
+* rr/push-head (2013-05-29) 3 commits
143
+ (merged to 'next' on 2013-06-03 at ecd5be7)
144
+ + push: make push.default = current use resolved HEAD
145
+ + push: fail early with detached HEAD and current
146
+ + push: factor out the detached HEAD error message
147
154
-* bp/mediawiki-credential (2013-06-04) 1 commit
155
- - git-remote-mediawiki: use git.pm functions for credentials
148
+ "git push $there HEAD:branch" did not resolve HEAD early enough, so
149
+ it was easy to flip it around while push is still going on and push
150
+ out a branch that the user did not originally intended when the
151
+ command was started.
152
157
- The bridge to MediaWiki has been updated to use the credential
158
- helper interface in Git.pm, losing its own and the original
159
- implementation the former was based on.
153
161
- Minor review comments sent.
154
+* rr/zsh-color-prompt (2013-05-17) 3 commits
155
+ (merged to 'next' on 2013-06-03 at d011a76)
156
+ + prompt: colorize ZSH prompt
157
+ + prompt: factor out gitstring coloring logic
158
+ + prompt: introduce GIT_PS1_STATESEPARATOR
159
160
164
-* mz/rebase-tests (2013-06-03) 7 commits
165
- - tests: move test for rebase messages from t3400 to t3406
166
- - t3406: modernize style
167
- - add tests for rebasing merged history
168
- - add tests for rebasing root
169
- - add tests for rebasing of empty commits
170
- - add tests for rebasing with patch-equivalence present
171
- - add simple tests of consistency across rebase types
161
+* rs/commit-m-no-edit (2013-05-28) 1 commit
162
+ (merged to 'next' on 2013-06-03 at 14329fa)
163
+ + commit: don't start editor if empty message is given with -m
164
+
165
+ "git commit --allow-empty-message -m ''" should not start an
166
+ editor.
167
+
168
+
169
+* sb/archive-zip-double-assignment-fix (2013-05-29) 1 commit
170
+ (merged to 'next' on 2013-06-03 at c316eec)
171
+ + archive-zip:write_zip_entry: Remove second reset of size variable to zero.
172
+
173
+
174
+* tg/maint-zsh-svn-remote-prompt (2013-05-22) 1 commit
175
+ (merged to 'next' on 2013-06-03 at 32a45c0)
176
+ + prompt: fix show upstream with svn and zsh
177
+
178
+ zsh prompt script that borrowed from bash prompt script did not
179
+ work due to slight differences in array variable notation between
180
+ these two shells.
181
+
182
+
183
+* th/bisect-skip-report-range-fix (2013-05-22) 1 commit
184
+ (merged to 'next' on 2013-06-03 at 7bd4656)
185
+ + bisect: Fix log output for multi-parent skip ranges
186
+
187
+ Fix for an additional bisect log comments.
188
+
189
+
190
+* tr/push-no-verify-doc (2013-05-23) 1 commit
191
+ (merged to 'next' on 2013-06-03 at 01737d6)
192
+ + Document push --no-verify
193
+
194
+ "git push --[no-]verify" was not documented.
195
196
--------------------------------------------------
197
[Stalled]
198
199
+* fc/remote-helpers-use-specified-python (2013-05-28) 4 commits
200
+ - remote-helpers: add exec-path links
201
+ - remote-helpers: allow direct test execution
202
+ - remote-helpers: rename tests
203
+ - remote-helpers: generate scripts
204
+
205
+ I do not particularly think the second from the bottom is a good
206
+ change, but it takes the remainder of the series hostage.
207
+
208
+ Waiting for a reroll.
209
+
210
+
211
+* jk/packed-refs-race (2013-05-06) 4 commits
212
+ - for_each_ref: load all loose refs before packed refs
213
+ - get_packed_refs: reload packed-refs file when it changes
214
+ - add a stat_validity struct
215
+ - resolve_ref: close race condition for packed refs
216
+
217
+ Will be rerolled.
218
+
219
+
220
* mg/more-textconv (2013-05-10) 7 commits
221
- grep: honor --textconv for the case rev:path
222
- grep: allow to use textconv filters
@@ -206,46 +250,181 @@ of the repositories listed at
250
stripping out more MIMEy stuff are left as exercises to interested
251
parties.
252
209
- Not ready for inclusion.
253
+ Not ready for inclusion.
254
+
255
+ Will discard unless we hear from anybody who is interested in
256
+ tying its loose ends.
257
+
258
+
259
+* jk/gitweb-utf8 (2013-04-08) 4 commits
260
+ - gitweb: Fix broken blob action parameters on blob/commitdiff pages
261
+ - gitweb: Don't append ';js=(0|1)' to external links
262
+ - gitweb: Make feed title valid utf8
263
+ - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
264
+
265
+ Various fixes to gitweb.
266
+
267
+ Drew Northup volunteered to take a look into this.
268
+ $gmane/226216
269
+
270
+
271
+* jk/commit-info-slab (2013-04-19) 3 commits
272
+ - commit-slab: introduce a macro to define a slab for new type
273
+ - commit-slab: avoid large realloc
274
+ - commit: allow associating auxiliary info on-demand
275
+ (this branch is used by jc/show-branch.)
276
+
277
+ Technology demonstration to show a way we could use unbound number
278
+ of flag bits on commit objects.
279
+
280
+
281
+* jc/show-branch (2013-05-21) 5 commits
282
+ - show-branch: use commit slab to represent bitflags of arbitrary width
283
+ - show-branch.c: remove "all_mask"
284
+ - show-branch.c: abstract out "flags" operation
285
+ - show-branch.c: lift all_mask/all_revs to a global static
286
+ - show-branch.c: update comment style
287
+ (this branch uses jk/commit-info-slab.)
288
+
289
+ Waiting for the final step to lift the hard-limit before sending it out.
290
+
291
+--------------------------------------------------
292
+[Cooking]
293
+
294
+* ar/wildmatch-foldcase (2013-06-02) 1 commit
295
+ (merged to 'next' on 2013-06-04 at 3180bcc)
296
+ + wildmatch: properly fold case everywhere
297
+
298
+ The wildmatch engine did not honor WM_CASEFOLD option correctly.
299
+
300
+ Will merge to 'master'.
301
+
302
+
303
+* cr/git-work-tree-sans-git-dir (2013-06-03) 1 commit
304
+ (merged to 'next' on 2013-06-04 at bebedca)
305
+ + git.txt: remove stale comment regarding GIT_WORK_TREE
306
+
307
+ These days, "git --work-tree=there cmd" without specifying an
308
+ explicit --git-dir=here will do the usual discovery, but we had a
309
+ description of older behaviour in the documentation.
310
+
311
+ Will merge to 'master'.
312
+
313
+
314
+* fc/do-not-use-the-index-in-add-to-index (2013-06-03) 2 commits
315
+ (merged to 'next' on 2013-06-04 at 94e7b60)
316
+ + read-cache: trivial style cleanups
317
+ + read-cache: fix wrong 'the_index' usage
318
+
319
+ Will merge to 'master'.
320
+
321
+
322
+* fc/sequencer-skip-quiet (2013-06-06) 5 commits
323
+ - sequencer: run post-rewrite hook
324
+ - cherry-pick: store rewritten commits
325
+ - cherry-pick: add --skip-empty option
326
+ - sequencer: avoid leaking message buffer when refusing to create an empty commit
327
+ - sequencer: remove useless indentation
328
+
329
+ The bottom three looked more or less reasonable. Execution of
330
+ post-rewrite hook could use a better refactoring from the original
331
+ code copied from builtin/commit.c, though.
332
+
333
+
334
+* js/test-ln-s-add (2013-06-02) 11 commits
335
+ - t6035: use test_ln_s_add to remove SYMLINKS prerequisite
336
+ - t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite
337
+ - t3100: use test_ln_s_add to remove SYMLINKS prerequisite
338
+ - t3030: use test_ln_s_add to remove SYMLINKS prerequisite
339
+ - t2100: use test_ln_s_add to remove SYMLINKS prerequisite
340
+ - t0000: use test_ln_s_add to remove SYMLINKS prerequisite
341
+ - tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
342
+ - tests: introduce test_ln_s and test_ln_s_add
343
+ - t3010: modernize style
344
+ - t2100: modernize style and unroll a loop of test cases
345
+ - test-chmtime: Fix exit code on Windows
346
+
347
+ Many tests that check the behaviour of symbolic links stored in the
348
+ index or the tree objects do not have to be skipped on a filesystem
349
+ that lack symbolic link support.
350
+
351
+ There seem to be some misconversion, mostly around the use of the
352
+ new test_ln_s helper.
353
+
354
+ Will be rerolled.
355
+ $gmane/226466,226467
356
+
357
+
358
+* mt/send-email-cc-match-fix (2013-06-05) 7 commits
359
+ (merged to 'next' on 2013-06-06 at e4d0831)
360
+ + test-send-email: test for pre-sanitized self name
361
+ + t/send-email: test suppress-cc=self with non-ascii
362
+ + t/send-email: add test with quoted sender
363
+ + send-email: make --suppress-cc=self sanitize input
364
+ + t/send-email: test suppress-cc=self on cccmd
365
+ + send-email: fix suppress-cc=self on cccmd
366
+ + t/send-email.sh: add test for suppress-cc=self
367
+
368
+ Logic git-send-email used to suppress cc mishandled names like "A
369
+ U. Thor" <author@example.xz>, where the human readable part needs
370
+ to be quoted (the user input may not have the double quotes around
371
+ the name, and comparison was done between quoted and unquoted
372
+ strings).
373
+
374
+ Will merge to 'master'.
375
+
376
+
377
+* rr/complete-difftool (2013-06-03) 2 commits
378
+ (merged to 'next' on 2013-06-04 at 01c7611)
379
+ + completion: clarify ls-tree, archive, show completion
380
+ + completion: difftool takes both revs and files
381
+
382
+ Update command line completion (in contrib/) to use a better named
383
+ completion helper function for commands that take revisions and
384
+ paths.
385
+
386
+ Will merge to 'master'.
387
+
388
+
389
+* rr/diffcore-pickaxe-doc (2013-06-03) 2 commits
390
+ (merged to 'next' on 2013-06-04 at 67d1fc7)
391
+ + diffcore-pickaxe doc: document -S and -G properly
392
+ + diffcore-pickaxe: make error messages more consistent
393
+
394
+ Update the low-level diffcore documentation on -S/-G and --pickaxe-all.
395
211
- Will discard unless we hear from anybody who is interested in
212
- tying its loose ends.
396
+ Will merge to 'master'.
397
398
215
-* jk/gitweb-utf8 (2013-04-08) 4 commits
216
- - gitweb: Fix broken blob action parameters on blob/commitdiff pages
217
- - gitweb: Don't append ';js=(0|1)' to external links
218
- - gitweb: Make feed title valid utf8
219
- - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
399
+* tr/sha1-file-silence-loose-object-info-under-prune-race (2013-06-03) 1 commit
400
+ (merged to 'next' on 2013-06-04 at e891bb8)
401
+ + sha1_file: silence sha1_loose_object_info
402
221
- Various fixes to gitweb.
403
+ Will merge to 'master'.
404
223
- Drew Northup volunteered to take a look into this.
224
- $gmane/226216
405
406
+* bp/mediawiki-credential (2013-06-05) 1 commit
407
+ (merged to 'next' on 2013-06-05 at ea07ec1)
408
+ + git-remote-mediawiki: use Git.pm functions for credentials
409
227
-* jk/commit-info-slab (2013-04-19) 3 commits
228
- - commit-slab: introduce a macro to define a slab for new type
229
- - commit-slab: avoid large realloc
230
- - commit: allow associating auxiliary info on-demand
231
- (this branch is used by jc/show-branch.)
410
+ The bridge to MediaWiki has been updated to use the credential
411
+ helper interface in Git.pm, losing its own and the original
412
+ implementation the former was based on.
413
233
- Technology demonstration to show a way we could use unbound number
234
- of flag bits on commit objects.
414
+ Will merge to 'master'.
415
416
237
-* jc/show-branch (2013-05-21) 5 commits
238
- - show-branch: use commit slab to represent bitflags of arbitrary width
239
- - show-branch.c: remove "all_mask"
240
- - show-branch.c: abstract out "flags" operation
241
- - show-branch.c: lift all_mask/all_revs to a global static
242
- - show-branch.c: update comment style
243
- (this branch uses jk/commit-info-slab.)
417
+* mz/rebase-tests (2013-06-03) 7 commits
418
+ - tests: move test for rebase messages from t3400 to t3406
419
+ - t3406: modernize style
420
+ - add tests for rebasing merged history
421
+ - add tests for rebasing root
422
+ - add tests for rebasing of empty commits
423
+ - add tests for rebasing with patch-equivalence present
424
+ - add simple tests of consistency across rebase types
425
245
- Waiting for the final step to lift the hard-limit before sending it out.
426
+ Will be rerolled.
427
247
---------------------------------------------------
248
-[Cooking]
428
429
* fc/completion-less-ls-remote (2013-06-02) 1 commit
430
(merged to 'next' on 2013-06-03 at 6624f0b)
@@ -254,7 +433,9 @@ of the repositories listed at
433
Will merge to 'master'.
434
435
257
-* jk/test-exit-code-by-signal (2013-06-02) 1 commit
436
+* jk/test-exit-code-by-signal (2013-06-06) 2 commits
437
+ (merged to 'next' on 2013-06-06 at 6fdea1b)
438
+ + t0005: skip signal death exit code test on Windows
439
(merged to 'next' on 2013-06-03 at 25af892)
440
+ t0005: test git exit code from signal death
441
@@ -268,9 +449,10 @@ of the repositories listed at
449
450
451
* rr/remove-contrib-some (2013-06-02) 1 commit
271
- - contrib: remove continuous/ and patches/
452
+ (merged to 'next' on 2013-06-05 at fc15705)
453
+ + contrib: remove continuous/ and patches/
454
273
- Will merge to 'next'.
455
+ Remove stale contrib/ material.
456
457
458
* rs/unpack-trees-plug-leak (2013-06-02) 7 commits
@@ -304,49 +486,6 @@ of the repositories listed at
486
$gmane/226394
487
488
307
-* fc/show-branch-in-rebase-am (2013-05-29) 1 commit
308
- (merged to 'next' on 2013-06-03 at 176f6b7)
309
- + prompt: fix for simple rebase
310
-
311
- The bash prompt code (in contrib/) displayed the name of the branch
312
- being rebased when "rebase -i/-m/-p" modes are in use, but not the
313
- plain vanilla "rebase".
314
-
315
- Will merge to 'master'.
316
-
317
-
318
-* ks/difftool-dir-diff-copy-fix (2013-05-29) 1 commit
319
- (merged to 'next' on 2013-06-03 at ca0cae0)
320
- + difftool --dir-diff: allow changing any clean working tree file
321
-
322
- "difftool --dir-diff" did not copy back changes made by the
323
- end-user in the diff tool backend to the working tree in some
324
- cases.
325
-
326
- Will merge to 'master'.
327
-
328
-
329
-* rr/push-head (2013-05-29) 3 commits
330
- (merged to 'next' on 2013-06-03 at ecd5be7)
331
- + push: make push.default = current use resolved HEAD
332
- + push: fail early with detached HEAD and current
333
- + push: factor out the detached HEAD error message
334
-
335
- "git push $there HEAD:branch" did not resolve HEAD early enough, so
336
- it was easy to flip it around while push is still going on and push
337
- out a branch that the user did not originally intended when the
338
- command was started.
339
-
340
- Will merge to 'master'.
341
-
342
-
343
-* sb/archive-zip-double-assignment-fix (2013-05-29) 1 commit
344
- (merged to 'next' on 2013-06-03 at c316eec)
345
- + archive-zip:write_zip_entry: Remove second reset of size variable to zero.
346
-
347
- Will merge to 'master'.
348
-
349
-
489
* rj/mingw-cygwin (2013-05-08) 2 commits
490
(merged to 'next' on 2013-06-04 at 308fdb4)
491
+ cygwin: Remove the CYGWIN_V15_WIN32API build variable
@@ -372,13 +511,6 @@ of the repositories listed at
511
Will merge to 'master'.
512
513
375
-* nd/urls-doc-no-file-hyperlink-fix (2013-05-24) 1 commit
376
- (merged to 'next' on 2013-06-03 at 54903b2)
377
- + urls.txt: avoid auto converting to hyperlink
378
-
379
- Will merge to 'master'.
380
-
381
-
514
* cb/log-follow-with-combined (2013-05-28) 1 commit
515
(merged to 'next' on 2013-06-04 at d5bf4f3)
516
+ fix segfault with git log -c --follow
@@ -386,74 +518,6 @@ of the repositories listed at
518
Will merge to 'master'.
519
520
389
-* fc/cleanups (2013-05-28) 3 commits
390
- (merged to 'next' on 2013-06-03 at 527cf93)
391
- + test: rebase: fix --interactive test
392
- + test: trivial cleanups
393
- + remote: trivial style cleanup
394
-
395
- Will merge to 'master'.
396
-
397
-
398
-* fc/makefile (2013-05-26) 5 commits
399
- (merged to 'next' on 2013-06-03 at d1074e4)
400
- + build: do not install git-remote-testpy
401
- + build: add NO_INSTALL variable
402
- + build: cleanup using $<
403
- + build: cleanup using $^
404
- + build: trivial simplification
405
- (this branch is used by fc/remote-helpers-use-specified-python.)
406
-
407
- Will merge to 'master'.
408
-
409
-
410
-* fc/remote-helpers-use-specified-python (2013-05-28) 4 commits
411
- - remote-helpers: add exec-path links
412
- - remote-helpers: allow direct test execution
413
- - remote-helpers: rename tests
414
- - remote-helpers: generate scripts
415
- (this branch uses fc/makefile.)
416
-
417
- I do not particularly think the second from the bottom is a good
418
- change, but it takes the remainder of the series hostage.
419
-
420
- Waiting for a reroll.
421
-
422
-
423
-* fc/send-email-chainreplyto-warning (2013-05-28) 1 commit
424
- (merged to 'next' on 2013-06-03 at e04764f)
425
- + send-email: remove warning about unset chainreplyto
426
-
427
- An overdue removal od "behaviour changed at 1.7.0; if you were
428
- living in a cave, here is what you can adjust to it" message.
429
-
430
- Will merge to 'master'.
431
-
432
-
433
-* nd/prune-packed-dryrun-verbose (2013-05-28) 1 commit
434
- (merged to 'next' on 2013-06-03 at 3445b27)
435
- + prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()
436
-
437
- Will merge to 'master'.
438
-
439
-
440
-* rj/mingw-compat-st-mode-bits (2013-05-29) 1 commit
441
- (merged to 'next' on 2013-06-03 at 2efe84c)
442
- + path: Fix a sparse warning
443
-
444
- Will merge to 'master'.
445
-
446
-
447
-* rs/commit-m-no-edit (2013-05-28) 1 commit
448
- (merged to 'next' on 2013-06-03 at 14329fa)
449
- + commit: don't start editor if empty message is given with -m
450
-
451
- "git commit --allow-empty-message -m ''" should not start an
452
- editor.
453
-
454
- Will merge to 'master'.
455
-
456
-
521
* xq/credential-osxkeychain (2013-05-28) 1 commit
522
(merged to 'next' on 2013-06-04 at a4ee0e0)
523
+ credential-osxkeychain: support more protocols
@@ -461,54 +525,38 @@ of the repositories listed at
525
Will merge to 'master'.
526
527
464
-* jc/core-checkstat (2013-05-06) 1 commit
465
- (merged to 'next' on 2013-06-03 at 2166cb3)
466
- + deprecate core.statinfo at Git 2.0 boundary
467
- (this branch is used by jc/core-checkstat-2.0.)
468
-
469
- Will merge to 'master'.
470
-
471
-
528
* mh/reflife (2013-06-02) 25 commits
473
- - refs: document the lifetime of the args passed to each_ref_fn
474
- - register_ref(): make a copy of the bad reference SHA-1
475
- - exclude_existing(): set existing_refs.strdup_strings
476
- - string_list_add_refs_by_glob(): add a comment about memory management
477
- - string_list_add_one_ref(): rename first parameter to "refname"
478
- - show_head_ref(): rename first parameter to "refname"
479
- - show_head_ref(): do not shadow name of argument
480
- - add_existing(): do not retain a reference to sha1
481
- - do_fetch(): clean up existing_refs before exiting
482
- - do_fetch(): reduce scope of peer_item
483
- - object_array_entry: fix memory handling of the name field
484
- - find_first_merges(): remove unnecessary code
485
- - find_first_merges(): initialize merges variable using initializer
486
- - fsck: don't put a void*-shaped peg in a char*-shaped hole
487
- - object_array_remove_duplicates(): rewrite to reduce copying
488
- - revision: use object_array_filter() in implementation of gc_boundary()
489
- - object_array: add function object_array_filter()
490
- - revision: split some overly-long lines
491
- - cmd_diff(): make it obvious which cases are exclusive of each other
492
- - cmd_diff(): rename local variable "list" -> "entry"
493
- - cmd_diff(): use an object_array for holding trees
494
- - builtin_diff_tree(): make it obvious that function wants two entries
495
- - add_rev_cmdline(): make a copy of the name argument
496
- - fetch: make own copies of refnames
497
- - describe: make own copy of refname
529
+ (merged to 'next' on 2013-06-05 at 291d863)
530
+ + refs: document the lifetime of the args passed to each_ref_fn
531
+ + register_ref(): make a copy of the bad reference SHA-1
532
+ + exclude_existing(): set existing_refs.strdup_strings
533
+ + string_list_add_refs_by_glob(): add a comment about memory management
534
+ + string_list_add_one_ref(): rename first parameter to "refname"
535
+ + show_head_ref(): rename first parameter to "refname"
536
+ + show_head_ref(): do not shadow name of argument
537
+ + add_existing(): do not retain a reference to sha1
538
+ + do_fetch(): clean up existing_refs before exiting
539
+ + do_fetch(): reduce scope of peer_item
540
+ + object_array_entry: fix memory handling of the name field
541
+ + find_first_merges(): remove unnecessary code
542
+ + find_first_merges(): initialize merges variable using initializer
543
+ + fsck: don't put a void*-shaped peg in a char*-shaped hole
544
+ + object_array_remove_duplicates(): rewrite to reduce copying
545
+ + revision: use object_array_filter() in implementation of gc_boundary()
546
+ + object_array: add function object_array_filter()
547
+ + revision: split some overly-long lines
548
+ + cmd_diff(): make it obvious which cases are exclusive of each other
549
+ + cmd_diff(): rename local variable "list" -> "entry"
550
+ + cmd_diff(): use an object_array for holding trees
551
+ + builtin_diff_tree(): make it obvious that function wants two entries
552
+ + add_rev_cmdline(): make a copy of the name argument
553
+ + fetch: make own copies of refnames
554
+ + describe: make own copy of refname
555
556
Define memory ownership and lifetime rules for what for-each-ref
557
feeds to its callbacks (in short, "you do not own it, so make a
558
copy if you want to keep it").
559
503
- Will merge to 'next'.
504
-
505
-
506
-* th/bisect-skip-report-range-fix (2013-05-22) 1 commit
507
- (merged to 'next' on 2013-06-03 at 7bd4656)
508
- + bisect: Fix log output for multi-parent skip ranges
509
-
510
- Fix for an additional bisect log comments.
511
-
560
Will merge to 'master'.
561
562
@@ -523,50 +571,6 @@ of the repositories listed at
571
Will merge to 'master'.
572
573
526
-* tg/maint-zsh-svn-remote-prompt (2013-05-22) 1 commit
527
- (merged to 'next' on 2013-06-03 at 32a45c0)
528
- + prompt: fix show upstream with svn and zsh
529
-
530
- zsh prompt script that borrowed from bash prompt script did not
531
- work due to slight differences in array variable notation between
532
- these two shells.
533
-
534
- Will merge to 'master'.
535
-
536
-
537
-* tr/push-no-verify-doc (2013-05-23) 1 commit
538
- (merged to 'next' on 2013-06-03 at 01737d6)
539
- + Document push --no-verify
540
-
541
- "git push --[no-]verify" was not documented.
542
-
543
- Will merge to 'master'.
544
-
545
-
546
-* dm/unbash-subtree (2013-05-21) 1 commit
547
- (merged to 'next' on 2013-06-03 at 2c9d2fb)
548
- + contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bash
549
-
550
- It turns out that git-subtree script does not have to be run with
551
- bash.
552
-
553
- Will merge to 'master'.
554
-
555
-
556
-* fc/transport-helper-no-refspec (2013-05-21) 2 commits
557
- (merged to 'next' on 2013-06-03 at 8763bda)
558
- + transport-helper: check if the dry-run is supported
559
- + transport-helper: barf when user tries old:new
560
-
561
- With "export" remote-helper protocol, (1) a push that tries to
562
- update a remote ref whose name is different from the pushing side
563
- does not work yet, and (2) the helper may not know how to do
564
- --dry-run, so detect such problematic cases and disable them for
565
- now.
566
-
567
- Will merge to 'master'.
568
-
569
-
574
* rr/die-on-missing-upstream (2013-06-02) 2 commits
575
(merged to 'next' on 2013-06-03 at 00847ea)
576
+ sha1_name: fix error message for @{<N>}, @{<date>}
@@ -629,15 +633,6 @@ of the repositories listed at
633
Waiting for a reroll.
634
635
632
-* rr/zsh-color-prompt (2013-05-17) 3 commits
633
- (merged to 'next' on 2013-06-03 at d011a76)
634
- + prompt: colorize ZSH prompt
635
- + prompt: factor out gitstring coloring logic
636
- + prompt: introduce GIT_PS1_STATESEPARATOR
637
-
638
- Will merge to 'master'.
639
-
640
-
636
* fc/contrib-related (2013-06-03) 4 commits
637
- contrib: related: parse committish like format-patch
638
- contrib: related: add option to parse from committish
@@ -714,39 +709,27 @@ of the repositories listed at
709
$gmane/223964
710
711
717
-* nd/clone-connectivity-shortcut (2013-05-28) 4 commits
718
- (merged to 'next' on 2013-06-03 at 812bd80)
719
- + clone: open a shortcut for connectivity check
720
- + index-pack: remove dead code (it should never happen)
721
- + fetch-pack: prepare updated shallow file before fetching the pack
722
- + clone: let the user know when check_everything_connected is run
723
-
724
- Will merge to 'master'.
725
-
726
-
712
* kb/full-history-compute-treesame-carefully-2 (2013-05-16) 15 commits
728
- - revision.c: make default history consider bottom commits
729
- - revision.c: don't show all merges for --parents
730
- - revision.c: discount side branches when computing TREESAME
731
- - revision.c: add BOTTOM flag for commits
732
- - simplify-merges: drop merge from irrelevant side branch
733
- - simplify-merges: never remove all TREESAME parents
734
- - t6012: update test for tweaked full-history traversal
735
- - revision.c: Make --full-history consider more merges
736
- - Documentation: avoid "uninteresting"
737
- - rev-list-options.txt: correct TREESAME for P
738
- - t6111: add parents to tests
739
- - t6111: allow checking the parents as well
740
- - t6111: new TREESAME test set
741
- - t6019: test file dropped in -s ours merge
742
- - decorate.c: compact table when growing
743
-
744
- Major update to a very core part of the system to improve culling
745
- of irrelevant parents while traversing a mergy history.
746
-
747
- Will not be a 1.8.3 material, but is an important topic.
748
-
749
- Will merge to 'next'.
713
+ (merged to 'next' on 2013-06-05 at 193242b)
714
+ + revision.c: make default history consider bottom commits
715
+ + revision.c: don't show all merges for --parents
716
+ + revision.c: discount side branches when computing TREESAME
717
+ + revision.c: add BOTTOM flag for commits
718
+ + simplify-merges: drop merge from irrelevant side branch
719
+ + simplify-merges: never remove all TREESAME parents
720
+ + t6012: update test for tweaked full-history traversal
721
+ + revision.c: Make --full-history consider more merges
722
+ + Documentation: avoid "uninteresting"
723
+ + rev-list-options.txt: correct TREESAME for P
724
+ + t6111: add parents to tests
725
+ + t6111: allow checking the parents as well
726
+ + t6111: new TREESAME test set
727
+ + t6019: test file dropped in -s ours merge
728
+ + decorate.c: compact table when growing
729
+
730
+ Major update to a very core part of the revision traversal logic to
731
+ improve culling of irrelevant parents while traversing a mergy
732
+ history.
733
734
735
* mm/color-auto-default (2013-05-15) 2 commits
@@ -793,15 +776,6 @@ of the repositories listed at
776
Will merge to 'master'.
777
778
796
-* jk/packed-refs-race (2013-05-06) 4 commits
797
- - for_each_ref: load all loose refs before packed refs
798
- - get_packed_refs: reload packed-refs file when it changes
799
- - add a stat_validity struct
800
- - resolve_ref: close race condition for packed refs
801
-
802
- What is the status of this thing?
803
-
804
-
779
* fc/at-head (2013-05-08) 13 commits
780
(merged to 'next' on 2013-06-04 at f334a2a)
781
+ sha1_name: compare variable with constant, not constant with variable
@@ -857,7 +831,6 @@ of the repositories listed at
831
832
* jc/core-checkstat-2.0 (2013-05-06) 1 commit
833
- core.statinfo: remove as promised in Git 2.0
860
- (this branch uses jc/core-checkstat.)
834
835
Will cook in 'next' until Git 2.0.
836