What's cooking (2015/03 #02)
Junio C Hamano committed
Mar 5, 2015 at 14:37 UTC
ab98356d172a27e5ffcf7496be0fddf838f0114c
1 file changed
+270
-219
whats-cooking.txt
+270
-219
@@ -1,19 +1,20 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2015, #01; Mon, 2)
4
-X-master-at: 7f4ba4b6e3ba7075ca6b379ba23fd3088cbe69a8
5
-X-next-at: 993ae8bdc3df206f62a424eb695a49f1ba8fa118
3
+Subject: What's cooking in git.git (Mar 2015, #02; Thu, 5)
4
+X-master-at: 83036f8541ad8999974863db9d2ac02a814e6395
5
+X-next-at: e3086922e7b3f8f159b5b6631ba0052d0b37bcfc
6
7
-What's cooking in git.git (Mar 2015, #01; Mon, 2)
7
+What's cooking in git.git (Mar 2015, #02; Thu, 5)
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
-Fifth batch of topics have been merged to 'master', including both
15
-fixes and enhancements. First maintenance release for v2.3 was cut
16
-with many fixes that have already been merged to 'master'.
14
+A few more batches of topics have been merged to 'master', including
15
+both fixes and enhancements. First maintenance release for v2.3 was
16
+cut with many fixes that have already been merged to 'master', and
17
+the v2.3.2 will also appear shortly.
18
19
You can find the changes described here in the integration branches
20
of the repositories listed at
@@ -21,82 +22,215 @@ of the repositories listed at
22
http://git-blame.blogspot.com/p/git-public-repositories.html
23
24
--------------------------------------------------
24
-[New Topics]
25
+[Graduated to "master"]
26
27
* ew/svn-fixes (2015-02-26) 2 commits
27
- - Merge branch 'svn-maint-fixes' into svn-fixes
28
- - git-svn: lazy load some modules
28
+ (merged to 'next' on 2015-03-03 at 18e4684)
29
+ + Merge branch 'svn-maint-fixes' into svn-fixes
30
+ + git-svn: lazy load some modules
31
(this branch uses ew/svn-maint-fixes.)
32
31
- Will merge to 'next'.
32
-
33
34
* ew/svn-maint-fixes (2015-02-26) 2 commits
35
- - Git::SVN::*: avoid premature FileHandle closure
36
- - git-svn: fix localtime=true on non-glibc environments
35
+ (merged to 'next' on 2015-03-03 at 776b563)
36
+ + Git::SVN::*: avoid premature FileHandle closure
37
+ + git-svn: fix localtime=true on non-glibc environments
38
(this branch is used by ew/svn-fixes.)
39
39
- Will merge to 'next' and soon to 'master'.
40
+ Correct a breakage to git-svn around v2.2 era that triggers
41
+ premature closing of FileHandle.
42
43
42
-* mr/doc-clean-f-f (2015-02-26) 1 commit
43
- - Documentation/git-clean.txt: document that -f may need to be given twice
44
+* jc/apply-beyond-symlink (2015-02-10) 4 commits
45
+ (merged to 'next' on 2015-02-18 at 4109de1)
46
+ + apply: do not touch a file beyond a symbolic link
47
+ + apply: do not read from beyond a symbolic link
48
+ + apply: do not read from the filesystem under --index
49
+ + apply: reject input that touches outside the working area
50
45
- Will merge to 'next'.
51
+ "git apply" was not very careful about reading from, removing,
52
+ updating and creating paths outside the working tree (under
53
+ --index/--cached) or the current directory (when used as a
54
+ replacement for GNU patch).
55
56
48
-* ye/http-accept-language (2015-02-26) 1 commit
49
- - gettext.c: move get_preferred_languages() from http.c
57
+* jc/apply-ws-fix-expands-report (2015-01-22) 1 commit
58
+ (merged to 'next' on 2015-02-18 at b571668)
59
+ + apply: detect and mark whitespace errors in context lines when fixing
60
51
- Compilation fix for a recent topic in 'master'.
61
+ "git apply --whitespace=fix" fixed whitespace errors in the common
62
+ context lines but did so without reporting.
63
53
- Will merge to 'next'.
64
65
+* jc/diff-test-updates (2015-02-23) 7 commits
66
+ (merged to 'next' on 2015-02-23 at 9e863a7)
67
+ + test_ln_s_add: refresh stat info of fake symbolic links
68
+ (merged to 'next' on 2015-02-18 at f152c9f)
69
+ + t4008: modernise style
70
+ + t/diff-lib: check exact object names in compare_diff_raw
71
+ + tests: do not borrow from COPYING and README from the real source
72
+ + t4010: correct expected object names
73
+ + t9300: correct expected object names
74
+ + t4008: correct stale comments
75
+ (this branch is used by jc/diff-b-m.)
76
56
-* jk/diffcore-rename-duplicate (2015-02-27) 2 commits
57
- - diffcore-rename: avoid processing duplicate destinations
58
- - diffcore-rename: split locate_rename_dst into two functions
77
+ Test clean-up.
78
60
- A corrupt input to "git diff -M" can cause us to segfault.
79
62
- Will merge to 'next'.
80
+* jk/daemon-interpolate (2015-02-17) 3 commits
81
+ (merged to 'next' on 2015-02-20 at 21118a7)
82
+ + daemon: sanitize incoming virtual hostname
83
+ + t5570: test git-daemon's --interpolated-path option
84
+ + git_connect: let user override virtual-host we send to daemon
85
86
+ The "interpolated-path" option of "git daemon" inserted any string
87
+ client declared on the "host=" capability request without checking.
88
+ Sanitize and limit %H and %CH to a saner and a valid DNS name.
89
65
-* nd/grep-exclude-standard-help-fix (2015-02-27) 1 commit
66
- - grep: correct help string for --exclude-standard
90
68
- Will merge to 'next'.
91
+* km/send-email-getopt-long-workarounds (2015-02-16) 1 commit
92
+ (merged to 'next' on 2015-02-18 at 84c1597)
93
+ + git-send-email.perl: support no- prefix with older GetOptions
94
95
+ Even though we officially haven't dropped Perl 5.8 support, the
96
+ Getopt::Long package that came with it does not support "--no-"
97
+ prefix to negate a boolean option; manually add support to help
98
+ people with older Getopt::Long package.
99
71
-* nd/versioncmp-prereleases (2015-02-27) 1 commit
72
- - versionsort: support reorder prerelease suffixes
100
74
- The versionsort.prerelease configuration variable can be used to
75
- specify that v1.0-pre1 comes before v1.0.
101
+* mh/refs-have-new (2015-02-17) 13 commits
102
+ (merged to 'next' on 2015-02-23 at b8929db)
103
+ + refs.h: remove duplication in function docstrings
104
+ + update_ref(): improve documentation
105
+ + ref_transaction_verify(): new function to check a reference's value
106
+ + ref_transaction_delete(): check that old_sha1 is not null_sha1
107
+ + ref_transaction_create(): check that new_sha1 is valid
108
+ + commit: avoid race when creating orphan commits
109
+ + commit: add tests of commit races
110
+ + ref_transaction_delete(): remove "have_old" parameter
111
+ + ref_transaction_update(): remove "have_old" parameter
112
+ + struct ref_update: move "have_old" into "flags"
113
+ + refs.c: change some "flags" to "unsigned int"
114
+ + refs: remove the gap in the REF_* constant values
115
+ + refs: move REF_DELETING to refs.c
116
77
- Will merge to 'next'.
117
+ Simplify the ref transaction API around how "the ref should be
118
+ pointing at this object" is specified.
119
120
80
-* ja/clean-confirm-i18n (2015-03-02) 1 commit
81
- - Add hint interactive cleaning
121
+* mm/am-c-doc (2015-02-20) 2 commits
122
+ (merged to 'next' on 2015-02-23 at 1cd9b0f)
123
+ + Documentation/git-am.txt: mention mailinfo.scissors config variable
124
+ + Documentation/config.txt: document mailinfo.scissors
125
83
- The prompt string "remove?" used when "git clean -i" asks the user
84
- if a path should be removed was localizable, but the code always
85
- expects a substring of "yes" to tell it to go ahead. Always show
86
- [y/N] as part of this prompt to hint that the answer is not (yet)
87
- localized.
126
+ The configuration variable 'mailinfo.scissors' was hard to
127
+ discover in the documentation.
128
89
- Will merge to 'next'.
129
130
+* rj/no-xopen-source-for-cygwin (2015-02-22) 1 commit
131
+ (merged to 'next' on 2015-02-23 at 323ac75)
132
+ + git-compat-util.h: remove redundant code
133
92
-* mk/diff-shortstat-dirstat-fix (2015-03-02) 1 commit
93
- - diff --shortstat --dirstat: remove duplicate output
134
+ Code cleanups.
135
+
136
+
137
+* rs/daemon-interpolate (2015-02-17) 2 commits
138
+ (merged to 'next' on 2015-02-18 at c0f5750)
139
+ + daemon: use callback to build interpolated path
140
+ + daemon: look up client-supplied hostname lazily
141
+
142
+ "git daemon" looked up the hostname even when "%CH" and "%IP"
143
+ interpolations are not requested, which was unnecessary.
144
+
145
+
146
+* rs/simple-cleanups (2015-02-22) 4 commits
147
+ (merged to 'next' on 2015-02-23 at a89f034)
148
+ + sha1_name: use strlcpy() to copy strings
149
+ + pretty: use starts_with() to check for a prefix
150
+ + for-each-ref: use skip_prefix() to avoid duplicate string comparison
151
+ + connect: use strcmp() for string comparison
152
+
153
+ Code cleanups.
154
+
155
+
156
+* tb/connect-ipv6-parse-fix (2015-02-22) 3 commits
157
+ (merged to 'next' on 2015-02-24 at 6658564)
158
+ + t5500: show user name and host in diag-url
159
+ + t5601: add more test cases for IPV6
160
+ + connect.c: allow ssh://user@[2001:db8::1]/repo.git
161
+
162
+ We did not parse username followed by literal IPv6 address in SSH
163
+ transport URLs, e.g. ssh://user@[2001:db8::1]:22/repo.git
164
+ correctly.
165
+
166
+--------------------------------------------------
167
+[New Topics]
168
+
169
+* ak/t5516-typofix (2015-03-03) 1 commit
170
+ (merged to 'next' on 2015-03-03 at c37a677)
171
+ + t5516: correct misspelled pushInsteadOf
172
+
173
+ Will merge to 'master'.
174
+
175
+
176
+* bw/kwset-use-unsigned (2015-03-02) 1 commit
177
+ (merged to 'next' on 2015-03-05 at fd124ba)
178
+ + kwset: use unsigned char to store values with high-bit set
179
+
180
+ The borrowed code in kwset API did not follow our usual convention
181
+ to use "unsigned char" to store values that range from 0-255.
182
+
183
+ Will merge to 'master'.
184
+
185
+
186
+* mg/doc-remote-tags-or-not (2015-03-02) 1 commit
187
+ (merged to 'next' on 2015-03-03 at 1630171)
188
+ + git-remote.txt: describe behavior without --tags and --no-tags
189
+
190
+ "git remote add" mentioned "--tags" and "--no-tags" and was not
191
+ clear that fetch from the remote in the future will use the default
192
+ behaviour when neither is given to override it.
193
+
194
+ Will merge to 'master'.
195
+
196
+
197
+* mg/status-v-v (2015-03-03) 2 commits
198
+ - commit/status: show the index-worktree diff with -v -v
199
+ - t7508: test git status -v
200
+
201
+ "git status" now allows the "-v" to be given twice to show the
202
+ differences that are left in the working tree not to be committed.
203
95
- Will merge to 'next'.
204
+ $gmane/264750
205
206
--------------------------------------------------
207
[Stalled]
208
209
+* mg/sequencer-commit-messages-always-verbatim (2015-02-23) 1 commit
210
+ - sequencer: preserve commit messages
211
+
212
+ Always replay the original commit message verbatim, regardless of
213
+ the commit.cleanup configuration settings by the user.
214
+
215
+ $gmane/264504
216
+
217
+
218
+* mg/detached-head-report (2015-02-23) 1 commit
219
+ - branch: name detached HEAD analogous to status
220
+
221
+ "git branch" on a detached HEAD always said "(detached from xyz)",
222
+ even when "git status" would report "detached at xyz". The HEAD is
223
+ actually at xyz and haven't been moved since it was detached in
224
+ such a case, but the user cannot read what the current value of
225
+ HEAD is when "detached from" is used.
226
+
227
+ The goal is sound. May want to share code between branch and
228
+ status in a reroll? Are there other commands that give the same
229
+ information that share the code, too?
230
+
231
+ ($gmane/264251)
232
+
233
+
234
* jk/push-config (2015-02-17) 4 commits
235
- [NEEDSACK] push: allow --follow-tags to be set by config push.followTags
236
- cmd_push: pass "flags" pointer to config callback
@@ -155,7 +289,6 @@ of the repositories listed at
289
- diffcore-rename: allow easier debugging
290
- diffcore-rename.c: add locate_rename_src()
291
- diffcore-break: allow debugging
158
- (this branch uses jc/diff-test-updates.)
292
293
"git diff -B -M" produced incorrect patch when the postimage of a
294
completely rewritten file is similar to the preimage of a removed
@@ -287,44 +420,86 @@ of the repositories listed at
420
--------------------------------------------------
421
[Cooking]
422
290
-* nd/slim-index-pack-memory-usage (2015-02-27) 2 commits
291
- - index-pack: kill union delta_base to save memory
292
- - index-pack: reduce object_entry size to save memory
423
+* mr/doc-clean-f-f (2015-02-26) 1 commit
424
+ (merged to 'next' on 2015-03-03 at 67a77a2)
425
+ + Documentation/git-clean.txt: document that -f may need to be given twice
426
294
- Memory usage of "git index-pack" has been trimmed by tens of
295
- per-cent.
427
+ Documentation update.
428
429
+ Will merge to 'master'.
430
298
-* mg/detached-head-report (2015-02-23) 1 commit
299
- - branch: name detached HEAD analogous to status
431
301
- "git branch" on a detached HEAD always said "(detached from xyz)",
302
- even when "git status" would report "detached at xyz". The HEAD is
303
- actually at xyz and haven't been moved since it was detached in
304
- such a case, but the user cannot read what the current value of
305
- HEAD is when "detached from" is used.
432
+* ye/http-accept-language (2015-02-26) 1 commit
433
+ (merged to 'next' on 2015-03-03 at 58d195e)
434
+ + gettext.c: move get_preferred_languages() from http.c
435
307
- The goal is sound. May want to share code between branch and
308
- status in a reroll? Are there other commands that give the same
309
- information that share the code, too?
436
+ Compilation fix for a recent topic in 'master'.
437
438
+ Will merge to 'master'.
439
312
-* mg/sequencer-commit-messages-always-verbatim (2015-02-23) 1 commit
313
- - sequencer: preserve commit messages
440
315
- Always replay the original commit message verbatim, regardless of
316
- the commit.cleanup configuration settings by the user.
441
+* jk/diffcore-rename-duplicate (2015-02-27) 2 commits
442
+ (merged to 'next' on 2015-03-03 at 1d5a2d2)
443
+ + diffcore-rename: avoid processing duplicate destinations
444
+ + diffcore-rename: split locate_rename_dst into two functions
445
+
446
+ A corrupt input to "git diff -M" can cause us to segfault.
447
318
- Is this a good idea?
448
+ Will merge to 'master'.
449
450
321
-* rj/no-xopen-source-for-cygwin (2015-02-22) 1 commit
322
- (merged to 'next' on 2015-02-23 at 323ac75)
323
- + git-compat-util.h: remove redundant code
451
+* nd/grep-exclude-standard-help-fix (2015-02-27) 1 commit
452
+ (merged to 'next' on 2015-03-03 at 61c9587)
453
+ + grep: correct help string for --exclude-standard
454
+
455
+ Description given by "grep -h" for its --exclude-standard option
456
+ was phrased poorly.
457
458
Will merge to 'master'.
459
460
461
+* nd/versioncmp-prereleases (2015-02-27) 1 commit
462
+ (merged to 'next' on 2015-03-03 at 6ab29cf)
463
+ + versionsort: support reorder prerelease suffixes
464
+
465
+ The versionsort.prerelease configuration variable can be used to
466
+ specify that v1.0-pre1 comes before v1.0.
467
+
468
+ Will merge to 'master'.
469
+
470
+
471
+* ja/clean-confirm-i18n (2015-03-02) 1 commit
472
+ (merged to 'next' on 2015-03-03 at 314c322)
473
+ + Add hint interactive cleaning
474
+
475
+ The prompt string "remove?" used when "git clean -i" asks the user
476
+ if a path should be removed was localizable, but the code always
477
+ expects a substring of "yes" to tell it to go ahead. Always show
478
+ [y/N] as part of this prompt to hint that the answer is not (yet)
479
+ localized.
480
+
481
+ Will merge to 'master'.
482
+
483
+
484
+* mk/diff-shortstat-dirstat-fix (2015-03-02) 1 commit
485
+ (merged to 'next' on 2015-03-03 at 42c282e)
486
+ + diff --shortstat --dirstat: remove duplicate output
487
+
488
+ "git diff --shortstat --dirstat=changes" showed a dirstat based on
489
+ lines that was never asked by the end user in addition to the
490
+ dirstat that the user asked for.
491
+
492
+ Will merge to 'master'.
493
+
494
+
495
+* nd/slim-index-pack-memory-usage (2015-02-27) 2 commits
496
+ - index-pack: kill union delta_base to save memory
497
+ - index-pack: reduce object_entry size to save memory
498
+
499
+ Memory usage of "git index-pack" has been trimmed by tens of
500
+ per-cent.
501
+
502
+
503
* nd/list-files (2015-02-09) 21 commits
504
- t3080: tests for git-list-files
505
- list-files: -M aka diff-cached
@@ -352,170 +527,46 @@ of the repositories listed at
527
whistles.
528
529
355
-* mm/am-c-doc (2015-02-20) 2 commits
356
- (merged to 'next' on 2015-02-23 at 1cd9b0f)
357
- + Documentation/git-am.txt: mention mailinfo.scissors config variable
358
- + Documentation/config.txt: document mailinfo.scissors
359
-
360
- The configuration variable 'mailinfo.scissors' was hard to
361
- discover in the documentation.
362
-
363
- Will merge to 'master'.
364
-
365
-
366
-* rs/simple-cleanups (2015-02-22) 4 commits
367
- (merged to 'next' on 2015-02-23 at a89f034)
368
- + sha1_name: use strlcpy() to copy strings
369
- + pretty: use starts_with() to check for a prefix
370
- + for-each-ref: use skip_prefix() to avoid duplicate string comparison
371
- + connect: use strcmp() for string comparison
372
-
373
- Will merge to 'master'.
374
-
375
-
376
-* tb/connect-ipv6-parse-fix (2015-02-22) 3 commits
377
- (merged to 'next' on 2015-02-24 at 6658564)
378
- + t5500: show user name and host in diag-url
379
- + t5601: add more test cases for IPV6
380
- + connect.c: allow ssh://user@[2001:db8::1]/repo.git
381
-
382
- We did not parse username followed by literal IPv6 address in SSH
383
- transport URLs, e.g. ssh://user@[2001:db8::1]:22/repo.git
384
- correctly.
385
-
386
- Will merge to 'master'.
387
-
388
-
389
-* jc/decorate-leaky-separator-color (2015-02-20) 2 commits
390
- - config.txt: spell out how certain typed values are written
530
+* jc/decorate-leaky-separator-color (2015-03-04) 7 commits
531
- log --decorate: do not leak "commit" color into the next item
532
+ - Documentation/config.txt: simplify boolean description in the syntax section
533
+ - Documentation/config.txt: describe 'color' value type in the "Values" section
534
+ - Documentation/config.txt: have a separate "Values" section
535
+ - Documentation/config.txt: describe the structure first and then meaning
536
+ - Documentation/config.txt: explain multi-valued variables once
537
+ - Documentation/config.txt: avoid unnecessary negation
538
539
"git log --decorate" did not reset colors correctly around the
540
branch names.
541
396
- Waiting for discussion on the tip one.
542
+ Waiting for reviews.
543
544
545
* ms/submodule-update-config-doc (2015-03-02) 1 commit
400
- - submodule: improve documentation of update subcommand
546
+ (merged to 'next' on 2015-03-03 at b94da4b)
547
+ + submodule: improve documentation of update subcommand
548
549
The interaction between "git submodule update" and the
550
submodule.*.update configuration was not clearly documented.
551
405
- Will merge to 'next'.
406
-
407
-
408
-* jc/diff-test-updates (2015-02-23) 7 commits
409
- (merged to 'next' on 2015-02-23 at 9e863a7)
410
- + test_ln_s_add: refresh stat info of fake symbolic links
411
- (merged to 'next' on 2015-02-18 at f152c9f)
412
- + t4008: modernise style
413
- + t/diff-lib: check exact object names in compare_diff_raw
414
- + tests: do not borrow from COPYING and README from the real source
415
- + t4010: correct expected object names
416
- + t9300: correct expected object names
417
- + t4008: correct stale comments
418
- (this branch is used by jc/diff-b-m.)
419
-
420
- Test clean-up.
421
-
422
- Will merge to 'master'.
423
-
424
-
425
-* km/send-email-getopt-long-workarounds (2015-02-16) 1 commit
426
- (merged to 'next' on 2015-02-18 at 84c1597)
427
- + git-send-email.perl: support no- prefix with older GetOptions
428
-
429
- Even though we officially haven't dropped Perl 5.8 support, the
430
- Getopt::Long package that came with it does not support "--no-"
431
- prefix to negate a boolean option; manually add support to help
432
- people with older Getopt::Long package.
433
-
434
- Will merge to 'master'.
435
-
436
-
437
-* jk/daemon-interpolate (2015-02-17) 3 commits
438
- (merged to 'next' on 2015-02-20 at 21118a7)
439
- + daemon: sanitize incoming virtual hostname
440
- + t5570: test git-daemon's --interpolated-path option
441
- + git_connect: let user override virtual-host we send to daemon
442
-
443
- The "interpolated-path" option of "git daemon" inserted any string
444
- client declared on the "host=" capability request without checking.
445
- Sanitize and limit %H and %CH to a saner and a valid DNS name.
446
-
447
- Will merge to 'master'.
448
-
449
-
450
-* rs/daemon-interpolate (2015-02-17) 2 commits
451
- (merged to 'next' on 2015-02-18 at c0f5750)
452
- + daemon: use callback to build interpolated path
453
- + daemon: look up client-supplied hostname lazily
454
-
455
- "git daemon" looked up the hostname even when "%CH" and "%IP"
456
- interpolations are not requested, which was unnecessary.
457
-
458
- Will merge to 'master'.
459
-
460
-
461
-* mh/expire-updateref-fixes (2015-03-02) 9 commits
462
- - reflog_expire(): never update a reference to null_sha1
463
- - reflog_expire(): ignore --updateref for symbolic references
464
- - reflog: improve and update documentation
465
- - struct ref_lock: delete the force_write member
466
- - lock_ref_sha1_basic(): do not set force_write for missing references
467
- - write_ref_sha1(): move write elision test to callers
468
- - write_ref_sha1(): remove check for lock == NULL
469
- - Merge branch 'sb/atomic-push' into mh/ref-trans-value-check
470
- - Merge branch 'mh/reflog-expire' into mh/ref-trans-value-check
471
-
472
- Will wait for a short while before merging to 'next'.
473
- ($gmane/264586).
474
-
475
-
476
-* mh/refs-have-new (2015-02-17) 13 commits
477
- (merged to 'next' on 2015-02-23 at b8929db)
478
- + refs.h: remove duplication in function docstrings
479
- + update_ref(): improve documentation
480
- + ref_transaction_verify(): new function to check a reference's value
481
- + ref_transaction_delete(): check that old_sha1 is not null_sha1
482
- + ref_transaction_create(): check that new_sha1 is valid
483
- + commit: avoid race when creating orphan commits
484
- + commit: add tests of commit races
485
- + ref_transaction_delete(): remove "have_old" parameter
486
- + ref_transaction_update(): remove "have_old" parameter
487
- + struct ref_update: move "have_old" into "flags"
488
- + refs.c: change some "flags" to "unsigned int"
489
- + refs: remove the gap in the REF_* constant values
490
- + refs: move REF_DELETING to refs.c
491
-
492
- Simplify the ref transaction API around how "the ref should be
493
- pointing at this object" is specified.
494
-
495
- Will merge to 'master'.
496
-
497
-
498
-* jc/apply-beyond-symlink (2015-02-10) 4 commits
499
- (merged to 'next' on 2015-02-18 at 4109de1)
500
- + apply: do not touch a file beyond a symbolic link
501
- + apply: do not read from beyond a symbolic link
502
- + apply: do not read from the filesystem under --index
503
- + apply: reject input that touches outside the working area
504
-
505
- "git apply" was not very careful about reading from, removing,
506
- updating and creating paths outside the working tree (under
507
- --index/--cached) or the current directory (when used as a
508
- replacement for GNU patch).
509
-
552
Will merge to 'master'.
553
554
513
-* jc/apply-ws-fix-expands-report (2015-01-22) 1 commit
514
- (merged to 'next' on 2015-02-18 at b571668)
515
- + apply: detect and mark whitespace errors in context lines when fixing
516
-
517
- "git apply --whitespace=fix" fixed whitespace errors in the common
518
- context lines but did so without reporting.
555
+* mh/expire-updateref-fixes (2015-03-05) 9 commits
556
+ (merged to 'next' on 2015-03-05 at 1caf9a6)
557
+ + reflog_expire(): never update a reference to null_sha1
558
+ + reflog_expire(): ignore --updateref for symbolic references
559
+ + reflog: improve and update documentation
560
+ + struct ref_lock: delete the force_write member
561
+ + lock_ref_sha1_basic(): do not set force_write for missing references
562
+ + write_ref_sha1(): move write elision test to callers
563
+ + write_ref_sha1(): remove check for lock == NULL
564
+ + Merge branch 'sb/atomic-push' into mh/ref-trans-value-check
565
+ + Merge branch 'mh/reflog-expire' into mh/ref-trans-value-check
566
+
567
+ Various issues around "reflog expire", e.g. using --updateref when
568
+ expiring a reflog for a symbolic reference, have been corrected
569
+ and/or made saner.
570
571
Will merge to 'master'.
572