What's cooking (2013/01 #01)
Junio C Hamano committed
Jan 1, 2013 at 23:50 UTC
54f4a1fb129e407d7c91a2e6434e2424a33302c5
1 file changed
+170
-106
whats-cooking.txt
+170
-106
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Dec 2012, #08; Mon, 31)
3
+Subject: What's cooking in git.git (Jan 2013, #01; Tue, 1)
4
X-master-at: 5d417842efeafb6e109db7574196901c4e95d273
5
-X-next-at: 5c4490978f33dace9da10b75b75e415967d34b0f
5
+X-next-at: 8c633a54c4512b0a738750d9713cb0b5370100ba
6
7
-What's cooking in git.git (Dec 2012, #08; Mon, 31)
7
+What's cooking in git.git (Jan 2013, #01; Tue, 1)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -17,58 +17,73 @@ during the pre-release freeze earlier than the others so that they
17
can orderly be merged to 'master' after the dust settles, probably
18
towards the end of this week.
19
20
+Note that many topics that have been marked as "Will cook in next"
21
+have been recategorized to be merged to 'master' soonish, and a few
22
+topics have been marked to be kicked back to 'pu'. Please holler if
23
+a topic that still has unresolved issues is marked to be merged to
24
+'master' by mistake.
25
+
26
You can find the changes described here in the integration branches of the
27
repositories listed at
28
29
http://git-blame.blogspot.com/p/git-public-repositories.html
30
25
---------------------------------------------------
26
-[Graduated to "master"]
27
-
28
-* so/prompt-command (2012-12-26) 1 commit
29
- (merged to 'next' on 2012-12-26 at 27c5683)
30
- + make __git_ps1 accept a third parameter in pcmode
31
-
32
- Gives the same degree of customizability to the new prompt command
33
- mode users as the command substitution mode has.
34
-
31
--------------------------------------------------
32
[New Topics]
33
38
-* ap/status-ignored-in-ignored-directory (2012-12-26) 1 commit
39
- - wt-status: Show ignored files in untracked dirs
34
+* jc/submittingpatches (2013-01-01) 3 commits
35
+ - SubmittingPatches: remove overlong checklist
36
+ - SubmittingPatches: mention subsystems with dedicated repositories
37
+ - SubmittingPatches: who am I and who cares?
38
41
- A topic still in flux; will be redone.
39
+ Will reroll.
40
41
44
-* ta/remove-stale-translated-tut (2012-12-27) 1 commit
45
- - Remove Documentation/pt_BR/gittutorial.txt
42
+* kb/maint-bundle-doc (2013-01-01) 2 commits
43
+ - Documentation: full-ness of a bundle is significant for cloning
44
+ - Documentation: correct example restore from bundle
45
47
- Remove a translation of a document that was left stale.
46
+ Will merge to 'next'.
47
48
50
-* er/stop-recommending-parsecvs (2012-12-28) 1 commit
51
- - Remove the suggestion to use parsecvs, which is currently broken.
49
+* nd/maint-branch-desc-doc (2013-01-01) 3 commits
50
+ - branch: delete branch description if it's empty
51
+ - format-patch: pick up branch description when no ref is specified
52
+ - config.txt: a few lines about branch.<name>.description
53
53
- Stop recommending a defunct third-party software.
54
+ Waiting for a reroll.
55
56
56
-* as/test-name-alias-uniquely (2012-12-28) 1 commit
57
- - Use longer alias names in subdirectory tests
57
+* tb/test-t9020-no-which (2013-01-01) 1 commit
58
+ - t9020: which is not portable
59
59
- A few short-and-bland aliases used in the tests were interfering
60
- with git-custom command in user's $PATH.
60
+ Will merge to 'next'.
61
62
63
-* jc/maint-fmt-merge-msg-no-edit-lose-credit (2012-12-28) 1 commit
64
- - merge --no-edit: do not credit people involved in the side branch
63
+* tb/test-t9810-no-sed-i (2013-01-01) 1 commit
64
+ - t9810: Do not use sed -i
65
66
- Stop spending cycles to compute information to be placed on
67
- commented lines in "merge --no-edit".
66
+ Will merge to 'next'.
67
68
--------------------------------------------------
69
[Stalled]
70
71
+* jl/submodule-deinit (2012-12-04) 1 commit
72
+ (merged to 'next' on 2012-12-07 at ea772f0)
73
+ + submodule: add 'deinit' command
74
+
75
+ There was no Porcelain way to say "I no longer am interested in
76
+ this submodule", once you express your interest in a submodule with
77
+ "submodule init". "submodule deinit" is the way to do so.
78
+
79
+ But this does not yet do so (does not remove the checkout of the
80
+ submodule). The design discussion petered out.
81
+
82
+ http://thread.gmane.org/gmane.comp.version-control.git/210867/focus=211456
83
+
84
+ Will kick back to 'pu'.
85
+
86
+
87
* jc/doc-maintainer (2012-11-27) 1 commit
88
- update "howto maintain git"
89
@@ -117,9 +132,10 @@ repositories listed at
132
* aw/rebase-am-failure-detection (2012-10-11) 1 commit
133
- rebase: Handle cases where format-patch fails
134
120
- I am unhappy a bit about the possible performance implications of
121
- having to store the output in a temporary file only for a rare case
122
- of format-patch aborting.
135
+ Save output from format-patch command in a temporary file, just in
136
+ case it aborts, to give a better failure-case behaviour.
137
+
138
+ Will merge to 'next'.
139
140
141
* jk/lua-hackery (2012-10-07) 6 commits
@@ -148,6 +164,8 @@ repositories listed at
164
165
Comment from Pete will need to be addressed in a follow-up patch.
166
167
+ Will kick back to 'pu'.
168
+
169
170
* jc/maint-name-rev (2012-09-17) 7 commits
171
- describe --contains: use "name-rev --algorithm=weight"
@@ -224,7 +242,7 @@ repositories listed at
242
often attempt to use 'origin'. This can now be customized via a
243
configuration variable.
244
227
- Expecting a re-roll.
245
+ Expecting a reroll.
246
247
"The first remote becomes the default" bit is better done as a
248
separate step.
@@ -232,6 +250,47 @@ repositories listed at
250
--------------------------------------------------
251
[Cooking]
252
253
+* ap/status-ignored-in-ignored-directory (2013-01-01) 2 commits
254
+ - git-status: Test --ignored behavior
255
+ - dir.c: Make git-status --ignored more consistent
256
+
257
+ Will merge to 'next'.
258
+
259
+
260
+* ta/remove-stale-translated-tut (2012-12-27) 1 commit
261
+ - Remove Documentation/pt_BR/gittutorial.txt
262
+
263
+ Remove a translation of a document that was left stale.
264
+
265
+ Will merge to 'next'.
266
+
267
+
268
+* er/stop-recommending-parsecvs (2012-12-28) 1 commit
269
+ - Remove the suggestion to use parsecvs, which is currently broken.
270
+
271
+ Stop recommending a defunct third-party software.
272
+
273
+ Will merge to 'next'.
274
+
275
+
276
+* as/test-name-alias-uniquely (2012-12-28) 1 commit
277
+ - Use longer alias names in subdirectory tests
278
+
279
+ A few short-and-bland aliases used in the tests were interfering
280
+ with git-custom command in user's $PATH.
281
+
282
+ Will merge to 'next'.
283
+
284
+
285
+* jc/maint-fmt-merge-msg-no-edit-lose-credit (2012-12-28) 1 commit
286
+ - merge --no-edit: do not credit people involved in the side branch
287
+
288
+ Stop spending cycles to compute information to be placed on
289
+ commented lines in "merge --no-edit".
290
+
291
+ Will merge to 'next'.
292
+
293
+
294
* as/check-ignore (2012-12-28) 19 commits
295
- Add git-check-ignore sub-command
296
- setup.c: document get_pathspec()
@@ -278,7 +337,7 @@ repositories listed at
337
+ git-subtree: fix typo in manpage
338
+ git-subtree: ignore git-subtree executable
339
281
- Will cook in 'next'.
340
+ Will merge to 'master' in the first batch.
341
342
343
* mz/pick-unborn (2012-12-23) 2 commits
@@ -288,29 +347,32 @@ repositories listed at
347
Will merge to 'next'.
348
349
291
-* nd/retire-fnmatch (2012-12-22) 8 commits
350
+* nd/retire-fnmatch (2013-01-01) 7 commits
351
+ - Makefile: add USE_WILDMATCH to use wildmatch as fnmatch
352
- wildmatch: advance faster in <asterisk> + <literal> patterns
353
- wildmatch: make a special case for "*/" with FNM_PATHNAME
294
- - Makefile: add USE_WILDMATCH to use wildmatch as fnmatch
354
- test-wildmatch: add "perf" command to compare wildmatch and fnmatch
355
- wildmatch: support "no FNM_PATHNAME" mode
356
- wildmatch: make dowild() take arbitrary flags
357
- wildmatch: rename constants and update prototype
299
- - compat/fnmatch: respect NO_FNMATCH* even on glibc
358
(this branch uses nd/wildmatch.)
359
360
Replace our use of fnmatch(3) with a more feature-rich wildmatch.
361
+ A handful patches at the bottom have been moved to nd/wildmatch to
362
+ graduate as part of that branch, before this series solidifies.
363
+
364
+ Will merge to 'next'.
365
366
367
* jc/test-cvs-no-init-in-existing-dir (2012-12-24) 1 commit
368
(merged to 'next' on 2012-12-26 at 3b93f37)
369
+ t9200: let "cvs init" create the test repository
370
309
- Will cook in 'next'.
371
+ Will merge to 'master' in the first batch.
372
373
312
-* os/gitweb-highlight-uncaptured (2012-12-26) 1 commit
313
- - gitweb: fix error when highlight is enabled
374
+* os/gitweb-highlight-uncaptured (2013-01-01) 1 commit
375
+ - gitweb: fix error in sanitize when highlight is enabled
376
377
Will merge to 'next'.
378
@@ -333,6 +395,8 @@ repositories listed at
395
The --graph code fell into infinite loop when asked to do what the
396
code did not expect ;-)
397
398
+ Will merge to 'master' in the first batch.
399
+
400
401
* jc/mkstemp-more-careful-error-reporting (2012-12-18) 1 commit
402
(merged to 'next' on 2012-12-22 at 18cdaf0)
@@ -342,6 +406,8 @@ repositories listed at
406
use it to report what filename we failed to create incorrectly used
407
the buffer munged by failing mkstemp().
408
409
+ Will merge to 'master' in the first batch.
410
+
411
412
* jc/maint-test-portability (2012-12-19) 3 commits
413
(merged to 'next' on 2012-12-22 at daeed53)
@@ -353,6 +419,8 @@ repositories listed at
419
Minor test fixes noticed while running our tests on OpenBSD 5.2,
420
applicable to 'maint'.
421
422
+ Will merge to 'master' in the first batch.
423
+
424
425
* jc/test-portability (2012-12-19) 3 commits
426
(merged to 'next' on 2012-12-22 at 123041b)
@@ -363,6 +431,8 @@ repositories listed at
431
432
The remainder of jc/maint-test-portability, applicable to 'master'.
433
434
+ Will merge to 'master' in the first batch.
435
+
436
437
* jc/maint-fnmatch-old-style-definition (2012-12-19) 1 commit
438
(merged to 'next' on 2012-12-22 at 540df2c)
@@ -371,6 +441,8 @@ repositories listed at
441
Update old-style function definition "int foo(bar) int bar; {}"
442
to "int foo(int bar) {}".
443
444
+ Will merge to 'master' in the first batch.
445
+
446
447
* jk/pathspec-literal (2012-12-19) 1 commit
448
(merged to 'next' on 2012-12-22 at c794bd6)
@@ -379,6 +451,8 @@ repositories listed at
451
Allow scripts to feed literal paths to commands that take
452
pathspecs, by disabling wildcard globbing.
453
454
+ Will merge to 'master' in the first batch.
455
+
456
457
* da/p4merge-mktemp (2012-12-26) 1 commit
458
(merged to 'next' on 2012-12-26 at 036938a)
@@ -387,10 +461,14 @@ repositories listed at
461
Create an empty file in $TMPDIR instead of using an empty file in
462
the local directory.
463
464
+ Will merge to 'master' in the first batch.
465
+
466
467
* er/python-version-requirements (2012-12-28) 1 commit
468
- Add checks to Python scripts for version dependencies.
469
470
+ Will merge to 'next'.
471
+
472
473
* mb/gitweb-highlight-link-target (2012-12-20) 1 commit
474
- Highlight the link target line in Gitweb using CSS
@@ -404,6 +482,8 @@ repositories listed at
482
483
Optimize "read-tree -m <tree-ish>" without "-u".
484
485
+ Will cook in 'next'.
486
+
487
488
* jk/repack-ref-racefix (2012-12-21) 1 commit
489
(merged to 'next' on 2012-12-22 at 03e1ca9)
@@ -411,6 +491,8 @@ repositories listed at
491
492
Race-fix for pack-refs running in parallel to ref creation.
493
494
+ Will merge to 'master' in the first batch.
495
+
496
497
* rb/http-cert-cred-no-username-prompt (2012-12-21) 1 commit
498
(merged to 'next' on 2012-12-22 at 9fc28ed)
@@ -419,6 +501,8 @@ repositories listed at
501
It is wrong to ask for username if the authentication is done by
502
certificate identity.
503
504
+ Will merge to 'master' in the first batch.
505
+
506
507
* wk/submodule-update-remote (2012-12-19) 3 commits
508
(merged to 'next' on 2012-12-22 at 7ddf897)
@@ -429,6 +513,8 @@ repositories listed at
513
The beginning of 'integrate with the tip of the remote branch, not
514
the commit recorded in the superproject gitlink' support.
515
516
+ Will merge to 'master' in the first batch.
517
+
518
519
* cc/no-gitk-build-dependency (2012-12-18) 3 commits
520
(merged to 'next' on 2012-12-22 at da7b2cf)
@@ -440,6 +526,8 @@ repositories listed at
526
subdirectory. Reimplementing the dependency tracking rules needs
527
to be done in gitk history separately.
528
529
+ Will merge to 'master' in the first batch.
530
+
531
532
* jc/format-color-auto (2012-12-17) 2 commits
533
(merged to 'next' on 2012-12-18 at 5aaac94)
@@ -449,7 +537,7 @@ repositories listed at
537
Introduce "log --format=%C(auto,blue)Foo%C(auto,reset)" that does
538
not color its output when writing to a non-terminal.
539
452
- Will cook in 'next'.
540
+ Will merge to 'master' in the first batch.
541
542
543
* ss/svn-prompt (2012-12-17) 3 commits
@@ -461,6 +549,8 @@ repositories listed at
549
Tweak the way "git svn" asks for password to be in line with the
550
rest of the system, so that the same SSH/GIT_ASKPASS can be used.
551
552
+ Will merge to 'master' in the first batch.
553
+
554
555
* zk/clean-report-failure (2012-12-17) 1 commit
556
- git-clean: Display more accurate delete messages
@@ -492,7 +582,7 @@ repositories listed at
582
applied to only a single directory itself with "path/" like the
583
exclude mechanism does.
584
495
- Will cook in 'next'.
585
+ Will merge to 'master' in the first batch.
586
587
588
* jk/mailmap-from-blob (2012-12-13) 5 commits
@@ -507,7 +597,7 @@ repositories listed at
597
of the history in bare repositories. This will help running tools
598
like shortlog in server settings.
599
510
- Will cook in 'next'.
600
+ Will merge to 'master' in the first batch.
601
602
603
* dm/port (2012-12-19) 4 commits
@@ -520,6 +610,8 @@ repositories listed at
610
611
Add a few more knobs for new platform ports can tweak.
612
613
+ Will merge to 'master' in the first batch.
614
+
615
616
* jk/complete-commit-c (2012-12-15) 1 commit
617
(merged to 'next' on 2012-12-18 at 75b5f21)
@@ -528,7 +620,7 @@ repositories listed at
620
Complete "git commmit -c foo<TAB>" into a refname that begins with
621
"foo".
622
531
- Will cook in 'next'.
623
+ Will merge to 'master' in the first batch.
624
625
626
* jk/error-const-return (2012-12-15) 2 commits
@@ -540,6 +632,8 @@ repositories listed at
632
error() always returns -1, to reduce false "variable used
633
uninitialized" warnings. Looks somewhat ugly but not too much.
634
635
+ Will merge to 'master' in the first batch.
636
+
637
638
* mk/qnx (2012-12-19) 2 commits
639
(merged to 'next' on 2012-12-22 at 0473197)
@@ -547,8 +641,9 @@ repositories listed at
641
+ Make lock local to fetch_pack
642
(this branch uses dm/port.)
643
550
- Port to QNX; we may want to rebase this on top of dm/port topic as
551
- it also wants to use the HAVE_STRINGS_H mechanism it introduces.
644
+ Port to QNX.
645
+
646
+ Will merge to 'master' in the first batch.
647
648
649
* as/test-tweaks (2012-12-20) 7 commits
@@ -564,6 +659,8 @@ repositories listed at
659
Various minor tweaks to the test framework to paint its output
660
lines in colors that match what they mean better.
661
662
+ Will merge to 'master' in the first batch.
663
+
664
665
* sp/shortlog-missing-lf (2012-12-11) 2 commits
666
(merged to 'next' on 2012-12-11 at 64b8429)
@@ -574,7 +671,7 @@ repositories listed at
671
whose length exactly is the wrap width, "git shortlog -w" failed to
672
add a newline after such a line.
673
577
- Will cook in 'next'.
674
+ Will merge to 'master' in the first batch.
675
676
677
* ap/log-mailmap (2012-12-27) 10 commits
@@ -593,7 +690,7 @@ repositories listed at
690
Clean up various codepaths around mailmap and teach the "log"
691
machinery to use it.
692
596
- Will merge to 'next'.
693
+ Waiting for further tweaks.
694
695
696
* jc/fetch-ignore-symref (2012-12-11) 1 commit
@@ -603,7 +700,7 @@ repositories listed at
700
Avoid false error from an attempt to update local symbolic ref via
701
fetch.
702
606
- Will cook in 'next'.
703
+ Will merge to 'master' in the first batch.
704
705
706
* md/gitweb-sort-by-age (2012-12-11) 1 commit
@@ -614,21 +711,21 @@ repositories listed at
711
age-sorted view, in which the users are interested in looking at
712
active projects; sorting them at the bottom makes it more useful.
713
617
- Will cook in 'next'.
714
+ Will merge to 'master' in the first batch.
715
716
717
* ss/nedmalloc-compilation (2012-12-11) 1 commit
718
(merged to 'next' on 2012-12-13 at c1f0d7f)
719
+ nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2
720
624
- Will cook in 'next'.
721
+ Will merge to 'master' in the first batch.
722
723
724
* jc/maint-fbsd-sh-ifs-workaround (2012-12-10) 1 commit
725
(merged to 'next' on 2012-12-11 at 6659fdc)
726
+ sh-setup: work around "unset IFS" bug in some shells
727
631
- Will cook in 'next'.
728
+ Will merge to 'master' in the first batch.
729
730
731
* jc/same-encoding (2012-12-10) 1 commit
@@ -638,7 +735,7 @@ repositories listed at
735
Finishing touches to the series to unify "Do we need to reencode
736
between these two encodings?" logic.
737
641
- Will cook in 'next'.
738
+ Will merge to 'master' in the first batch.
739
740
741
* nd/invalidate-i-t-a-cache-tree (2012-12-15) 4 commits
@@ -651,18 +748,7 @@ repositories listed at
748
Writing out a tree object when you still have intent-to-add entries
749
in the index left an incorrect cache-tree data there.
750
654
- Will cook in 'next'.
655
-
656
-
657
-* jl/submodule-deinit (2012-12-04) 1 commit
658
- (merged to 'next' on 2012-12-07 at ea772f0)
659
- + submodule: add 'deinit' command
660
-
661
- There was no Porcelain way to say "I no longer am interested in
662
- this submodule", once you express your interest in a submodule with
663
- "submodule init". "submodule deinit" is the way to do so.
664
-
665
- Will cook in 'next'.
751
+ Will merge to 'master' in the first batch.
752
753
754
* pf/editor-ignore-sigint (2012-12-02) 5 commits
@@ -678,10 +764,11 @@ repositories listed at
764
will take over the terminal and will block SIGINT, this is not likely
765
to confuse anyone.
766
681
- Will cook in 'next'.
767
+ Will merge to 'master' in the first batch.
768
769
684
-* bc/append-signed-off-by (2012-11-26) 11 commits
770
+* bc/append-signed-off-by (2013-01-01) 12 commits
771
+ - t4014: do not use echo -n
772
- Unify appending signoff in format-patch, commit and sequencer
773
- format-patch: update append_signoff prototype
774
- format-patch: stricter S-o-b detection
@@ -694,7 +781,7 @@ repositories listed at
781
- t/test-lib-functions.sh: allow to specify the tag name to test_commit
782
- sequencer.c: remove broken support for rfc2822 continuation in footer
783
697
- Expecting a re-roll after a review.
784
+ Expecting a reroll.
785
786
787
* mh/unify-xml-in-imap-send-and-http-push (2012-12-02) 8 commits
@@ -711,7 +798,7 @@ repositories listed at
798
Update imap-send to reuse xml quoting code from http-push codepath,
799
clean up some code, and fix a small bug.
800
714
- Will cook in 'next'.
801
+ Will merge to 'master' in the first batch.
802
803
804
* jk/fsck-dot-in-trees (2012-11-28) 2 commits
@@ -719,14 +806,14 @@ repositories listed at
806
+ fsck: warn about ".git" in trees
807
+ fsck: warn about '.' and '..' in trees
808
722
- Will cook in 'next'.
809
+ Will merge to 'master' in the first batch.
810
811
812
* mh/pthreads-autoconf (2012-11-27) 1 commit
813
(merged to 'next' on 2012-11-28 at 780600e)
814
+ configure.ac: fix pthreads detection on Mac OS X
815
729
- Will cook in 'next'.
816
+ Will merge to 'master' in the first batch.
817
818
819
* jn/warn-on-inaccessible-loosen (2012-10-14) 4 commits
@@ -736,9 +823,8 @@ repositories listed at
823
+ config: treat user and xdg config permission problems as errors
824
+ config, gitignore: failure to access with ENOTDIR is ok
825
739
- An RFC to deal with a situation where .config/git is a file and we
740
- notice .config/git/config is not readable due to ENOTDIR, not
741
- ENOENT.
826
+ Deal with a situation where .config/git is a file and we notice
827
+ .config/git/config is not readable due to ENOTDIR, not ENOENT.
828
829
Will cook in 'next'.
830
@@ -761,7 +847,7 @@ repositories listed at
847
Resurrected from Stalled; the earlier performance fear was
848
unwarranted.
849
764
- Will cook in 'next'.
850
+ Will merge to 'master' in the first batch.
851
852
853
* fc/fast-export-fixes (2012-12-03) 15 commits
@@ -782,7 +868,7 @@ repositories listed at
868
+ remote-testgit: fix direction of marks
869
+ fast-export: avoid importing blob marks
870
785
- Will cook in 'next'.
871
+ Will merge to 'master' in the first batch.
872
873
874
* jc/apply-trailing-blank-removal (2012-10-12) 1 commit
@@ -803,10 +889,14 @@ repositories listed at
889
+ pathspec: do exact comparison on the leading non-wildcard part
890
+ pathspec: save the non-wildcard length part
891
806
- Will cook in 'next'.
892
+ Will merge to 'master' in the first batch.
893
894
809
-* nd/wildmatch (2012-12-15) 15 commits
895
+* nd/wildmatch (2013-01-01) 18 commits
896
+ (merged to 'next' on 2013-01-01 at 8c633a5)
897
+ + wildmatch: replace variable 'special' with better named ones
898
+ + compat/fnmatch: respect NO_FNMATCH* even on glibc
899
+ + wildmatch: fix "**" special case
900
(merged to 'next' on 2012-12-15 at c734714)
901
+ t3070: Disable some failing fnmatch tests
902
(merged to 'next' on 2012-11-21 at 151288f)
@@ -831,11 +921,6 @@ repositories listed at
921
with double-asterisks "foo/**/bar" to match any number of directory
922
hierarchies.
923
834
- I suspect that this needs to be plugged to pathspec matching code;
835
- otherwise "git log -- 'Docum*/**/*.txt'" would not show the log for
836
- commits that touch Documentation/git.txt, which would be confusing
837
- to the users.
838
-
924
Will cook in 'next'.
925
926
@@ -854,25 +939,4 @@ repositories listed at
939
940
Require "-f" for push to update a tag, even if it is a fast-forward.
941
857
- Will cook in 'next'.
858
-
859
---------------------------------------------------
860
-[Discarded]
861
-
862
-* jc/unpack-file-in-tmpdir (2012-12-19) 1 commit
863
- . unpack-file: allow output to be in $TMPDIR
864
-
865
- Throw-away "how about this" to teach unpack-file to use $TMPDIR to
866
- store its output.
867
-
868
- Discarded, as da/p4merge-mktemp was rewritten not to require mktemp.
869
-
870
-
871
-* rj/maint-cygwin-say-color (2012-12-15) 1 commit
872
- . tests: Allow customization of how say_color() prints
873
-
874
- Even though I do not think of a cleaner way to do this, I am not
875
- happy with the way how $GIT_TEST_PRINT and $GIT_TEST_PRINT_LN are
876
- interpolated into the command line with token splitting at $IFS.
877
-
878
- Discarded, per discussion with the author.
942
+ Will merge to 'master' in the first batch.