What's cooking (2015/02 #07)
Junio C Hamano committed
Feb 26, 2015 at 10:20 UTC
8043961b0306f62d160d971695c6ee6a3a334569
1 file changed
+212
-267
whats-cooking.txt
+212
-267
@@ -1,18 +1,19 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Feb 2015, #06; Sun, 22)
4
-X-master-at: 355d4e1739d1e88561ac04d2a2423c2aa93693d9
5
-X-next-at: a0c6b3dbaae84fcad8b65e4ac8caa8982d3d24a8
3
+Subject: What's cooking in git.git (Feb 2015, #07; Thu, 26)
4
+X-master-at: 7f4ba4b6e3ba7075ca6b379ba23fd3088cbe69a8
5
+X-next-at: 993ae8bdc3df206f62a424eb695a49f1ba8fa118
6
7
-What's cooking in git.git (Feb 2015, #06; Sun, 22)
7
+What's cooking in git.git (Feb 2015, #07; Thu, 26)
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
-The 'master' front have merged many topics that can further merged
15
-to the maintainance tracks. We may want to do a v2.3.1 soonish.
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'.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
@@ -22,127 +23,172 @@ of the repositories listed at
23
--------------------------------------------------
24
[Graduated to "master"]
25
25
-* ab/merge-file-prefix (2015-02-11) 1 commit
26
- (merged to 'next' on 2015-02-16 at 89e0252)
27
- + merge-file: correctly open files when in a subdir
26
+* ak/git-pm-typofix (2015-02-18) 1 commit
27
+ (merged to 'next' on 2015-02-20 at 0fa233a)
28
+ + Git.pm: two minor typo fixes
29
+
30
+ Typofix in comments.
31
+
32
+
33
+* dp/remove-duplicated-header-inclusion (2015-02-13) 1 commit
34
+ (merged to 'next' on 2015-02-18 at a1bf108)
35
+ + do not include the same header twice
36
29
- "git merge-file" did not work correctly in a subdirectory.
37
+ Code clean-up.
38
39
32
-* es/blame-commit-info-fix (2015-02-10) 1 commit
33
- (merged to 'next' on 2015-02-16 at f76ff44)
34
- + builtin/blame: destroy initialized commit_info only
40
+* jc/max-io-size-and-ssize-max (2015-02-12) 1 commit
41
+ (merged to 'next' on 2015-02-18 at 0c8a4da)
42
+ + xread/xwrite: clip MAX_IO_SIZE to SSIZE_MAX
43
+
44
+ Our default I/O size (8 MiB) for large files was too large for some
45
+ platforms with smaller SSIZE_MAX, leading to read(2)/write(2)
46
+ failures.
47
36
- "git blame" died, trying to free an uninitialized piece of memory.
48
49
+* jc/send-email-sensible-encoding (2015-02-13) 1 commit
50
+ (merged to 'next' on 2015-02-18 at 7457655)
51
+ + send-email: ask confirmation if given encoding name is very short
52
39
-* es/squelch-openssl-warnings-on-macosx (2015-02-09) 1 commit
40
- (merged to 'next' on 2015-02-16 at bbe2880)
41
- + git-compat-util: do not step on MAC_OS_X_VERSION_MIN_REQUIRED
53
+ "git send-email" used to accept a mistaken "y" (or "yes") as an
54
+ answer to "What encoding do you want to use [UTF-8]? " without
55
+ questioning. Now it asks for confirmation when the answer looks
56
+ too short to be a valid encoding name.
57
43
- An earlier workaround to squelch unhelpful deprecation warnings
44
- from the complier on Mac OSX unnecessarily set minimum required
45
- version of the OS, which the user might want to raise (or lower)
46
- for other reasons.
58
59
+* jk/fast-import-die-nicely-fix (2015-02-10) 1 commit
60
+ (merged to 'next' on 2015-02-18 at e249425)
61
+ + fast-import: avoid running end_packfile recursively
62
49
-* jc/conf-var-doc (2015-02-02) 3 commits
50
- (merged to 'next' on 2015-02-16 at 97512a3)
51
- + CodingGuidelines: describe naming rules for configuration variables
52
- + config.txt: mark deprecated variables more prominently
53
- + config.txt: clarify that add.ignore-errors is deprecated
63
+ "git fast-import" used to crash when it could not close and
64
+ conclude the resulting packfile cleanly.
65
55
- Longstanding configuration variable naming rules has been added to
56
- the documentation.
66
67
+* jk/sanity (2015-02-15) 3 commits
68
+ (merged to 'next' on 2015-02-18 at 5c54b53)
69
+ + test-lib.sh: set prerequisite SANITY by testing what we really need
70
+ + tests: correct misuses of POSIXPERM
71
+ + t/lib-httpd: switch SANITY check for NOT_ROOT
72
59
-* jc/diff-files-ita (2015-02-04) 1 commit
60
- (merged to 'next' on 2015-02-16 at d7867a3)
61
- + run_diff_files(): clarify computation of sha1 validity
73
+ The tests that wanted to see that file becomes unreadable after
74
+ running "chmod a-r file", and the tests that wanted to make sure it
75
+ is not run as root, we used "can we write into the / directory?" as
76
+ a cheap substitute, but on some platforms that is not a good
77
+ heuristics. The tests and their prerequisites have been updated to
78
+ check what they really require.
79
63
- Code cleanup.
80
81
+* jk/strbuf-doc-to-header (2015-01-16) 7 commits
82
+ (merged to 'next' on 2015-02-18 at 0482c65)
83
+ + strbuf.h: group documentation for trim functions
84
+ + strbuf.h: drop boilerplate descriptions of strbuf_split_*
85
+ + strbuf.h: reorganize api function grouping headers
86
+ + strbuf.h: format asciidoc code blocks as 4-space indent
87
+ + strbuf.h: drop asciidoc list formatting from API docs
88
+ + strbuf.h: unify documentation comments beginnings
89
+ + strbuf.h: integrate api-strbuf.txt documentation
90
66
-* jk/prune-mtime (2015-02-09) 2 commits
67
- (merged to 'next' on 2015-02-16 at 3d46eae)
68
- + sha1_file: fix iterating loose alternate objects
69
- + for_each_loose_file_in_objdir: take an optional strbuf path
91
+ The strbuf API was explained between the API documentation and in
92
+ the header file. Move missing bits to strbuf.h so that programmers
93
+ can check only one place for all necessary information.
94
71
- In v2.2.0, we broke "git prune" that runs in a repository that
72
- borrows from an alternate object store.
95
96
+* jn/doc-api-errors (2014-12-04) 1 commit
97
+ (merged to 'next' on 2015-02-18 at f60eda6)
98
+ + doc: document error handling functions and conventions
99
75
-* ps/submodule-sanitize-path-upon-add (2015-02-02) 1 commit
76
- (merged to 'next' on 2015-02-16 at 8253132)
77
- + git-submodule.sh: fix '/././' path normalization
100
+ The error handling functions and conventions are now documented in
101
+ the API manual.
102
79
- "git submodule add" failed to squash "path/to/././submodule" to
80
- "path/to/submodule".
103
104
+* mh/transport-capabilities (2015-02-13) 2 commits
105
+ (merged to 'next' on 2015-02-18 at 87e8fcc)
106
+ + transport-helper: ask the helper to set the same options for import as for fetch
107
+ + transport-helper: ask the helper to set progress and verbosity options after asking for its capabilities
108
83
-* ss/check-builtins-on-windows (2015-02-05) 1 commit
84
- (merged to 'next' on 2015-02-16 at 2c10cc1)
85
- + check-builtins: strip executable suffix $X when enumerating builtins
109
+ The transport-helper did not give transport options such as
110
+ verbosity, progress, cloning, etc. to import and export based
111
+ helpers, like it did for fetch and push based helpers, robbing them
112
+ the chance to honor the wish of the end-users better.
113
114
88
-* tc/curl-vernum-output-broken-in-7.11 (2015-02-03) 1 commit
89
- (merged to 'next' on 2015-02-16 at de90f95)
90
- + Makefile: handle broken curl version number in version check
115
+* nd/attr-optim (2014-12-29) 3 commits
116
+ (merged to 'next' on 2015-02-18 at 598e68a)
117
+ + attr: avoid heavy work when we know the specified attr is not defined
118
+ + attr: do not attempt to expand when we know it's not a macro
119
+ + attr.c: rename arg name attr_nr to avoid shadowing the global one
120
92
- Certain older vintages of cURL give irregular output from
93
- "curl-config --vernum", which confused our build system.
121
+ Optimize attribute look-up, mostly useful in "git grep" on a
122
+ project that does not use many attributes, by avoiding it when we
123
+ (should) know that the attributes are not defined in the first
124
+ place.
125
+
126
+
127
+* sb/hex-object-name-is-at-most-41-bytes-long (2015-02-13) 1 commit
128
+ (merged to 'next' on 2015-02-18 at 53d522b)
129
+ + hex.c: reduce memory footprint of sha1_to_hex static buffers
130
+
131
+ Code clean-up.
132
+
133
+
134
+* sb/plug-leak-in-make-cache-entry (2015-02-17) 1 commit
135
+ (merged to 'next' on 2015-02-18 at e637f65)
136
+ + read-cache.c: free cache entry when refreshing fails
137
+
138
+ "update-index --refresh" used to leak when an entry cannot be
139
+ refreshed for whatever reason.
140
+
141
+
142
+* tc/missing-http-proxyauth (2015-02-03) 1 commit
143
+ (merged to 'next' on 2015-02-18 at 8ff01ad)
144
+ + http: support curl < 7.10.7
145
+
146
+ We did not check the curl library version before using
147
+ CURLOPT_PROXYAUTH feature that may not exist.
148
149
--------------------------------------------------
150
[New Topics]
151
98
-* mm/am-c-doc (2015-02-20) 2 commits
99
- - Documentation/git-am.txt: mention mailinfo.scissors config variable
100
- - Documentation/config.txt: document mailinfo.scissors
152
+* mg/detached-head-report (2015-02-23) 1 commit
153
+ - branch: name detached HEAD analogous to status
154
102
- The configuration variable 'mailinfo.scissors' was hard to
103
- discover in the documentation.
155
+ "git branch" on a detached HEAD always said "(detached from xyz)",
156
+ even when "git status" would report "detached at xyz". The HEAD is
157
+ actually at xyz and haven't been moved since it was detached in
158
+ such a case, but the user cannot read what the current value of
159
+ HEAD is when "detached from" is used.
160
105
- Will merge to 'next'.
161
+ The goal is sound. May want to share code between branch and
162
+ status in a reroll? Are there other commands that give the same
163
+ information that share the code, too?
164
165
108
-* rs/simple-cleanups (2015-02-22) 4 commits
109
- - sha1_name: use strlcpy() to copy strings
110
- - pretty: use starts_with() to check for a prefix
111
- - for-each-ref: use skip_prefix() to avoid duplicate string comparison
112
- - connect: use strcmp() for string comparison
166
+* mg/sequencer-commit-messages-always-verbatim (2015-02-23) 1 commit
167
+ - sequencer: preserve commit messages
168
114
- Will merge to 'next'.
169
+ Always replay the original commit message verbatim, regardless of
170
+ the commit.cleanup configuration settings by the user.
171
+
172
+ Is this a good idea?
173
+
174
+
175
+* rj/no-xopen-source-for-cygwin (2015-02-22) 1 commit
176
+ (merged to 'next' on 2015-02-23 at 323ac75)
177
+ + git-compat-util.h: remove redundant code
178
+
179
+ Will merge to 'master'.
180
181
--------------------------------------------------
182
[Stalled]
183
119
-* nd/list-files (2015-02-09) 21 commits
120
- . t3080: tests for git-list-files
121
- . list-files: -M aka diff-cached
122
- . list-files -F: show submodules with the new indicator '&'
123
- . list-files: add -F/--classify
124
- . list-files: show directories as well as files
125
- . list-files: do not show duplicate cached entries
126
- . list-files: sort output and remove duplicates
127
- . list-files: add -t back
128
- . list-files: add -1 short for --no-column
129
- . list-files: add -R/--recursive short for --max-depth=-1
130
- . list-files: -u does not imply showing stages
131
- . list-files: make alias 'ls' default to 'list-files'
132
- . list-files: a user friendly version of ls-files and more
133
- . ls-files: support --max-depth
134
- . ls-files: add --column
135
- . ls-files: add --color to highlight file names
136
- . ls-files: buffer full item in strbuf before printing
137
- . ls_colors.c: highlight submodules like directories
138
- . ls_colors.c: add a function to color a file name
139
- . ls_colors.c: parse color.ls.* from config file
140
- . ls_colors.c: add $LS_COLORS parsing code
141
-
142
- A new "git list-files" Porcelain command, "ls-files" with bells and
143
- whistles.
184
+* jk/push-config (2015-02-17) 4 commits
185
+ - [NEEDSACK] push: allow --follow-tags to be set by config push.followTags
186
+ - cmd_push: pass "flags" pointer to config callback
187
+ - cmd_push: set "atomic" bit directly
188
+ - git_push_config: drop cargo-culted wt_status pointer
189
145
- No comments? No reviews? No interests?
190
+ Waiting for Ack and/or update for the tip one from Dave Olszewski
191
+ ($gmane/263880, $gmane/263991).
192
193
194
* nd/untracked-cache (2015-02-09) 24 commits
@@ -187,8 +233,9 @@ of the repositories listed at
233
No comments? No interests?
234
235
190
-* jc/diff-b-m (2015-02-17) 4 commits
191
- - WIP: diff-b-m
236
+* jc/diff-b-m (2015-02-23) 5 commits
237
+ . WIPWIP
238
+ . WIP: diff-b-m
239
- diffcore-rename: allow easier debugging
240
- diffcore-rename.c: add locate_rename_src()
241
- diffcore-break: allow debugging
@@ -332,20 +379,63 @@ of the repositories listed at
379
--------------------------------------------------
380
[Cooking]
381
335
-* tb/connect-ipv6-parse-fix (2015-02-22) 3 commits
336
- - t5500: show user name and host in diag-url
337
- - t5601: add more test cases for IPV6
338
- - connect.c: allow ssh://user@[2001:db8::1]/repo.git
382
+* nd/list-files (2015-02-09) 21 commits
383
+ - t3080: tests for git-list-files
384
+ - list-files: -M aka diff-cached
385
+ - list-files -F: show submodules with the new indicator '&'
386
+ - list-files: add -F/--classify
387
+ - list-files: show directories as well as files
388
+ - list-files: do not show duplicate cached entries
389
+ - list-files: sort output and remove duplicates
390
+ - list-files: add -t back
391
+ - list-files: add -1 short for --no-column
392
+ - list-files: add -R/--recursive short for --max-depth=-1
393
+ - list-files: -u does not imply showing stages
394
+ - list-files: make alias 'ls' default to 'list-files'
395
+ - list-files: a user friendly version of ls-files and more
396
+ - ls-files: support --max-depth
397
+ - ls-files: add --column
398
+ - ls-files: add --color to highlight file names
399
+ - ls-files: buffer full item in strbuf before printing
400
+ - ls_colors.c: highlight submodules like directories
401
+ - ls_colors.c: add a function to color a file name
402
+ - ls_colors.c: parse color.ls.* from config file
403
+ - ls_colors.c: add $LS_COLORS parsing code
404
340
- Waiting for comments from Brian who had objections to the previous
341
- round.
405
+ A new "git list-files" Porcelain command, "ls-files" with bells and
406
+ whistles.
407
408
344
-* ak/git-pm-typofix (2015-02-18) 1 commit
345
- (merged to 'next' on 2015-02-20 at 0fa233a)
346
- + Git.pm: two minor typo fixes
409
+* mm/am-c-doc (2015-02-20) 2 commits
410
+ (merged to 'next' on 2015-02-23 at 1cd9b0f)
411
+ + Documentation/git-am.txt: mention mailinfo.scissors config variable
412
+ + Documentation/config.txt: document mailinfo.scissors
413
348
- Typofix in comments.
414
+ The configuration variable 'mailinfo.scissors' was hard to
415
+ discover in the documentation.
416
+
417
+ Will merge to 'master'.
418
+
419
+
420
+* rs/simple-cleanups (2015-02-22) 4 commits
421
+ (merged to 'next' on 2015-02-23 at a89f034)
422
+ + sha1_name: use strlcpy() to copy strings
423
+ + pretty: use starts_with() to check for a prefix
424
+ + for-each-ref: use skip_prefix() to avoid duplicate string comparison
425
+ + connect: use strcmp() for string comparison
426
+
427
+ Will merge to 'master'.
428
+
429
+
430
+* tb/connect-ipv6-parse-fix (2015-02-22) 3 commits
431
+ (merged to 'next' on 2015-02-24 at 6658564)
432
+ + t5500: show user name and host in diag-url
433
+ + t5601: add more test cases for IPV6
434
+ + connect.c: allow ssh://user@[2001:db8::1]/repo.git
435
+
436
+ We did not parse username followed by literal IPv6 address in SSH
437
+ transport URLs, e.g. ssh://user@[2001:db8::1]:22/repo.git
438
+ correctly.
439
440
Will merge to 'master'.
441
@@ -360,23 +450,18 @@ of the repositories listed at
450
Waiting for discussion on the tip one.
451
452
363
-* ms/submodule-update-config-doc (2015-02-20) 1 commit
364
- - submodule: Improve documentation of update subcommand
453
+* ms/submodule-update-config-doc (2015-02-23) 1 commit
454
+ - submodule: improve documentation of update subcommand
455
456
The interaction between "git submodule update" and the
457
submodule.*.update configuration was not clearly documented.
458
459
+ Waiting for a final reroll.
460
370
-* dp/remove-duplicated-header-inclusion (2015-02-13) 1 commit
371
- (merged to 'next' on 2015-02-18 at a1bf108)
372
- + do not include the same header twice
373
-
374
- Code clean-up.
461
376
- Will merge to 'master'.
377
-
378
-
379
-* jc/diff-test-updates (2015-02-15) 6 commits
462
+* jc/diff-test-updates (2015-02-23) 7 commits
463
+ (merged to 'next' on 2015-02-23 at 9e863a7)
464
+ + test_ln_s_add: refresh stat info of fake symbolic links
465
(merged to 'next' on 2015-02-18 at f152c9f)
466
+ t4008: modernise style
467
+ t/diff-lib: check exact object names in compare_diff_raw
@@ -391,28 +476,6 @@ of the repositories listed at
476
Will merge to 'master'.
477
478
394
-* jc/send-email-sensible-encoding (2015-02-13) 1 commit
395
- (merged to 'next' on 2015-02-18 at 7457655)
396
- + send-email: ask confirmation if given encoding name is very short
397
-
398
- "git send-email" used to accept a mistaken "y" (or "yes") as an
399
- answer to "What encoding do you want to use [UTF-8]? " without
400
- questioning. Now it asks for confirmation when the answer looks
401
- too short to be a valid encoding name.
402
-
403
- Will merge to 'master'.
404
-
405
-
406
-* jk/push-config (2015-02-17) 4 commits
407
- - [NEEDSACK] push: allow --follow-tags to be set by config push.followTags
408
- - cmd_push: pass "flags" pointer to config callback
409
- - cmd_push: set "atomic" bit directly
410
- - git_push_config: drop cargo-culted wt_status pointer
411
-
412
- Waiting for Ack and/or update for the tip one from Dave Olszewski
413
- ($gmane/263880, $gmane/263991).
414
-
415
-
479
* km/send-email-getopt-long-workarounds (2015-02-16) 1 commit
480
(merged to 'next' on 2015-02-18 at 84c1597)
481
+ git-send-email.perl: support no- prefix with older GetOptions
@@ -425,28 +488,6 @@ of the repositories listed at
488
Will merge to 'master'.
489
490
428
-* mh/transport-capabilities (2015-02-13) 2 commits
429
- (merged to 'next' on 2015-02-18 at 87e8fcc)
430
- + transport-helper: ask the helper to set the same options for import as for fetch
431
- + transport-helper: ask the helper to set progress and verbosity options after asking for its capabilities
432
-
433
- The transport-helper did not give transport options such as
434
- verbosity, progress, cloning, etc. to import and export based
435
- helpers, like it did for fetch and push based helpers, robbing them
436
- the chance to honor the wish of the end-users better.
437
-
438
- Will merge to 'master'.
439
-
440
-
441
-* sb/hex-object-name-is-at-most-41-bytes-long (2015-02-13) 1 commit
442
- (merged to 'next' on 2015-02-18 at 53d522b)
443
- + hex.c: reduce memory footprint of sha1_to_hex static buffers
444
-
445
- Code clean-up.
446
-
447
- Will merge to 'master'.
448
-
449
-
491
* jk/daemon-interpolate (2015-02-17) 3 commits
492
(merged to 'next' on 2015-02-20 at 21118a7)
493
+ daemon: sanitize incoming virtual hostname
@@ -471,63 +512,6 @@ of the repositories listed at
512
Will merge to 'master'.
513
514
474
-* sb/plug-leak-in-make-cache-entry (2015-02-17) 1 commit
475
- (merged to 'next' on 2015-02-18 at e637f65)
476
- + read-cache.c: free cache entry when refreshing fails
477
-
478
- "update-index --refresh" used to leak when an entry cannot be
479
- refreshed for whatever reason.
480
-
481
- Will merge to 'master'.
482
-
483
-
484
-* jn/doc-api-errors (2014-12-04) 1 commit
485
- (merged to 'next' on 2015-02-18 at f60eda6)
486
- + doc: document error handling functions and conventions
487
-
488
- The error handling functions and conventions are now documented in
489
- the API manual.
490
-
491
- Will merge to 'master'.
492
-
493
-
494
-* jk/sanity (2015-02-15) 3 commits
495
- (merged to 'next' on 2015-02-18 at 5c54b53)
496
- + test-lib.sh: set prerequisite SANITY by testing what we really need
497
- + tests: correct misuses of POSIXPERM
498
- + t/lib-httpd: switch SANITY check for NOT_ROOT
499
-
500
- The tests that wanted to see that file becomes unreadable after
501
- running "chmod a-r file", and the tests that wanted to make sure it
502
- is not run as root, we used "can we write into the / directory?" as
503
- a cheap substitute, but on some platforms that is not a good
504
- heuristics. The tests and their prerequisites have been updated to
505
- check what they really require.
506
-
507
- Will merge to 'master'.
508
-
509
-
510
-* jc/max-io-size-and-ssize-max (2015-02-12) 1 commit
511
- (merged to 'next' on 2015-02-18 at 0c8a4da)
512
- + xread/xwrite: clip MAX_IO_SIZE to SSIZE_MAX
513
-
514
- Our default I/O size (8 MiB) for large files was too large for some
515
- platforms with smaller SSIZE_MAX, leading to read(2)/write(2)
516
- failures.
517
-
518
- Will merge to 'master'.
519
-
520
-
521
-* jk/fast-import-die-nicely-fix (2015-02-10) 1 commit
522
- (merged to 'next' on 2015-02-18 at e249425)
523
- + fast-import: avoid running end_packfile recursively
524
-
525
- "git fast-import" used to crash when it could not close and
526
- conclude the resulting packfile cleanly.
527
-
528
- Will merge to 'master'.
529
-
530
-
515
* mh/expire-updateref-fixes (2015-02-09) 10 commits
516
- reflog_expire(): lock symbolic refs themselves, not their referent
517
- reflog_expire(): never update a reference to null_sha1
@@ -544,25 +528,25 @@ of the repositories listed at
528
529
530
* mh/refs-have-new (2015-02-17) 13 commits
547
- - refs.h: remove duplication in function docstrings
548
- - update_ref(): improve documentation
549
- - ref_transaction_verify(): new function to check a reference's value
550
- - ref_transaction_delete(): check that old_sha1 is not null_sha1
551
- - ref_transaction_create(): check that new_sha1 is valid
552
- - commit: avoid race when creating orphan commits
553
- - commit: add tests of commit races
554
- - ref_transaction_delete(): remove "have_old" parameter
555
- - ref_transaction_update(): remove "have_old" parameter
556
- - struct ref_update: move "have_old" into "flags"
557
- - refs.c: change some "flags" to "unsigned int"
558
- - refs: remove the gap in the REF_* constant values
559
- - refs: move REF_DELETING to refs.c
531
+ (merged to 'next' on 2015-02-23 at b8929db)
532
+ + refs.h: remove duplication in function docstrings
533
+ + update_ref(): improve documentation
534
+ + ref_transaction_verify(): new function to check a reference's value
535
+ + ref_transaction_delete(): check that old_sha1 is not null_sha1
536
+ + ref_transaction_create(): check that new_sha1 is valid
537
+ + commit: avoid race when creating orphan commits
538
+ + commit: add tests of commit races
539
+ + ref_transaction_delete(): remove "have_old" parameter
540
+ + ref_transaction_update(): remove "have_old" parameter
541
+ + struct ref_update: move "have_old" into "flags"
542
+ + refs.c: change some "flags" to "unsigned int"
543
+ + refs: remove the gap in the REF_* constant values
544
+ + refs: move REF_DELETING to refs.c
545
546
Simplify the ref transaction API around how "the ref should be
547
pointing at this object" is specified.
548
564
- Looked sensible.
565
- Will merge to 'next', unless there is an objection.
549
+ Will merge to 'master'.
550
551
552
* jc/apply-beyond-symlink (2015-02-10) 4 commits
@@ -580,16 +564,6 @@ of the repositories listed at
564
Will merge to 'master'.
565
566
583
-* tc/missing-http-proxyauth (2015-02-03) 1 commit
584
- (merged to 'next' on 2015-02-18 at 8ff01ad)
585
- + http: support curl < 7.10.7
586
-
587
- We did not check the curl library version before using
588
- CURLOPT_PROXYAUTH feature that may not exist.
589
-
590
- Will merge to 'master'.
591
-
592
-
567
* jc/apply-ws-fix-expands-report (2015-01-22) 1 commit
568
(merged to 'next' on 2015-02-18 at b571668)
569
+ apply: detect and mark whitespace errors in context lines when fixing
@@ -627,35 +601,6 @@ of the repositories listed at
601
Expecting a reroll.
602
603
630
-* jk/strbuf-doc-to-header (2015-01-16) 7 commits
631
- (merged to 'next' on 2015-02-18 at 0482c65)
632
- + strbuf.h: group documentation for trim functions
633
- + strbuf.h: drop boilerplate descriptions of strbuf_split_*
634
- + strbuf.h: reorganize api function grouping headers
635
- + strbuf.h: format asciidoc code blocks as 4-space indent
636
- + strbuf.h: drop asciidoc list formatting from API docs
637
- + strbuf.h: unify documentation comments beginnings
638
- + strbuf.h: integrate api-strbuf.txt documentation
639
-
640
- Resolve the "doc vs header" to favor the latter.
641
-
642
- Will merge to 'master'.
643
-
644
-
645
-* nd/attr-optim (2014-12-29) 3 commits
646
- (merged to 'next' on 2015-02-18 at 598e68a)
647
- + attr: avoid heavy work when we know the specified attr is not defined
648
- + attr: do not attempt to expand when we know it's not a macro
649
- + attr.c: rename arg name attr_nr to avoid shadowing the global one
650
-
651
- Optimize attribute look-up, mostly useful in "git grep" on a
652
- project that does not use many attributes, by avoiding it when we
653
- (should) know that the attributes are not defined in the first
654
- place.
655
-
656
- Will merge to 'master'.
657
-
658
-
604
* nd/multiple-work-trees (2015-01-27) 38 commits
605
(merged to 'next' on 2015-02-18 at b51f696)
606
+ t2026 needs procondition SANITY