What's cooking (2013/06 #07)
Junio C Hamano committed
Jun 20, 2013 at 21:48 UTC
85050e4373a98de106c5ac538147db622b986cc1
1 file changed
+339
-216
whats-cooking.txt
+339
-216
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2013, #06; Tue, 18)
4
-X-master-at: fb7dfaa710da6f9ebb854f70ffc1c78668a1e70c
5
-X-next-at: 12cfec846bdac68981fbf455e2a638ddf5a6ef9c
3
+Subject: What's cooking in git.git (Jun 2013, #07; Thu, 20)
4
+X-master-at: 21ff9151e811059f5576ca906c519ee5bb5b925e
5
+X-next-at: 7507a48fb149c98af104b7faaacd79147fc7907a
6
7
-What's cooking in git.git (Jun 2013, #06; Tue, 18)
7
+What's cooking in git.git (Jun 2013, #07; Thu, 20)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -17,142 +17,162 @@ of the repositories listed at
17
http://git-blame.blogspot.com/p/git-public-repositories.html
18
19
--------------------------------------------------
20
-[New Topics]
21
-
22
-* rr/rebase-checkout-reflog (2013-06-17) 8 commits
23
- - SQUASH???
24
- - rebase -i: use a better reflog message
25
- - rebase: use a better reflog message
26
- - checkout: respect GIT_REFLOG_ACTION
27
- - status: do not depend on rebase reflog messages
28
- - t/t2021-checkout-last: "checkout -" should work after a rebase finishes
29
- - wt-status: remove unused field in grab_1st_switch_cbdata
30
- - t7512: test "detached from" as well
20
+[Graduated to "master"]
21
32
- Invocations of "git checkout" used internally by "git rebase" were
33
- counted as "checkout", and affected later "git checkout -" to the
34
- the user to an unexpected place.
22
+* cm/remote-mediawiki (2013-06-11) 1 commit
23
+ (merged to 'next' on 2013-06-15 at bdce58e)
24
+ + git-remote-mediawiki: display message when launched directly
25
36
- Waiting for a reroll.
37
- $gmane/228271.
26
27
+* fc/makefile (2013-06-09) 4 commits
28
+ (merged to 'next' on 2013-06-14 at 75b5f6b)
29
+ + Makefile: use $^ to avoid listing prerequisites on the command line
30
+ + build: do not install git-remote-testgit
31
+ + build: generate and clean test scripts
32
+ + Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile
33
40
-* rr/rebase-stash-store (2013-06-17) 5 commits
41
- - rebase: use 'git stash store' to simplify logic
42
- - stash: introduce 'git stash store'
43
- - stash: simplify option parser for create
44
- - stash doc: document short form -p in synopsis
45
- - stash doc: add a warning about using create
34
+ Makefile simplification.
35
47
- Finishing touches for the "git rebase --autostash" feature
48
- introduced earlier.
36
50
- Will merge to 'next'.
37
+* fc/show-non-empty-errors-in-test (2013-06-09) 1 commit
38
+ (merged to 'next' on 2013-06-14 at 99b6b54)
39
+ + test: test_must_be_empty helper
40
41
53
-* rs/unpack-trees-tree-walk-conflict-field (2013-06-17) 1 commit
54
- - unpack-trees: don't shift conflicts left and right
42
+* js/test-ln-s-add (2013-06-07) 10 commits
43
+ (merged to 'next' on 2013-06-14 at 9f58cb1)
44
+ + t4011: remove SYMLINKS prerequisite
45
+ + t6035: use test_ln_s_add to remove SYMLINKS prerequisite
46
+ + t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite
47
+ + t3100: use test_ln_s_add to remove SYMLINKS prerequisite
48
+ + t3030: use test_ln_s_add to remove SYMLINKS prerequisite
49
+ + t0000: use test_ln_s_add to remove SYMLINKS prerequisite
50
+ + tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
51
+ + tests: introduce test_ln_s_add
52
+ + t3010: modernize style
53
+ + test-chmtime: Fix exit code on Windows
54
56
- Will merge to 'next'.
55
+ Many tests that check the behaviour of symbolic links stored in the
56
+ index or the tree objects do not have to be skipped on a filesystem
57
+ that lack symbolic link support.
58
59
59
-* dk/maint-t5150-dirname (2013-06-17) 1 commit
60
- - tests: allow sha1's as part of the path
60
+* mm/color-auto-default (2013-06-10) 2 commits
61
+ (merged to 'next' on 2013-06-14 at 0647576)
62
+ + make color.ui default to 'auto'
63
+ + config: refactor management of color.ui's default value
64
62
- Will merge to 'next'.
65
+ Flip the default for color.ui to 'auto', which is what many
66
+ tutorials recommend new users to do.
67
68
65
-* dk/version-gen-gitdir (2013-06-17) 1 commit
66
- - GIT-VERSION-GEN: support non-standard $GIT_DIR path
69
+* nd/make-wildmatch-default (2013-06-02) 1 commit
70
+ (merged to 'next' on 2013-06-14 at cf21faa)
71
+ + Makefile: promote wildmatch to be the default fnmatch implementation
72
68
- A comment and a counterproposal sent, which is queued here.
73
+ Uses of the platform fnmatch(3) function (many places in the code,
74
+ matching pathspec, .gitignore and .gitattributes to name a few)
75
+ have been replaced with wildmatch, allowing "foo/**/bar" that would
76
+ match foo/bar, foo/a/bar, foo/a/b/bar, etc.
77
70
- Will merge to 'next'.
78
79
+* nd/traces (2013-06-09) 2 commits
80
+ (merged to 'next' on 2013-06-14 at ce0d897)
81
+ + git.txt: document GIT_TRACE_PACKET
82
+ + core: use env variable instead of config var to turn on logging pack access
83
73
-* fg/submodule-fixup (2013-06-17) 1 commit
74
- - git-submodule.sh: remove duplicate call to set_rev_name
84
76
- Will merge to 'next'.
85
+* rs/discard-index-discard-array (2013-06-09) 2 commits
86
+ (merged to 'next' on 2013-06-14 at 778ea9b)
87
+ + read-cache: free cache in discard_index
88
+ + read-cache: add simple performance test
89
90
+ Call to discard_cache/discard_index (used when we use different
91
+ contents of the index in-core, in many operations like commit,
92
+ apply, and merge) used to leak memory that held the array of index
93
+ entries, which has been plugged.
94
79
-* jk/doc-build-move-infordir-def (2013-06-17) 2 commits
80
- - Documentation/Makefile: move infodir to be with other '*dir's
81
- - Documentation/Makefile: fix spaces around assignments
95
83
- Will merge to 'next'.
96
+* rs/logical-vs-binary-or (2013-06-13) 1 commit
97
+ (merged to 'next' on 2013-06-14 at 2821441)
98
+ + use logical OR (||) instead of binary OR (|) in logical context
99
100
+ Code cleanup.
101
86
-* jk/mergetool-lib-refactor (2013-06-17) 1 commit
87
- - mergetool--lib: refactor {diff,merge}_cmd logic
102
89
- Will merge to 'next'.
103
+* rs/match-trees-refactor (2013-06-13) 1 commit
104
+ (merged to 'next' on 2013-06-14 at 1904928)
105
+ + match-trees: factor out fill_tree_desc_strict
106
107
+ Code cleanup.
108
92
-* mm/push-force-is-dangerous (2013-06-18) 1 commit
93
- - Documentation/git-push.txt: explain better cases where --force is dangerous
109
+--------------------------------------------------
110
+[New Topics]
111
95
- Will merge to 'next'.
112
+* as/log-output-encoding-in-user-format (2013-06-20) 3 commits
113
+ - t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
114
+ - t7102 (reset): don't hardcode SHA-1 in expected outputs
115
+ - t6006 (rev-list-format): don't hardcode SHA-1 in expected outputs
116
117
+ "log --format=" did not honor i18n.logoutputencoding configuration
118
+ and this is a beginning of the series that attempts to fix it.
119
98
-* nk/config-local-doc (2013-06-17) 1 commit
99
- - config: Add description of --local option
120
+ Waiting for a reroll.
121
101
- Will merge to 'next'.
122
123
+* bc/http-keep-memory-given-to-curl (2013-06-19) 1 commit
124
+ - http.c: don't rewrite the user:passwd string multiple times
125
104
-* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
105
- - ### DONTMERGE: needs better explanation on what config they need
106
- - pack-refs.c: Add missing call to git_config()
107
- - show-ref.c: Add missing call to git_config()
126
+ Older cURL wanted piece of memory we call it with to be stable, but
127
+ we updated the auth material after handing it to a call.
128
109
- The changes themselves are probably good, but it is unclear what
110
- basic setting needs to be read for which exact operation.
129
+ Will merge to 'next'.
130
112
- Waiting for clarification.
113
- $gmane/228294
131
132
+* jc/reflog-doc (2013-06-19) 1 commit
133
+ - setup_reflog_action: document the rules for using GIT_REFLOG_ACTION
134
116
-* rt/cherry-pick-continue-advice-in-status (2013-06-17) 1 commit
117
- - wt-status: give better advice when cherry-pick is in progress
135
+ Document rules to use GIT_REFLOG_ACTION variable in the scripted
136
+ Porcelain. git-rebase--interactive locally violates this, but it
137
+ is a leaf user that does not call out to or dot-sources other
138
+ scripts, so fixing it is not all that urgent.
139
119
- Will merge to 'next'.
140
141
+* jk/pull-into-dirty-unborn (2013-06-20) 2 commits
142
+ - pull: merge into unborn by fast-forwarding from empty tree
143
+ - pull: update unborn branch tip after index
144
122
-* bc/checkout-tracking-name-plug-leak (2013-06-18) 2 commits
123
- - t/t9802: explicitly name the upstream branch to use as a base
124
- - builtin/checkout.c: don't leak memory in check_tracking_name
145
+ "git pull" into nothing trashed "local changes" that were in the
146
+ index, and this avoids it.
147
148
Will merge to 'next'.
149
150
129
-* kb/diff-blob-blob-doc (2013-06-18) 1 commit
130
- - Documentation: Move "git diff <blob> <blob>"
131
-
132
- Will merge to 'next'.
133
-
151
+* mh/ref-races-optim-invalidate-cached (2013-06-20) 1 commit
152
+ - refs: do not invalidate the packed-refs cache unnecessarily
153
+ (this branch uses mh/ref-races.)
154
135
-* mm/merge-in-dirty-worktree-doc (2013-06-18) 1 commit
136
- - Documentation/git-merge.txt: weaken warning about uncommited changes
155
+ Optional.
156
138
- Will merge to 'next'.
157
158
+* rr/cherry-pick-fast-forward-reflog-message (2013-06-19) 1 commit
159
+ - sequencer: write useful reflog message for fast-forward
160
141
-* mt/send-email-cc-match-fix (2013-06-18) 2 commits
142
- - send-email: add test for duplicate utf8 name
143
- - send-email: sanitize author when writing From line
161
+ The reflog message created when "git cherry-pick" fast-forwarded
162
+ did not say anything but "cherry-pick", but it now says
163
+ "cherry-pick: fast-forward".
164
165
Will merge to 'next'.
166
167
148
-* nk/name-rev-abbreviated-refs (2013-06-18) 1 commit
149
- - name-rev: allow to specify a subpath for --refs option
168
+* vl/typofix (2013-06-19) 1 commit
169
+ - random typofixes (committed missing a 't', successful missing an 's')
170
171
Will merge to 'next'.
172
173
154
-* ph/builtin-srcs-are-in-subdir-these-days (2013-06-18) 1 commit
155
- - fix "builtin-*" references to be "builtin/*"
174
+* wk/doc-git-has-grown (2013-06-19) 1 commit
175
+ - user-manual: Update download size for Git and the kernel
176
177
Will merge to 'next'.
178
@@ -180,17 +200,42 @@ of the repositories listed at
200
$gmane/223964
201
202
183
-* rr/triangle-push-fix (2013-06-09) 4 commits
184
- - t/push-default: test pushdefault with all modes
185
- - t/push-default: generalize test_push_{success, commit}
186
- - push: make upstream, simple work with pushdefault
187
- - t/push-default: remove redundant test_config lines
188
-
189
- Tries to apply the 'push.default = upstream' semantics to
190
- triangular workflow where it does not quite apply.
191
-
192
- Waiting for a reroll.
193
- $gmane/227313
203
+* rr/triangle-push-fix (2013-06-20) 9 commits
204
+ - push: honor branch.*.push
205
+ - SQUASH??? fix git-config push.default description
206
+ - SQUASH??? minimum "simple" safety fix-up
207
+ - t/t5528-push-default: test pushdefault workflows
208
+ - t/t5528-push-default: generalize test_push_*
209
+ - push: remove dead code in setup_push_upstream()
210
+ - push: change `simple` to accommodate triangular workflows
211
+ - config doc: rewrite push.default section
212
+ - t/t5528-push-default: remove redundant test_config lines
213
+
214
+ Earlier remote.pushdefault (and per-branch branch.*.pushremote)
215
+ were introduced as an additional mechanism to choose what
216
+ repository to push into when "git push" did not say it from the
217
+ command line, to help people who push to a repository that is
218
+ different from where they fetch from. This attempts to finish that
219
+ topic by teaching the default mechanism to choose branch in the
220
+ remote repository to be updated by such a push.
221
+
222
+ The 'current', 'matching' and 'nothing' modes (specified by the
223
+ push.default configuration variable) extend to such a "triangular"
224
+ workflow naturally, but 'upstream' and 'simple' have to be updated.
225
+
226
+ . 'upstream' is about pushing back to update the branch in the
227
+ remote repository that the current branch fetches from and
228
+ integrates with, it errors out in a triangular workflow.
229
+
230
+ . 'simple' is meant to help new people by avoiding mistakes, and
231
+ will be the safe default in Git 2.0. In a non-triangular
232
+ workflow, it will continue to act as a cross between 'upstream'
233
+ and 'current' in that it pushes to the current branch's
234
+ @{upstream} only when it is set to the same name as the current
235
+ branch (e.g. your 'master' forks from the 'master' from the
236
+ central repository). In a triangular workflow, this series
237
+ tentatively defines it as the same as 'current', but we may have
238
+ to tighten it to avoid surprises in some way.
239
240
241
* jh/shorten-refname (2013-05-07) 4 commits
@@ -300,6 +345,166 @@ of the repositories listed at
345
--------------------------------------------------
346
[Cooking]
347
348
+* rr/rebase-checkout-reflog (2013-06-17) 8 commits
349
+ - SQUASH???
350
+ - rebase -i: use a better reflog message
351
+ - rebase: use a better reflog message
352
+ - checkout: respect GIT_REFLOG_ACTION
353
+ - status: do not depend on rebase reflog messages
354
+ - t/t2021-checkout-last: "checkout -" should work after a rebase finishes
355
+ - wt-status: remove unused field in grab_1st_switch_cbdata
356
+ - t7512: test "detached from" as well
357
+
358
+ Invocations of "git checkout" used internally by "git rebase" were
359
+ counted as "checkout", and affected later "git checkout -" to the
360
+ the user to an unexpected place.
361
+
362
+ Waiting for a reroll.
363
+ $gmane/228271.
364
+
365
+
366
+* rr/rebase-stash-store (2013-06-17) 5 commits
367
+ - rebase: use 'git stash store' to simplify logic
368
+ - stash: introduce 'git stash store'
369
+ - stash: simplify option parser for create
370
+ - stash doc: document short form -p in synopsis
371
+ - stash doc: add a warning about using create
372
+
373
+ Finishing touches for the "git rebase --autostash" feature
374
+ introduced earlier.
375
+
376
+ Will merge to 'next'.
377
+
378
+
379
+* rs/unpack-trees-tree-walk-conflict-field (2013-06-17) 1 commit
380
+ (merged to 'next' on 2013-06-20 at 0afbf0b)
381
+ + unpack-trees: don't shift conflicts left and right
382
+
383
+ Code clean-up.
384
+
385
+ Will merge to 'master'.
386
+
387
+
388
+* dk/maint-t5150-dirname (2013-06-17) 1 commit
389
+ (merged to 'next' on 2013-06-20 at 7441301)
390
+ + tests: allow sha1's as part of the path
391
+
392
+ Fix a test script.
393
+
394
+ Will merge to 'master'.
395
+
396
+
397
+* dk/version-gen-gitdir (2013-06-17) 1 commit
398
+ (merged to 'next' on 2013-06-20 at c9c687e)
399
+ + GIT-VERSION-GEN: support non-standard $GIT_DIR path
400
+
401
+ Allow packaging a tarball in a working tree with $GIT_DIR set elsewhere.
402
+
403
+ Will merge to 'master'.
404
+
405
+
406
+* fg/submodule-fixup (2013-06-17) 1 commit
407
+ (merged to 'next' on 2013-06-20 at 64d74b4)
408
+ + git-submodule.sh: remove duplicate call to set_rev_name
409
+
410
+ Code cleanup.
411
+
412
+ Will merge to 'master'.
413
+
414
+
415
+* jk/doc-build-move-infordir-def (2013-06-17) 2 commits
416
+ (merged to 'next' on 2013-06-20 at 81e56a8)
417
+ + Documentation/Makefile: move infodir to be with other '*dir's
418
+ + Documentation/Makefile: fix spaces around assignments
419
+
420
+ Makefile cleanup.
421
+
422
+ Will merge to 'master'.
423
+
424
+
425
+* jk/mergetool-lib-refactor (2013-06-17) 1 commit
426
+ (merged to 'next' on 2013-06-20 at 7ce98c0)
427
+ + mergetool--lib: refactor {diff,merge}_cmd logic
428
+
429
+ Code cleanup.
430
+
431
+ Will merge to 'master'.
432
+
433
+
434
+* mm/push-force-is-dangerous (2013-06-18) 1 commit
435
+ (merged to 'next' on 2013-06-20 at a6a8913)
436
+ + Documentation/git-push.txt: explain better cases where --force is dangerous
437
+
438
+ Will merge to 'master'.
439
+
440
+
441
+* nk/config-local-doc (2013-06-17) 1 commit
442
+ (merged to 'next' on 2013-06-20 at 3568ebe)
443
+ + config: Add description of --local option
444
+
445
+ Will merge to 'master'.
446
+
447
+
448
+* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
449
+ - ### DONTMERGE: needs better explanation on what config they need
450
+ - pack-refs.c: Add missing call to git_config()
451
+ - show-ref.c: Add missing call to git_config()
452
+
453
+ The changes themselves are probably good, but it is unclear what
454
+ basic setting needs to be read for which exact operation.
455
+
456
+ Waiting for clarification.
457
+ $gmane/228294
458
+
459
+
460
+* rt/cherry-pick-continue-advice-in-status (2013-06-17) 1 commit
461
+ (merged to 'next' on 2013-06-20 at ec8a930)
462
+ + wt-status: give better advice when cherry-pick is in progress
463
+
464
+ Will merge to 'master'.
465
+
466
+
467
+* bc/checkout-tracking-name-plug-leak (2013-06-18) 2 commits
468
+ - t/t9802: explicitly name the upstream branch to use as a base
469
+ - builtin/checkout.c: don't leak memory in check_tracking_name
470
+
471
+ Will merge to 'next'.
472
+
473
+
474
+* kb/diff-blob-blob-doc (2013-06-18) 1 commit
475
+ (merged to 'next' on 2013-06-20 at 34e896a)
476
+ + Documentation: Move "git diff <blob> <blob>"
477
+
478
+ Will merge to 'master'.
479
+
480
+
481
+* mm/merge-in-dirty-worktree-doc (2013-06-18) 1 commit
482
+ (merged to 'next' on 2013-06-20 at 21b3267)
483
+ + Documentation/git-merge.txt: weaken warning about uncommited changes
484
+
485
+ Will merge to 'master'.
486
+
487
+
488
+* mt/send-email-cc-match-fix (2013-06-20) 2 commits
489
+ - send-email: sanitize author when writing From line
490
+ - send-email: add test for duplicate utf8 name
491
+
492
+ Will merge to 'next'.
493
+
494
+
495
+* nk/name-rev-abbreviated-refs (2013-06-18) 1 commit
496
+ - name-rev: allow to specify a subpath for --refs option
497
+
498
+ Will merge to 'next'.
499
+
500
+
501
+* ph/builtin-srcs-are-in-subdir-these-days (2013-06-18) 1 commit
502
+ (merged to 'next' on 2013-06-20 at 7507a48)
503
+ + fix "builtin-*" references to be "builtin/*"
504
+
505
+ Will merge to 'master'.
506
+
507
+
508
* jk/submodule-subdirectory-ok (2013-06-17) 6 commits
509
- submodule: drop the top-level requirement
510
- rev-parse: add --prefix option
@@ -322,11 +527,14 @@ of the repositories listed at
527
528
529
* jh/libify-note-handling (2013-06-12) 3 commits
325
- - Move create_notes_commit() from notes-merge.c into notes-utils.c
326
- - Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c
327
- - finish_copy_notes_for_rewrite(): Let caller provide commit message
530
+ (merged to 'next' on 2013-06-20 at 7dac8b6)
531
+ + Move create_notes_commit() from notes-merge.c into notes-utils.c
532
+ + Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c
533
+ + finish_copy_notes_for_rewrite(): Let caller provide commit message
534
329
- Will merge to 'next'.
535
+ Make it possible to call into copy-notes API from the sequencer code.
536
+
537
+ Will merge to 'master'.
538
539
540
* jk/add-i-custom-diff-algo (2013-06-12) 1 commit
@@ -336,8 +544,7 @@ of the repositories listed at
544
Will merge to 'master'.
545
546
339
-* mh/ref-races (2013-06-11) 13 commits
340
- - refs: do not invalidate the packed-refs cache unnecessarily
547
+* mh/ref-races (2013-06-20) 11 commits
548
- for_each_ref: load all loose refs before packed refs
549
- get_packed_ref_cache: reload packed-refs file when it changes
550
- add a stat_validity struct
@@ -349,44 +556,37 @@ of the repositories listed at
556
- refs: wrap the packed refs cache in a level of indirection
557
- pack_refs(): split creation of packed refs and entry writing
558
- repack_without_ref(): split list curation and entry writing
352
- - Merge branch 'mh/packed-refs-various' into mh/ref-races
559
+ (this branch is used by mh/ref-races-optim-invalidate-cached.)
560
561
Will merge to 'next'.
562
563
564
* mm/rm-coalesce-errors (2013-06-12) 2 commits
358
- - rm: introduce advice.rmHints to shorten messages
359
- - rm: better error message on failure for multiple files
360
-
361
- Will merge to 'next'.
565
+ (merged to 'next' on 2013-06-20 at c70340c)
566
+ + rm: introduce advice.rmHints to shorten messages
567
+ + rm: better error message on failure for multiple files
568
363
-
364
-* rr/am-quit-empty-then-abort-fix (2013-06-17) 2 commits
365
- - t/am: use test_path_is_missing() where appropriate
366
- - am: handle stray $dotest directory
367
-
368
- Will merge to 'next'.
369
-
370
-
371
-* rs/logical-vs-binary-or (2013-06-13) 1 commit
372
- (merged to 'next' on 2013-06-14 at 2821441)
373
- + use logical OR (||) instead of binary OR (|) in logical context
374
-
375
- Code cleanup.
569
+ Give a single message followed by list of paths from "git rm" to
570
+ report multiple paths that cannot be removed.
571
572
Will merge to 'master'.
573
574
380
-* rs/match-trees-refactor (2013-06-13) 1 commit
381
- (merged to 'next' on 2013-06-14 at 1904928)
382
- + match-trees: factor out fill_tree_desc_strict
575
+* rr/am-quit-empty-then-abort-fix (2013-06-17) 2 commits
576
+ (merged to 'next' on 2013-06-20 at f9feae3)
577
+ + t/am: use test_path_is_missing() where appropriate
578
+ + am: handle stray $dotest directory
579
384
- Code cleanup.
580
+ Recent "rebase --autostash" update made it impossible to recover
581
+ with "git am --abort" from a repository where "git am" without mbox
582
+ was run by mistake and then was killed with "^C".
583
584
Will merge to 'master'.
585
586
389
-* fg/submodule-non-ascii-path (2013-06-14) 1 commit
587
+* fg/submodule-non-ascii-path (2013-06-20) 2 commits
588
+ (merged to 'next' on 2013-06-20 at 122c0b2)
589
+ + t7400: test of UTF-8 submodule names pass under Mac OS
590
(merged to 'next' on 2013-06-17 at a0b9fa3)
591
+ handle multibyte characters in name
592
@@ -460,11 +660,15 @@ of the repositories listed at
660
661
662
* rr/rebase-sha1-by-string-query (2013-06-14) 3 commits
463
- - rebase: use peel_committish() where appropriate
464
- - sh-setup: add new peel_committish() helper
465
- - t/rebase: add failing tests for a peculiar revision
663
+ (merged to 'next' on 2013-06-20 at d0742fe)
664
+ + rebase: use peel_committish() where appropriate
665
+ + sh-setup: add new peel_committish() helper
666
+ + t/rebase: add failing tests for a peculiar revision
667
467
- Will merge to 'next'.
668
+ Allow various commit objects to be given to "git rebase" by ':/look
669
+ for this string' syntax, e.g. "git rebase --onto ':/there'".
670
+
671
+ Will merge to 'master'.
672
673
674
* jk/unpack-entry-fallback-to-another (2013-06-14) 2 commits
@@ -490,48 +694,6 @@ of the repositories listed at
694
Needs a test or two.
695
696
493
-* fc/makefile (2013-06-09) 4 commits
494
- (merged to 'next' on 2013-06-14 at 75b5f6b)
495
- + Makefile: use $^ to avoid listing prerequisites on the command line
496
- + build: do not install git-remote-testgit
497
- + build: generate and clean test scripts
498
- + Merge branch 'js/transport-helper-error-reporting-fix' into fc/makefile
499
-
500
- Makefile simplification.
501
-
502
- Will merge to 'master'.
503
-
504
-
505
-* fc/show-non-empty-errors-in-test (2013-06-09) 1 commit
506
- (merged to 'next' on 2013-06-14 at 99b6b54)
507
- + test: test_must_be_empty helper
508
-
509
- Will merge to 'master'.
510
-
511
-
512
-* nd/traces (2013-06-09) 2 commits
513
- (merged to 'next' on 2013-06-14 at ce0d897)
514
- + git.txt: document GIT_TRACE_PACKET
515
- + core: use env variable instead of config var to turn on logging pack access
516
-
517
- Will merge to 'master'.
518
-
519
-
520
-* rs/discard-index-discard-array (2013-06-09) 2 commits
521
- (merged to 'next' on 2013-06-14 at 778ea9b)
522
- + read-cache: free cache in discard_index
523
- + read-cache: add simple performance test
524
-
525
- Will merge to 'master'.
526
-
527
-
528
-* cm/remote-mediawiki (2013-06-11) 1 commit
529
- (merged to 'next' on 2013-06-15 at bdce58e)
530
- + git-remote-mediawiki: display message when launched directly
531
-
532
- Will merge to 'master'.
533
-
534
-
697
* jg/status-config (2013-06-15) 2 commits
698
(merged to 'next' on 2013-06-15 at 2bc6547)
699
+ status: introduce status.branch to enable --branch by default
@@ -540,9 +702,8 @@ of the repositories listed at
702
Will merge to 'master'.
703
704
543
-* mh/loose-refs-race-with-pack-ref (2013-06-11) 4 commits
705
+* mh/loose-refs-race-with-pack-ref (2013-06-19) 3 commits
706
- resolve_ref_unsafe(): close race condition reading loose refs
545
- - resolve_ref_unsafe(): nest reference-reading code in an infinite loop
707
- resolve_ref_unsafe(): handle the case of an SHA-1 within loop
708
- resolve_ref_unsafe(): extract function handle_missing_loose_ref()
709
@@ -563,28 +724,11 @@ of the repositories listed at
724
725
726
* fc/sequencer-plug-leak (2013-06-06) 2 commits
566
- - sequencer: avoid leaking message buffer when refusing to create an empty commit
567
- - sequencer: remove useless indentation
568
-
569
- Will merge to 'next'.
727
+ (merged to 'next' on 2013-06-20 at 3c94075)
728
+ + sequencer: avoid leaking message buffer when refusing to create an empty commit
729
+ + sequencer: remove useless indentation
730
571
-
572
-* js/test-ln-s-add (2013-06-07) 10 commits
573
- (merged to 'next' on 2013-06-14 at 9f58cb1)
574
- + t4011: remove SYMLINKS prerequisite
575
- + t6035: use test_ln_s_add to remove SYMLINKS prerequisite
576
- + t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite
577
- + t3100: use test_ln_s_add to remove SYMLINKS prerequisite
578
- + t3030: use test_ln_s_add to remove SYMLINKS prerequisite
579
- + t0000: use test_ln_s_add to remove SYMLINKS prerequisite
580
- + tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
581
- + tests: introduce test_ln_s_add
582
- + t3010: modernize style
583
- + test-chmtime: Fix exit code on Windows
584
-
585
- Many tests that check the behaviour of symbolic links stored in the
586
- index or the tree objects do not have to be skipped on a filesystem
587
- that lack symbolic link support.
731
+ Plug a small leak in an error codepath.
732
733
Will merge to 'master'.
734
@@ -604,24 +748,14 @@ of the repositories listed at
748
Will merge to 'master'.
749
750
607
-* nd/make-wildmatch-default (2013-06-02) 1 commit
608
- (merged to 'next' on 2013-06-14 at cf21faa)
609
- + Makefile: promote wildmatch to be the default fnmatch implementation
610
-
611
- Will merge to 'master'.
612
-
613
-
614
-* ap/diff-ignore-blank-lines (2013-06-17) 1 commit
751
+* ap/diff-ignore-blank-lines (2013-06-19) 1 commit
752
- diff: add --ignore-blank-lines option
753
754
"git diff" learned a mode that ignores hunks whose change consists
755
only of additions and removals of blank lines, which is the same as
756
"diff -B" (ignore blank lines) of GNU diff.
757
621
- There still is a small bug.
622
-
623
- Waiting for a reroll.
624
- $gmane/228117
758
+ Will merge to 'next'.
759
760
761
* jx/clean-interactive (2013-06-03) 15 commits
@@ -663,17 +797,6 @@ of the repositories listed at
797
Will merge to 'next'.
798
799
666
-* mm/color-auto-default (2013-06-10) 2 commits
667
- (merged to 'next' on 2013-06-14 at 0647576)
668
- + make color.ui default to 'auto'
669
- + config: refactor management of color.ui's default value
670
-
671
- Flip the default for color.ui to 'auto', which is what many
672
- tutorials recommend new users to do.
673
-
674
- Will merge to 'master'.
675
-
676
-
800
* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit
801
- git add: -u/-A now affects the entire working tree
802