What's cooking (2014/05 #04)
Junio C Hamano committed
May 21, 2014 at 12:27 UTC
51aa0c7e732d82531ae0a1672f0cb316dc9f9a7f
1 file changed
+276
-145
whats-cooking.txt
+276
-145
@@ -1,19 +1,19 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (May 2014, #03; Tue, 13)
4
-X-master-at: 6308767f0bb58116cb405e1f4f77f5dfc1589920
5
-X-next-at: 7b9918a45049db8fa9b101e28a314928c31e0b5f
3
+Subject: What's cooking in git.git (May 2014, #04; Wed, 21)
4
+X-master-at: 4a28f169ad29ba452e0e7bea2583914c10c58322
5
+X-next-at: daf83cafd8ed3cb640a2047d5069cdbf9d18e7c0
6
7
-What's cooking in git.git (May 2014, #03; Tue, 13)
7
+What's cooking in git.git (May 2014, #04; Wed, 21)
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 tip of the 'master' branch is at v2.0.0-rc3, which is in sync
15
-with v1.9.3 with respect to bugfixes that was also tagged today.
16
-Hopefully we can tag v2.0.0 final late next week.
14
+The tip of the 'master' branch has past v2.0.0-rc4, as there were
15
+last minute regressions to be taken care of. Hopefully we can tag
16
+v2.0.0 final soonish.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
@@ -23,49 +23,99 @@ of the repositories listed at
23
--------------------------------------------------
24
[New Topics]
25
26
-* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
27
- - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
28
- - git-add--interactive: Preserve diff heading when splitting hunks
26
+* sk/wincred (2014-05-14) 2 commits
27
+ (merged to 'next' on 2014-05-21 at a3b9ca3)
28
+ + wincred: avoid overwriting configured variables
29
+ + wincred: add install target
30
30
- Waiting for a reroll.
31
+ Will keep in 'next' for the remainder of the cycle.
32
33
33
-* jk/do-not-run-httpd-tests-as-root (2014-05-12) 1 commit
34
- - t/lib-httpd: require SANITY prereq
34
+* as/pretty-truncate (2014-05-21) 5 commits
35
+ - pretty.c: format string with truncate respects logOutputEncoding
36
+ - t4205, t6006: add tests that fail with i18n.logOutputEncoding set
37
+ - t4205 (log-pretty-format): use `tformat` rather than `format`
38
+ - t4041, t4205, t6006, t7102: don't hardcode tested encoding value
39
+ - t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
40
41
Will merge to 'next' and keep it there for the rest of this cycle.
42
43
39
-* jk/index-pack-report-missing (2014-05-12) 1 commit
40
- - index-pack: distinguish missing objects from type errors
44
+* cc/replace-graft (2014-05-19) 1 commit
45
+ (merged to 'next' on 2014-05-21 at 7d90c4e)
46
+ + replace: add --graft option
47
+ (this branch uses cc/replace-edit.)
48
42
- Will merge to 'next' and keep it there for the rest of this cycle.
49
+ Will keep in 'next' for the remainder of the cycle.
50
51
45
-* tb/unicode-6.3-zero-width (2014-05-12) 2 commits
46
- - utf8: make it easier to auto-update git_wcwidth()
47
- - utf8.c: use a table for double_width
52
49
- Update the logic to compute the display width needed for utf8
50
- strings and allow us to more easily maintain the tables used in
51
- that logic.
53
+* jk/argv-array-for-child-process (2014-05-15) 7 commits
54
+ (merged to 'next' on 2014-05-21 at 5b2fa64)
55
+ + argv-array: drop "detach" code
56
+ + get_importer: use run-command's internal argv_array
57
+ + get_exporter: use argv_array
58
+ + get_helper: use run-command's internal argv_array
59
+ + git_connect: use argv_array
60
+ + run_column_filter: use argv_array
61
+ + run-command: store an optional argv_array
62
53
- We may want to let the users choose if codepoints with ambiguous
54
- widths are treated as a double or single width in a follow-up patch.
63
+ Will keep in 'next' for the remainder of the cycle.
64
56
- Will merge to 'next' and keep it there for the rest of this cycle.
65
66
+* jk/diff-files-assume-unchanged (2014-05-15) 1 commit
67
+ (merged to 'next' on 2014-05-21 at 142d2c8)
68
+ + run_diff_files: do not look at uninitialized stat data
69
+
70
+ Will keep in 'next' for the remainder of the cycle.
71
59
-* mk/show-s-no-extra-blank-line-for-merges (2014-05-13) 3 commits
60
- - fixup! git-show: fix 'git show -s' to not add extra terminator after merge commit
61
- - t: git-show: adapt tests to fixed 'git show'
62
- - git-show: fix 'git show -s' to not add extra terminator after merge commit
72
64
- Waiting for a reroll.
73
+* jk/report-fail-to-read-objects-better (2014-05-15) 1 commit
74
+ (merged to 'next' on 2014-05-21 at 77c89fe)
75
+ + open_sha1_file: report "most interesting" errno
76
77
+ Will keep in 'next' for the remainder of the cycle.
78
67
-* wk/doc-clarify-upstream (2014-05-13) 1 commit
68
- - Documentation: mention config sources for @{upstream}
79
+
80
+* mt/rebase-i-keep-empty-test (2014-05-19) 1 commit
81
+ (merged to 'next' on 2014-05-21 at d87d266)
82
+ + rebase --keep-empty -i: add test
83
+
84
+ Will keep in 'next' for the remainder of the cycle.
85
+
86
+
87
+* nd/status-auto-comment-char (2014-05-19) 2 commits
88
+ (merged to 'next' on 2014-05-21 at f762e62)
89
+ + commit: allow core.commentChar=auto for character auto selection
90
+ + config: be strict on core.commentChar
91
+
92
+ Will keep in 'next' for the remainder of the cycle.
93
+
94
+
95
+* rr/rebase-autostash-fix (2014-05-20) 2 commits
96
+ (merged to 'next' on 2014-05-21 at ca4aa40)
97
+ + rebase -i: test "Nothing to do" case with autostash
98
+ + rebase -i: handle "Nothing to do" case with autostash
99
+
100
+ Will keep in 'next' for the remainder of the cycle.
101
+
102
+
103
+* sk/spawn-less-case-insensitively-from-grep-O-i (2014-05-15) 1 commit
104
+ (merged to 'next' on 2014-05-21 at eb28305)
105
+ + git grep -O -i: if the pager is 'less', pass the '-I' option
106
+
107
+ Will keep in 'next' for the remainder of the cycle.
108
+
109
+
110
+* sk/windows-unc-path (2014-05-20) 1 commit
111
+ (merged to 'next' on 2014-05-21 at d1f1350)
112
+ + Windows: Allow using UNC path for git repository
113
+
114
+ Will keep in 'next' for the remainder of the cycle.
115
+
116
+
117
+* jk/diff-follow-must-take-one-pathspec (2014-05-20) 1 commit
118
+ - move "--follow needs one pathspec" rule to diff_setup_done
119
120
Will merge to 'next' and keep it there for the rest of this cycle.
121
@@ -98,22 +148,22 @@ of the repositories listed at
148
149
150
* jk/makefile (2014-02-05) 16 commits
101
- - FIXUP
102
- - move LESS/LV pager environment to Makefile
103
- - Makefile: teach scripts to include make variables
104
- - FIXUP
105
- - Makefile: auto-build C strings from make variables
106
- - Makefile: drop *_SQ variables
107
- - FIXUP
108
- - Makefile: add c-quote helper function
109
- - Makefile: introduce sq function for shell-quoting
110
- - Makefile: always create files via make-var
111
- - Makefile: store GIT-* sentinel files in MAKE/
112
- - Makefile: prefer printf to echo for GIT-*
113
- - Makefile: use tempfile/mv strategy for GIT-*
114
- - Makefile: introduce make-var helper function
115
- - Makefile: fix git-instaweb dependency on gitweb
116
- - Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
151
+ . FIXUP
152
+ . move LESS/LV pager environment to Makefile
153
+ . Makefile: teach scripts to include make variables
154
+ . FIXUP
155
+ . Makefile: auto-build C strings from make variables
156
+ . Makefile: drop *_SQ variables
157
+ . FIXUP
158
+ . Makefile: add c-quote helper function
159
+ . Makefile: introduce sq function for shell-quoting
160
+ . Makefile: always create files via make-var
161
+ . Makefile: store GIT-* sentinel files in MAKE/
162
+ . Makefile: prefer printf to echo for GIT-*
163
+ . Makefile: use tempfile/mv strategy for GIT-*
164
+ . Makefile: introduce make-var helper function
165
+ . Makefile: fix git-instaweb dependency on gitweb
166
+ . Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
167
168
Simplify the Makefile rules and macros that exist primarily for
169
quoting purposes, and make it easier to robustly express the
@@ -147,7 +197,25 @@ of the repositories listed at
197
198
Meant to be used as a basis for whatever Ram wants to build on.
199
150
- Ejected from 'pu' to make room for fc/publish-vs-upstream topic.
200
+ Ejected from 'pu' to unclutter.
201
+
202
+
203
+* fc/publish-vs-upstream (2014-04-21) 8 commits
204
+ . sha1_name: add support for @{publish} marks
205
+ . sha1_name: simplify track finding
206
+ . sha1_name: cleanup interpret_branch_name()
207
+ . branch: display publish branch
208
+ . push: add --set-publish option
209
+ . branch: add --set-publish-to option
210
+ . Add concept of 'publish' branch
211
+ . t5516 (fetch-push): fix test restoration
212
+
213
+ Add branch@{publish}; it seems that this is somewhat different from
214
+ Ram and Peff started working on. At least the tip needs to be
215
+ rerolled not to squat on @{p} which @{push} and possibly @{pull}
216
+ may want to share.
217
+
218
+ Ejected from 'pu' to unclutter.
219
220
221
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
@@ -219,6 +287,56 @@ of the repositories listed at
287
--------------------------------------------------
288
[Cooking]
289
290
+* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
291
+ - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
292
+ - git-add--interactive: Preserve diff heading when splitting hunks
293
+
294
+ Waiting for a reroll.
295
+
296
+
297
+* jk/do-not-run-httpd-tests-as-root (2014-05-12) 1 commit
298
+ (merged to 'next' on 2014-05-21 at 676392b)
299
+ + t/lib-httpd: require SANITY prereq
300
+
301
+ Will keep in 'next' for the remainder of the cycle.
302
+
303
+
304
+* jk/index-pack-report-missing (2014-05-12) 1 commit
305
+ (merged to 'next' on 2014-05-14 at 72d40e1)
306
+ + index-pack: distinguish missing objects from type errors
307
+
308
+ Will keep in 'next' for the remainder of the cycle.
309
+
310
+
311
+* tb/unicode-6.3-zero-width (2014-05-12) 2 commits
312
+ (merged to 'next' on 2014-05-14 at 08e0171)
313
+ + utf8: make it easier to auto-update git_wcwidth()
314
+ + utf8.c: use a table for double_width
315
+
316
+ Update the logic to compute the display width needed for utf8
317
+ strings and allow us to more easily maintain the tables used in
318
+ that logic.
319
+
320
+ We may want to let the users choose if codepoints with ambiguous
321
+ widths are treated as a double or single width in a follow-up patch.
322
+
323
+ Will keep in 'next' for the remainder of the cycle.
324
+
325
+
326
+* mk/show-s-no-extra-blank-line-for-merges (2014-05-15) 1 commit
327
+ (merged to 'next' on 2014-05-21 at 3b98b35)
328
+ + git-show: fix 'git show -s' to not add extra terminator after merge commit
329
+
330
+ Will keep in 'next' for the remainder of the cycle.
331
+
332
+
333
+* wk/doc-clarify-upstream (2014-05-13) 1 commit
334
+ (merged to 'next' on 2014-05-14 at 6c8fb52)
335
+ + Documentation: mention config sources for @{upstream}
336
+
337
+ Will keep in 'next' for the remainder of the cycle.
338
+
339
+
340
* dk/raise-core-deltabasecachelimit (2014-05-06) 1 commit
341
(merged to 'next' on 2014-05-12 at 97ec92a)
342
+ Bump core.deltaBaseCacheLimit to 96m
@@ -230,18 +348,6 @@ of the repositories listed at
348
Will keep in 'next' for the remainder of the cycle.
349
350
233
-* fc/remote-hg-fixes-for-hg-3.0 (2014-05-08) 5 commits
234
- - [DONTMERGE-not signed-off] remote-hg: work with older versions of mercurial
235
- - remote-hg: add support for hg v3.0
236
- - t: remote-hg: trivial cleanups and fixes
237
- - t: remote-hg: add file operation tests
238
- - remote-hg: add more tests
239
-
240
- Update remote-hg helper to work with newer versions of Mercurial,
241
- and fixes an incompatibility with older versions triggered by new
242
- tests.
243
-
244
-
351
* fc/status-printf-squelch-format-zero-length-warnings (2014-05-07) 1 commit
352
(merged to 'next' on 2014-05-12 at 6b04e23)
353
+ silence a bunch of format-zero-length warnings
@@ -280,9 +386,10 @@ of the repositories listed at
386
387
388
* sk/submodules-absolute-path-on-windows (2014-05-08) 1 commit
283
- - Revert "submodules: fix ambiguous absolute paths under Windows"
389
+ (merged to 'next' on 2014-05-14 at 83a05d9)
390
+ + Revert "submodules: fix ambiguous absolute paths under Windows"
391
285
- Will merge to 'next' and keep it there for the rest of this cycle.
392
+ Will keep in 'next' for the remainder of the cycle.
393
394
395
* jn/contrib-remove-diffall (2014-05-09) 1 commit
@@ -313,6 +420,8 @@ of the repositories listed at
420
- SQUASH typofix
421
- How to keep a project's canonical history correct.
422
423
+ Will squash and then merge to 'next'.
424
+
425
426
* wg/svn-fe-style-fixes (2014-05-12) 1 commit
427
(merged to 'next' on 2014-05-12 at 88c0e0d)
@@ -372,7 +481,8 @@ of the repositories listed at
481
Will keep in 'next' for the remainder of the cycle.
482
483
375
-* jc/coding-guidelines (2014-05-02) 8 commits
484
+* jc/coding-guidelines (2014-05-20) 9 commits
485
+ - CodingGuidelines: avoid "test <cond> -a/-o <cond>"
486
(merged to 'next' on 2014-05-12 at e1fcf62)
487
+ CodingGuidelines: on splitting a long line
488
+ CodingGuidelines: on comparison
@@ -383,11 +493,12 @@ of the repositories listed at
493
+ CodingGuidelines: give an example for case/esac statement
494
+ CodingGuidelines: once it is in, it is not worth the code churn
495
386
- Will keep in 'next' for the remainder of the cycle.
496
+ Will merge to 'next' and keep it there for the rest of this cycle.
497
498
499
* jd/subtree (2014-05-13) 6 commits
390
- - contrib/subtree: allow adding an annotated tag
500
+ (merged to 'next' on 2014-05-14 at 977db74)
501
+ + contrib/subtree: allow adding an annotated tag
502
(merged to 'next' on 2014-05-07 at 81b375d)
503
+ contrib/subtree/Makefile: clean up rule for "clean"
504
+ contrib/subtree/Makefile: clean up rules to generate documentation
@@ -422,12 +533,20 @@ of the repositories listed at
533
Will keep in 'next' for the remainder of the cycle.
534
535
425
-* cc/replace-edit (2014-04-29) 4 commits
536
+* cc/replace-edit (2014-05-19) 10 commits
537
+ (merged to 'next' on 2014-05-19 at fcdd83f)
538
+ + Documentation: replace: describe new --edit option
539
+ + replace: add --edit to usage string
540
+ + replace: add tests for --edit
541
+ + replace: die early if replace ref already exists
542
+ + replace: refactor checking ref validity
543
+ + replace: make sure --edit results in a different object
544
(merged to 'next' on 2014-05-12 at 71449bf)
545
+ replace: add --edit option
546
+ replace: factor object resolution out of replace_object
547
+ replace: use OPT_CMDMODE to handle modes
548
+ replace: refactor command-mode determination
549
+ (this branch is used by cc/replace-graft.)
550
551
"git replace" learns a new "--edit" option.
552
@@ -445,9 +564,10 @@ of the repositories listed at
564
565
566
* dk/blame-reorg (2014-04-28) 1 commit
448
- - blame: large-scale performance rewrite
567
+ (merged to 'next' on 2014-05-14 at 354a0e3)
568
+ + blame: large-scale performance rewrite
569
450
- Will merge to 'next' and keep it there for the rest of this cycle.
570
+ Will keep in 'next' for the remainder of the cycle.
571
572
573
* je/pager-do-not-recurse (2014-04-28) 1 commit
@@ -535,49 +655,14 @@ of the repositories listed at
655
656
657
* bc/blame-crlf-test (2014-05-08) 1 commit
538
- - blame: correctly handle files regardless of autocrlf
658
+ (merged to 'next' on 2014-05-14 at b819505)
659
+ + blame: correctly handle files regardless of autocrlf
660
661
If a file contained CRLF line endings in a repository with
662
core.autocrlf=input, then blame always marked lines as "Not
663
Committed Yet", even if they were unmodified.
664
544
- Will merge to 'next' and keep it there for the rest of this cycle.
545
-
546
-
547
-* rs/ref-transaction (2014-04-29) 27 commits
548
- - refs.c: make lock_ref_sha1 static
549
- - refs.c: make write_ref_sha1 static
550
- - walker.c: use ref transaction for ref updates
551
- - fast-import.c: use a ref transaction when dumping tags
552
- - receive-pack.c: use a reference transaction for updating the refs
553
- - fetch.c: use a single ref transaction for all ref updates
554
- - fetch.c: change s_update_ref to use a ref transaction
555
- - fetch.c: clear errno before calling functions that might set it
556
- - refs.c: ref_transaction_commit should not free the transaction
557
- - refs.c: free the transaction before returning when number of updates is 0
558
- - refs.c: change update_ref to use a transaction
559
- - branch.c: use ref transaction for all ref updates
560
- - fast-import.c: change update_branch to use ref transactions
561
- - sequencer.c: use ref transactions for all ref updates
562
- - commit.c: use ref transactions for updates
563
- - replace.c: use the ref transaction functions for updates
564
- - tag.c: use ref transactions when doing updates
565
- - refs.c: ref_transaction_delete to check for error and return status
566
- - refs.c: change ref_transaction_create to do error checking and return status
567
- - refs.c: change ref_transaction_update() to do error checking and return status
568
- - refs.c: remove the onerr argument to ref_transaction_commit
569
- - refs.c: make update_ref_write update a strbuf on failure
570
- - update-ref.c: log transaction error from the update_ref
571
- - refs.c: make ref_update_reject_duplicates take a strbuf argument for errors
572
- - refs.c: add a strbuf argument to ref_transaction_commit for error logging
573
- - refs.c: allow passing NULL to ref_transaction_free
574
- - refs.c: constify the sha arguments for ref_transaction_create|delete|update
575
- (this branch uses mh/ref-transaction.)
576
-
577
- Updates most of the callsites to write_sha1_ref(), the low-level
578
- mechanism to update a ref, to use the ref-transaction API.
579
-
580
- Expecting a reroll.
665
+ Will keep in 'next' for the remainder of the cycle.
666
667
668
* ep/shell-command-substitution (2014-04-30) 41 commits
@@ -637,6 +722,8 @@ of the repositories listed at
722
Allow specifying only certain individual test pieces to be run
723
using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").
724
725
+ Needs a reroll/squash to fix bash-isms.
726
+
727
728
* mm/mediawiki-encoding-fix (2014-04-23) 2 commits
729
(merged to 'next' on 2014-05-02 at 7744361)
@@ -653,27 +740,6 @@ of the repositories listed at
740
Will keep in 'next' for the remainder of the cycle.
741
742
656
-* fc/remote-helpers-hg-bzr-graduation (2014-04-29) 11 commits
657
- - remote-hg: trivial cleanups
658
- - remote-hg: make sure we omit multiple heads
659
- - git-remote-hg: use internal clone's hgrc
660
- - t: remote-hg: split into setup test
661
- - remote-hg: properly detect missing contexts
662
- - remote-{hg,bzr}: store marks only on success
663
- - remote-hg: update to 'public' phase when pushing
664
- - remote-hg: fix parsing of custom committer
665
- (merged to 'next' on 2014-04-22 at fed170a)
666
- + remote-helpers: move tests out of contrib
667
- + remote-helpers: move out of contrib
668
- + remote-helpers: squelch python import exceptions
669
-
670
- As there were announcements for these two to be maintained as
671
- independent third-party projects ($gmane/248561, $gmane/248583),
672
- this topic would need to be discarded after 2.0 final, and copies
673
- in contrib/remote-helpers/ may need to be replaced with a README
674
- with pointers to their canonical repository.
675
-
676
-
743
* fc/remote-helper-refmap (2014-04-21) 8 commits
744
(merged to 'next' on 2014-04-22 at fb5a4c2)
745
+ transport-helper: remove unnecessary strbuf resets
@@ -765,22 +831,6 @@ of the repositories listed at
831
Will keep in 'next' for the remainder of the cycle.
832
833
768
-* fc/publish-vs-upstream (2014-04-21) 8 commits
769
- - sha1_name: add support for @{publish} marks
770
- - sha1_name: simplify track finding
771
- - sha1_name: cleanup interpret_branch_name()
772
- - branch: display publish branch
773
- - push: add --set-publish option
774
- - branch: add --set-publish-to option
775
- - Add concept of 'publish' branch
776
- - t5516 (fetch-push): fix test restoration
777
-
778
- Add branch@{publish}; it seems that this is somewhat different from
779
- Ram and Peff started working on. There were many discussion
780
- messages going back and forth but it does not appear that the
781
- design issues have been worked out among participants yet.
782
-
783
-
834
* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
835
- git-gui: show staged submodules regardless of ignore config
836
@@ -954,7 +1004,6 @@ of the repositories listed at
1004
+ parse_arg(): really test that argument is properly terminated
1005
+ t1400: provide more usual input to the command
1006
+ t1400: fix name and expected result of one test
957
- (this branch is used by rs/ref-transaction.)
1007
1008
Update "update-ref --stdin [-z]" and then introduce a transactional
1009
support for (multi-)reference updates.
@@ -1089,3 +1138,85 @@ of the repositories listed at
1138
this, but it was easy enough to cobble together. Tests, docs and
1139
stripping out more MIMEy stuff are left as exercises to interested
1140
parties.
1141
+
1142
+
1143
+* jc/graduate-remote-hg-bzr (2014-05-19) 1 commit
1144
+ (merged to 'next' on 2014-05-19 at eeb9af6)
1145
+ + remote-helpers: give short instructions to download the latest
1146
+
1147
+ Reverted from 'next'.
1148
+
1149
+
1150
+* mt/rebase-i-ack (2014-05-19) 6 commits
1151
+ . git-ack: record an ack
1152
+ . rebase: test ack
1153
+ . git-rebase: document ack
1154
+ . rebase -i: add ack action
1155
+ + test: add test_write_lines helper
1156
+ + patch-id: make it stable against hunk reordering
1157
+ (this branch is tangled with mt/patch-id-stable.)
1158
+
1159
+ Will be rerolled post 2.0
1160
+
1161
+
1162
+* fc/remote-hg-fixes-for-hg-3.0 (2014-05-08) 5 commits
1163
+ . [DONTMERGE-not signed-off] remote-hg: work with older versions of mercurial
1164
+ . remote-hg: add support for hg v3.0
1165
+ . t: remote-hg: trivial cleanups and fixes
1166
+ . t: remote-hg: add file operation tests
1167
+ . remote-hg: add more tests
1168
+
1169
+ No longer relevant, as 'master' unbundles contrib/remote-helpers/.
1170
+
1171
+
1172
+* rs/ref-transaction (2014-04-29) 27 commits
1173
+ . refs.c: make lock_ref_sha1 static
1174
+ . refs.c: make write_ref_sha1 static
1175
+ . walker.c: use ref transaction for ref updates
1176
+ . fast-import.c: use a ref transaction when dumping tags
1177
+ . receive-pack.c: use a reference transaction for updating the refs
1178
+ . fetch.c: use a single ref transaction for all ref updates
1179
+ . fetch.c: change s_update_ref to use a ref transaction
1180
+ . fetch.c: clear errno before calling functions that might set it
1181
+ . refs.c: ref_transaction_commit should not free the transaction
1182
+ . refs.c: free the transaction before returning when number of updates is 0
1183
+ . refs.c: change update_ref to use a transaction
1184
+ . branch.c: use ref transaction for all ref updates
1185
+ . fast-import.c: change update_branch to use ref transactions
1186
+ . sequencer.c: use ref transactions for all ref updates
1187
+ . commit.c: use ref transactions for updates
1188
+ . replace.c: use the ref transaction functions for updates
1189
+ . tag.c: use ref transactions when doing updates
1190
+ . refs.c: ref_transaction_delete to check for error and return status
1191
+ . refs.c: change ref_transaction_create to do error checking and return status
1192
+ . refs.c: change ref_transaction_update() to do error checking and return status
1193
+ . refs.c: remove the onerr argument to ref_transaction_commit
1194
+ . refs.c: make update_ref_write update a strbuf on failure
1195
+ . update-ref.c: log transaction error from the update_ref
1196
+ . refs.c: make ref_update_reject_duplicates take a strbuf argument for errors
1197
+ . refs.c: add a strbuf argument to ref_transaction_commit for error logging
1198
+ . refs.c: allow passing NULL to ref_transaction_free
1199
+ . refs.c: constify the sha arguments for ref_transaction_create|delete|update
1200
+ (this branch uses mh/ref-transaction; is tangled with rs/ref-transaction-2.)
1201
+
1202
+ Temporarily dropped; there are a lot of conflicts with topics in
1203
+ flight, and the topic is still being worked on with frequent
1204
+ rerolls. Will pick up a reroll once things settle down a bit after
1205
+ the release.
1206
+
1207
+
1208
+* fc/remote-helpers-hg-bzr-graduation (2014-04-29) 11 commits
1209
+ . remote-hg: trivial cleanups
1210
+ . remote-hg: make sure we omit multiple heads
1211
+ . git-remote-hg: use internal clone's hgrc
1212
+ . t: remote-hg: split into setup test
1213
+ . remote-hg: properly detect missing contexts
1214
+ . remote-{hg,bzr}: store marks only on success
1215
+ . remote-hg: update to 'public' phase when pushing
1216
+ . remote-hg: fix parsing of custom committer
1217
+ (merged to 'next' on 2014-04-22 at fed170a)
1218
+ + remote-helpers: move tests out of contrib
1219
+ + remote-helpers: move out of contrib
1220
+ + remote-helpers: squelch python import exceptions
1221
+
1222
+ No longer relevant, as 'master' unbundles contrib/remote-helpers/.