What's cooking (2013/08 #02)
Junio C Hamano committed
Aug 5, 2013 at 15:42 UTC
7f4483d9c990b340f39bc72de179db42cf8f299c
1 file changed
+102
-70
whats-cooking.txt
+102
-70
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2013, #01; Thu, 1)
4
-X-master-at: 304852fc77847e649c746db95e9c4675c03ee567
5
-X-next-at: d151a9437b346971b08e58455c2b1333b2139cdc
3
+Subject: What's cooking in git.git (Aug 2013, #02; Mon, 5)
4
+X-master-at: fb5657082148297b61fbca7e64d51c1e7870309a
5
+X-next-at: bd48715ffb07f749d234547613e0616af41e5079
6
7
-What's cooking in git.git (Aug 2013, #01; Thu, 1)
7
+What's cooking in git.git (Aug 2013, #02; Mon, 5)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -22,53 +22,83 @@ of the repositories listed at
22
--------------------------------------------------
23
[Graduated to "master"]
24
25
-* jc/rm-submodule-error-message (2013-07-25) 1 commit
26
- + builtin/rm.c: consolidate error reporting for removing submodules
27
-
28
-
29
-* jx/clean-interactive (2013-07-24) 2 commits
30
- (merged to 'next' on 2013-07-30 at b7fd474)
31
- + git-clean: implement partial matching for selection
32
- (merged to 'next' on 2013-07-24 at 1e63bb9)
33
- + Documentation/git-clean: fix description for range
34
-
35
-
36
-* lf/echo-n-is-not-portable (2013-07-29) 1 commit
37
- (merged to 'next' on 2013-07-30 at e223ceb)
38
- + Avoid using `echo -n` anywhere
25
+* rj/cygwin-clarify-use-of-cheating-lstat (2013-07-18) 1 commit
26
+ (merged to 'next' on 2013-08-01 at 3ebfe7c)
27
+ + cygwin: Remove the Win32 l/stat() implementation
28
29
+ Cygwin port added a "not quite correct but a lot faster and good
30
+ enough for many lstat() calls that are only used to see if the
31
+ working tree entity matches the index entry" lstat() emulation some
32
+ time ago, and it started biting us in places. This removes it and
33
+ uses the standard lstat() that comes with Cygwin.
34
41
-* ma/hg-to-git (2013-07-23) 1 commit
42
- (merged to 'next' on 2013-07-30 at 1dddc06)
43
- + hg-to-git: --allow-empty-message in git commit
35
+ Recent topic that uses lstat on packed-refs file is broken when
36
+ this cheating lstat is used, and this is a simplest fix that is
37
+ also the cleanest direction to go in the long run.
38
39
+--------------------------------------------------
40
+[New Topics]
41
46
-* ms/subtree-install-fix (2013-07-30) 1 commit
47
- + contrib/subtree: Fix make install target
42
+* es/blame-L-more (2013-08-05) 11 commits
43
+ - blame: reject empty ranges -L,+0 and -L,-0
44
+ - t8001/t8002: blame: demonstrate acceptance of bogus -L,+0 and -L,-0
45
+ - blame: reject empty ranges -LX,+0 and -LX,-0
46
+ - t8001/t8002: blame: demonstrate acceptance of bogus -LX,+0 and -LX,-0
47
+ - log: fix -L bounds checking bug
48
+ - t4211: retire soon-to-be unimplementable tests
49
+ - t4211: log: demonstrate -L bounds checking bug
50
+ - blame: fix -L bounds checking bug
51
+ - t8001/t8002: blame: add empty file & partial-line tests
52
+ - t8001/t8002: blame: demonstrate -L bounds checking bug
53
+ - t8001/t8002: blame: decompose overly-large test
54
+
55
+ More fixes to the code to parse the "-L" option in "log" and "blame".
56
57
+ Will merge to and cook in 'next'.
58
50
-* ob/typofixes (2013-07-29) 1 commit
51
- (merged to 'next' on 2013-07-30 at ec2c897)
52
- + many small typofixes
59
54
---------------------------------------------------
55
-[New Topics]
60
+* jk/cat-file-batch-optim (2013-08-05) 1 commit
61
+ - cat-file: only split on whitespace when %(rest) is used
62
57
-* mb/docs-favor-en-us (2013-08-01) 1 commit
58
- - Provide some linguistic guidance for the documentation.
63
+ Rework the reverted change to `cat-file --batch-check`.
64
65
Will merge to and cook in 'next'.
66
67
63
-* jc/parseopt-command-modes (2013-07-30) 2 commits
64
- - tag: use OPT_CMDMODE
65
- - parse-options: add OPT_CMDMODE()
66
-
67
- Many commands use --dashed-option as a operation mode selector
68
- (e.g. "git tag --delete") that the user can use at most one
69
- (e.g. "git tag --delete --verify" is a nonsense) and you cannot
70
- negate (e.g. "git tag --no-delete" is a nonsense). Make it easier
71
- for users of parse_options() to enforce these restrictions.
68
+* jn/post-receive-utf8 (2013-08-05) 3 commits
69
+ - hooks/post-receive-email: set declared encoding to utf-8
70
+ - hooks/post-receive-email: force log messages in UTF-8
71
+ - hooks/post-receive-email: use plumbing instead of git log/show
72
+
73
+ Update post-receive-email script to make sure the message contents
74
+ and pathnames are encoded consistently in UTF-8.
75
+
76
+ I have a feeling that it is a lost cause to solve the issue the
77
+ topic tries to address in general, because the patch text can have
78
+ payload in any encodings that are different from either the
79
+ pathnames or the log message. Patches that touch paths that use an
80
+ encoding that conflicts with the encoding of the payload and/or the
81
+ log message could be transferred with core.quotepath set and patch
82
+ generated as all binary, but that would be pretty much useless.
83
+
84
+
85
+* sb/parseopt-boolean-removal (2013-08-05) 9 commits
86
+ - revert: use the OPT_CMDMODE for parsing, reducing code
87
+ - checkout-index: Fix negations of even numbers of -n
88
+ - config parsing options: allow one flag multiple times
89
+ - hash-object: Replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP
90
+ - branch, commit, name-rev: ease up boolean conditions
91
+ - checkout: remove superfluous local variable
92
+ - log, format-patch: parsing uses OPT__QUIET
93
+ - Replace deprecated OPT_BOOLEAN by OPT_BOOL
94
+ - Remove deprecated OPTION_BOOLEAN for parsing arguments
95
+ (this branch uses jc/parseopt-command-modes.)
96
+
97
+ Convert most uses of OPT_BOOLEAN/OPTION_BOOLEAN that can use
98
+ OPT_BOOL/OPTION_BOOLEAN which have much saner semantics, and turn
99
+ remaining ones into OPT_SET_INT, OPT_COUNTUP, etc. as necessary;
100
+ there seems to be some misconversion that makes many tests fail,
101
+ though.
102
103
--------------------------------------------------
104
[Stalled]
@@ -178,7 +208,26 @@ of the repositories listed at
208
--------------------------------------------------
209
[Cooking]
210
181
-* tr/log-full-diff-keep-true-parents (2013-08-01) 1 commit
211
+* mb/docs-favor-en-us (2013-08-01) 1 commit
212
+ - Provide some linguistic guidance for the documentation.
213
+
214
+ Will merge to and cook in 'next'.
215
+
216
+
217
+* jc/parseopt-command-modes (2013-07-30) 2 commits
218
+ - tag: use OPT_CMDMODE
219
+ - parse-options: add OPT_CMDMODE()
220
+ (this branch is used by sb/parseopt-boolean-removal.)
221
+
222
+ Many commands use --dashed-option as a operation mode selector
223
+ (e.g. "git tag --delete") that the user can use at most one
224
+ (e.g. "git tag --delete --verify" is a nonsense) and you cannot
225
+ negate (e.g. "git tag --no-delete" is a nonsense). Make it easier
226
+ for users of parse_options() to enforce these restrictions.
227
+
228
+
229
+* tr/log-full-diff-keep-true-parents (2013-08-05) 2 commits
230
+ - log: use true parents for diff when walking reflogs
231
- log: use true parents for diff even when rewriting
232
233
Output from "git log --full-diff -- <pathspec>" looked strange,
@@ -186,22 +235,20 @@ of the repositories listed at
235
the specified <pathspec>, causing the patches for paths outside the
236
pathspec to show more than the single commit has changed.
237
189
- I am not sure if that is necessarily a problem, though. Output
190
- from "git log --full-diff -2 -- <pathspec>" without this change
191
- will be applicable to some codebase, but after this change that
192
- will no longer be true (you will get only tiny parts of the change
193
- that were made by the two commits in question, while missing all
194
- the other changes).
238
+ Tweak "git reflog -p" for the same reason using the same mechanism.
239
240
197
-* bc/unuse-packfile (2013-08-01) 2 commits
241
+* bc/unuse-packfile (2013-08-02) 2 commits
242
- Don't close pack fd when free'ing pack windows
243
- sha1_file: introduce close_one_pack() to close packs on fd pressure
244
245
Will merge to and cook in 'next'.
246
247
204
-* da/darwin (2013-07-30) 1 commit
248
+* da/darwin (2013-08-05) 3 commits
249
+ (merged to 'next' on 2013-08-05 at 5c54cfa)
250
+ + OS X: Fix redeclaration of die warning
251
+ + Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1
252
(merged to 'next' on 2013-08-01 at d151a94)
253
+ imap-send: use Apple's Security framework for base64 encoding
254
@@ -255,7 +302,9 @@ of the repositories listed at
302
Will cook in 'next'.
303
304
258
-* db/http-savecookies (2013-07-30) 1 commit
305
+* db/http-savecookies (2013-08-05) 2 commits
306
+ (merged to 'next' on 2013-08-05 at be6f3a3)
307
+ + t5551: Remove header from curl cookie file
308
(merged to 'next' on 2013-07-30 at d2ad6e5)
309
+ http: add http.savecookies option to write out HTTP cookies
310
@@ -428,7 +477,10 @@ of the repositories listed at
477
Will hold, until we get any user.
478
479
431
-* jc/push-cas (2013-08-01) 7 commits
480
+* jc/push-cas (2013-08-02) 9 commits
481
+ (merged to 'next' on 2013-08-05 at 34f4cf3)
482
+ + push: teach --force-with-lease to smart-http transport
483
+ + send-pack: fix parsing of --force-with-lease option
484
(merged to 'next' on 2013-08-01 at a7604ee)
485
+ t5540/5541: smart-http does not support "--force-with-lease"
486
(merged to 'next' on 2013-07-23 at 72371b0)
@@ -453,9 +505,6 @@ of the repositories listed at
505
defeating the safety pretty easily). It is suitable only for the
506
simplest workflows, and it may hurt users more than it helps them.
507
456
- Also, smart-http needs to be taught about this before we can move
457
- it forward.
458
-
508
Will cook in 'next'.
509
510
@@ -477,23 +526,6 @@ of the repositories listed at
526
Will cook in 'next'.
527
528
480
-* rj/cygwin-clarify-use-of-cheating-lstat (2013-07-18) 1 commit
481
- (merged to 'next' on 2013-08-01 at 3ebfe7c)
482
- + cygwin: Remove the Win32 l/stat() implementation
483
-
484
- Cygwin port added a "not quite correct but a lot faster and good
485
- enough for many lstat() calls that are only used to see if the
486
- working tree entity matches the index entry" lstat() emulation some
487
- time ago, and it started biting us in places. This removes it and
488
- uses the standard lstat() that comes with Cygwin.
489
-
490
- Recent topic that uses lstat on packed-refs file is broken when
491
- this cheating lstat is used, and this is a simplest fix that is
492
- also the cleanest direction to go in the long run.
493
-
494
- Will merge to 'master'.
495
-
496
-
529
* jc/reflog-doc (2013-06-19) 1 commit
530
- setup_reflog_action: document the rules for using GIT_REFLOG_ACTION
531