What's cooking (2016/06 #06)
Junio C Hamano committed
Jun 19, 2016 at 15:45 UTC
fbf4247720561ac9d16a0cabd45b284d97368a10
1 file changed
+252
-175
whats-cooking.txt
+252
-175
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2016, #05; Thu, 16)
3
+Subject: What's cooking in git.git (Jun 2016, #06; Sun, 19)
4
X-master-at: 05219a1276341e72d8082d76b7f5ed394b7437a4
5
X-next-at: 3dc84b0c19932ec9947ca4936b6bfd6421ccb1b4
6
7
-What's cooking in git.git (Jun 2016, #05; Thu, 16)
7
+What's cooking in git.git (Jun 2016, #06; Sun, 19)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,11 +12,9 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-Let's start a new cycle by rewinding the tip of 'next' soonish. I
16
-expect I'd eject a few premature topics out of 'next' while doing
17
-so. There are many topics that need input from the list (look for
18
-'?' in this document) to decide either to drop them or to move them
19
-forward.
15
+The tip of 'next' will be rewound and rebuilt, soon after the topics
16
+that have been cooking graduates to 'master', which in turn will
17
+happen RSN.
18
19
You can find the changes described here in the integration branches
20
of the repositories listed at
@@ -26,96 +24,129 @@ of the repositories listed at
24
--------------------------------------------------
25
[New Topics]
26
29
-* ap/git-svn-propset-doc (2016-06-15) 1 commit
30
- - git-svn: document the 'git svn propset' command
27
+* em/newer-freebsd-shells-are-fine-with-returns (2016-06-17) 1 commit
28
+ - rebase: update comment about FreeBSD /bin/sh
29
32
- "git svn propset" subcommand that was added in 2.3 days is
33
- documented now.
30
+ Comments about misbehaving FreeBSD shells have been clarified with
31
+ the version number (9.x and before are broken, newer ones are OK).
32
33
Will merge to 'next'.
34
35
38
-* jk/add-i-diff-compact-heuristics (2016-06-16) 1 commit
39
- - add--interactive: respect diff.compactionHeuristic
40
-
41
- "git add -i/-p" learned to honor diff.compactionHeuristic
42
- experimental knob, so that the user can work on the same hunk split
43
- as "git diff" output.
44
-
45
- Will merge to 'next'.
36
+* mg/signature-doc (2016-06-17) 4 commits
37
+ - Documentation/technical: signed merge tag format
38
+ - Documentation/technical: signed commit format
39
+ - Documentation/technical: signed tag format
40
+ - Documentation/technical: describe signature formats
41
42
+ Formats of the various data (and how to validate them) where we use
43
+ GPG signature have been documented.
44
48
-* jk/big-and-old-archive-tar (2016-06-16) 2 commits
49
- - archive-tar: write extended headers for far-future mtime
50
- - archive-tar: write extended headers for file sizes >= 8GB
51
-
52
- "git archive" learned to handle files that are larger than 8GB and
53
- commits far in the future than expressible by the traditional US-TAR
54
- format.
55
-
56
- Will merge to 'next'.
57
-
58
-
59
-* jk/gpg-interface-cleanup (2016-06-16) 7 commits
60
- - gpg-interface: check gpg signature creation status
61
- - sign_buffer: use pipe_command
62
- - verify_signed_buffer: use pipe_command
63
- - run-command: add pipe_command helper
64
- - verify_signed_buffer: use tempfile object
65
- - verify_signed_buffer: drop pbuf variable
66
- - gpg-interface: use child_process.args
45
68
- A new run-command API function pipe_command() is introduced to
69
- sanely feed data to the standard input while capturing data from
70
- the standard output and the standard error of an external process,
71
- which is cumbersome to hand-roll correctly without deadlocking.
46
+* jk/string-list-static-init (2016-06-13) 2 commits
47
+ - use string_list initializer consistently
48
+ - Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init
49
+ (this branch uses jk/parseopt-string-list.)
50
73
- The codepath to sign data in a prepared buffer with GPG has been
74
- updated to use this API to read from the status-fd to check for
75
- errors (instead of relying on GPG's exit status).
51
+ Instead of taking advantage of a struct string_list that is
52
+ allocated with all NULs happens to be STRING_LIST_INIT_NODUP kind,
53
+ initialize them explicitly as such, to document their behaviour
54
+ better.
55
56
Will merge to 'next'.
57
58
80
-* lf/sideband-returns-void (2016-06-16) 2 commits
81
- - upload-pack.c: make send_client_data() return void
82
- - sideband.c: make send_sideband() return void
83
-
84
- A small internal API cleanup.
59
+* mh/ref-store (2016-06-07) 38 commits
60
+ - refs: implement iteration over only per-worktree refs
61
+ - refs: make lock generic
62
+ - refs: add method to rename refs
63
+ - refs: add methods to init refs db
64
+ - refs: add method for delete_refs
65
+ - refs: add method for initial ref transaction commit
66
+ - refs: add methods for reflog
67
+ - refs: add method iterator_begin
68
+ - files_ref_iterator_begin(): take a ref_store argument
69
+ - split_symref_update(): add a files_ref_store argument
70
+ - lock_ref_sha1_basic(): add a files_ref_store argument
71
+ - lock_ref_for_update(): add a files_ref_store argument
72
+ - commit_ref_update(): add a files_ref_store argument
73
+ - lock_raw_ref(): add a files_ref_store argument
74
+ - repack_without_refs(): add a files_ref_store argument
75
+ - refs: make peel_ref() virtual
76
+ - refs: make create_symref() virtual
77
+ - refs: make pack_refs() virtual
78
+ - refs: make verify_refname_available() virtual
79
+ - refs: make read_raw_ref() virtual
80
+ - resolve_gitlink_ref(): rename path parameter to submodule
81
+ - resolve_gitlink_ref(): avoid memory allocation in many cases
82
+ - resolve_gitlink_ref(): implement using resolve_ref_recursively()
83
+ - resolve_ref_recursively(): new function
84
+ - read_raw_ref(): take a (struct ref_store *) argument
85
+ - resolve_gitlink_packed_ref(): remove function
86
+ - resolve_packed_ref(): rename function from resolve_missing_loose_ref()
87
+ - refs: reorder definitions
88
+ - refs: add a transaction_commit() method
89
+ - {lock,commit,rollback}_packed_refs(): add files_ref_store arguments
90
+ - resolve_missing_loose_ref(): add a files_ref_store argument
91
+ - get_packed_ref(): add a files_ref_store argument
92
+ - add_packed_ref(): add a files_ref_store argument
93
+ - refs: create a base class "ref_store" for files_ref_store
94
+ - refs: add a backend method structure
95
+ - refs: rename struct ref_cache to files_ref_store
96
+ - rename_ref_available(): add docstring
97
+ - resolve_gitlink_ref(): eliminate temporary variable
98
+ (this branch uses mh/ref-iterators and mh/split-under-lock; is tangled with mh/update-ref-errors.)
99
+
100
+ As mh/split-under-lock will be replaced, this needs to be rebuilt
101
+ on top.
102
+
103
+
104
+* mh/update-ref-errors (2016-06-10) 6 commits
105
+ - lock_ref_for_update(): avoid a symref resolution
106
+ - lock_ref_for_update(): make error handling more uniform
107
+ - t1404: add more tests of update-ref error handling
108
+ - t1404: document function test_update_rejected
109
+ - t1404: remove "prefix" argument to test_update_rejected
110
+ - t1404: rename file to t1404-update-ref-errors.sh
111
+ (this branch uses mh/split-under-lock; is tangled with mh/ref-iterators and mh/ref-store.)
112
+
113
+ As mh/split-under-lock will be replaced, this needs to be rebuilt
114
+ on top.
115
+
116
+
117
+* jh/clean-smudge-annex (2016-06-17) 5 commits
118
+ - warn on unusable smudgeToFile/cleanFromFile config
119
+ - use smudgeToFile in git checkout etc
120
+ - use cleanFromFile in git add
121
+ - add smudgeToFile and cleanFromFile filter configs
122
+ - clarify %f documentation
123
+
124
+ The interface to "clean/smudge" filters require Git to feed the
125
+ whole contents via pipe, which is suboptimal for some
126
+ applications. "cleanFromFile/smudgeToFile" commands are the moral
127
+ equilvalents for these filters but they interact with the files on
128
+ the filesystem directly.
129
+
130
+ This unfortunately does not build when merged to 'pu', as there are
131
+ interactions with other topic(s).
132
+
133
+
134
+* lc/shell-default-value-noexpand (2016-06-19) 1 commit
135
+ - sh-setup: enclose setting of ${VAR=default} in double-quotes
136
+
137
+ Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
138
+ to set the default value, without enclosing it in double quotes.
139
140
Will merge to 'next'.
141
142
89
-* nd/graph-width-padded (2016-06-16) 2 commits
90
- - pretty.c: support <direction>|(<negative number>) forms
91
- - pretty: pass graph width to pretty formatting for use in '%>|(N)'
143
+* sb/clone-shallow-passthru (2016-06-19) 1 commit
144
+ - clone: do not let --depth imply --shallow-submodules
145
93
- "log --graph --format=" learned that "%>|(N)" specifies the width
94
- relative to the terminal's left edge, not relative to the area to
95
- draw text that is to the right of the ancestry-graph section. It
96
- also now accepts negative N that means the column limit is relative
97
- to the right border.
98
-
99
- Will merge to 'next'.
100
-
101
-
102
-* dn/gpg-doc (2016-06-16) 1 commit
103
- - Documentation: GPG capitalization
104
-
105
- The documentation tries to consistently spell "GPG"; when
106
- referring to the specific program name, "gpg" is used.
107
-
108
- Will merge to 'next'.
109
-
110
-
111
-* jk/bisect-show-tree (2016-06-16) 1 commit
112
- - bisect: always call setup_revisions after init_revisions
113
-
114
- "git bisect" makes an internal call to "git diff-tree" when
115
- bisection finds the culprit, but this call did not initialize the
116
- data structure to pass to the diff-tree API correctly.
117
-
118
- Will merge to 'next'.
146
+ Fix an unintended regression in v2.9 that breaks "clone --depth"
147
+ that recurses down to submodules by forcing the submodules to also
148
+ be cloned shallowly, which many server instances that host upstream
149
+ of the submodules are not prepared for.
150
151
--------------------------------------------------
152
[Stalled]
@@ -205,8 +236,9 @@ of the repositories listed at
236
237
"git grep -i" has been taught to fold case in non-ascii locales.
238
208
- This really needs review. What it attempts to achieve is
209
- worthwhile, I would think ($gmane/286137).
239
+ What it attempts to achieve is worthwhile, I would think, but
240
+ it seems to be broken, unfortunately.
241
+ ($gmane/286137, 297593, 297605).
242
243
244
* ec/annotate-deleted (2015-11-20) 1 commit
@@ -257,6 +289,98 @@ of the repositories listed at
289
--------------------------------------------------
290
[Cooking]
291
292
+* ap/git-svn-propset-doc (2016-06-15) 1 commit
293
+ - git-svn: document the 'git svn propset' command
294
+
295
+ "git svn propset" subcommand that was added in 2.3 days is
296
+ documented now.
297
+
298
+ Will merge to 'next'.
299
+
300
+
301
+* jk/add-i-diff-compact-heuristics (2016-06-16) 1 commit
302
+ - add--interactive: respect diff.compactionHeuristic
303
+
304
+ "git add -i/-p" learned to honor diff.compactionHeuristic
305
+ experimental knob, so that the user can work on the same hunk split
306
+ as "git diff" output.
307
+
308
+ Will merge to 'next'.
309
+
310
+
311
+* jk/big-and-future-archive-tar (2016-06-17) 2 commits
312
+ - archive-tar: write extended headers for far-future mtime
313
+ - archive-tar: write extended headers for file sizes >= 8GB
314
+
315
+ "git archive" learned to handle files that are larger than 8GB and
316
+ commits far in the future than expressible by the traditional US-TAR
317
+ format.
318
+
319
+ Will merge to 'next'.
320
+
321
+
322
+* jk/gpg-interface-cleanup (2016-06-17) 7 commits
323
+ - gpg-interface: check gpg signature creation status
324
+ - sign_buffer: use pipe_command
325
+ - verify_signed_buffer: use pipe_command
326
+ - run-command: add pipe_command helper
327
+ - verify_signed_buffer: use tempfile object
328
+ - verify_signed_buffer: drop pbuf variable
329
+ - gpg-interface: use child_process.args
330
+
331
+ A new run-command API function pipe_command() is introduced to
332
+ sanely feed data to the standard input while capturing data from
333
+ the standard output and the standard error of an external process,
334
+ which is cumbersome to hand-roll correctly without deadlocking.
335
+
336
+ The codepath to sign data in a prepared buffer with GPG has been
337
+ updated to use this API to read from the status-fd to check for
338
+ errors (instead of relying on GPG's exit status).
339
+
340
+ Will merge to 'next'.
341
+
342
+
343
+* lf/sideband-returns-void (2016-06-16) 2 commits
344
+ - upload-pack.c: make send_client_data() return void
345
+ - sideband.c: make send_sideband() return void
346
+
347
+ A small internal API cleanup.
348
+
349
+ Will merge to 'next'.
350
+
351
+
352
+* nd/graph-width-padded (2016-06-16) 2 commits
353
+ - pretty.c: support <direction>|(<negative number>) forms
354
+ - pretty: pass graph width to pretty formatting for use in '%>|(N)'
355
+
356
+ "log --graph --format=" learned that "%>|(N)" specifies the width
357
+ relative to the terminal's left edge, not relative to the area to
358
+ draw text that is to the right of the ancestry-graph section. It
359
+ also now accepts negative N that means the column limit is relative
360
+ to the right border.
361
+
362
+ Will merge to 'next'.
363
+
364
+
365
+* dn/gpg-doc (2016-06-16) 1 commit
366
+ - Documentation: GPG capitalization
367
+
368
+ The documentation tries to consistently spell "GPG"; when
369
+ referring to the specific program name, "gpg" is used.
370
+
371
+ Will merge to 'next'.
372
+
373
+
374
+* jk/bisect-show-tree (2016-06-16) 1 commit
375
+ - bisect: always call setup_revisions after init_revisions
376
+
377
+ "git bisect" makes an internal call to "git diff-tree" when
378
+ bisection finds the culprit, but this call did not initialize the
379
+ data structure to pass to the diff-tree API correctly.
380
+
381
+ Will merge to 'next'.
382
+
383
+
384
* lv/status-say-working-tree-not-directory (2016-06-09) 1 commit
385
- Use "working tree" instead of "working directory" for git status
386
@@ -443,6 +567,8 @@ of the repositories listed at
567
(merged to 'next' on 2016-06-06 at 536102f)
568
+ userdiff: add built-in pattern for CSS
569
570
+ Originally merged to 'next' on 2016-06-06
571
+
572
Update the funcname definition to support css files.
573
574
Will merge to 'master'.
@@ -470,6 +596,8 @@ of the repositories listed at
596
+ rev-list: disable bitmaps when "-n" is used with listing objects
597
+ rev-list: "adjust" results of "--count --use-bitmap-index -n"
598
599
+ Originally merged to 'next' on 2016-06-06
600
+
601
"git rev-list --count" whose walk-length is limited with "-n"
602
option did not work well with the counting optimized to look at the
603
bitmap index.
@@ -494,10 +622,15 @@ of the repositories listed at
622
+ refs: remove unnecessary "extern" keywords
623
(this branch is used by mh/ref-store; uses mh/split-under-lock; is tangled with mh/update-ref-errors.)
624
625
+ Originally merged to 'next' on 2016-06-06
626
+
627
The API to iterate over all the refs (i.e. for_each_ref(), etc.)
628
has been revamped.
629
500
- Will merge to 'master'.
630
+ As mh/split-under-lock will be replaced, this needs to be rebuilt
631
+ on top.
632
+
633
+ Will eject from 'next'.
634
635
636
* ew/mboxrd-format-am (2016-06-06) 3 commits
@@ -615,6 +748,8 @@ of the repositories listed at
748
(merged to 'next' on 2016-06-06 at 505f1ee)
749
+ upload-pack.c: use parse-options API
750
751
+ Originally merged to 'next' on 2016-06-06
752
+
753
"git upload-pack" command has been updated to use the parse-options
754
API.
755
@@ -625,6 +760,8 @@ of the repositories listed at
760
(merged to 'next' on 2016-06-06 at 9e7e291)
761
+ pathspec: rename free_pathspec() to clear_pathspec()
762
763
+ Originally merged to 'next' on 2016-06-06
764
+
765
We usually call a function that clears the contents a data
766
structure X without freeing the structure itself clear_X(), and
767
call a function that does clear_X() and also frees it free_X().
@@ -640,6 +777,8 @@ of the repositories listed at
777
+ submodule-config: keep shallow recommendation around
778
(this branch is used by sb/submodule-clone-retry.)
779
780
+ Originally merged to 'next' on 2016-05-31
781
+
782
An upstream project can make a recommendation to make only a
783
shallow clone for some submodules in the .gitmodules file it ship.
784
@@ -654,7 +793,7 @@ of the repositories listed at
793
Needs review.
794
795
657
-* va/i18n-even-more (2016-06-07) 38 commits
796
+* va/i18n-even-more (2016-06-17) 38 commits
797
- i18n: branch: mark comment when editing branch description for translation
798
- i18n: unmark die messages for translation
799
- i18n: submodule: escape shell variables inside eval_gettext
@@ -684,7 +823,7 @@ of the repositories listed at
823
- i18n: bisect: simplify error message for i18n
824
- i18n: rebase: mark placeholder for translation
825
- i18n: rebase: fix marked string to use eval_gettext variant
687
- - merge-octupus: use die shell function from git-sh-setup.sh
826
+ - merge-octopus: use die shell function from git-sh-setup.sh
827
- i18n: merge-octopus: mark messages for translation
828
- i18n: sequencer: mark string for translation
829
- i18n: sequencer: mark entire sentences for translation
@@ -698,7 +837,7 @@ of the repositories listed at
837
to pass GETTEXT_POISON tests.
838
839
One patch from the original submission dropped due to conflicts
701
- with other topics in flight.
840
+ with jk/upload-pack-hook, which is still in flux.
841
842
Will merge to 'next'.
843
@@ -707,6 +846,8 @@ of the repositories listed at
846
(merged to 'next' on 2016-06-02 at 3959ef6)
847
+ worktree: allow "-" short-hand for @{-1} in add command
848
849
+ Originally merged to 'next' on 2016-06-02
850
+
851
"git worktree add" learned that '-' can be used as a short-hand for
852
"@{-1}", the previous branch.
853
@@ -743,6 +884,8 @@ of the repositories listed at
884
(merged to 'next' on 2016-05-31 at 1e9c920)
885
+ format_commit_message: honor `color=auto` for `%C(auto)`
886
887
+ Originally merged to 'next' on 2016-05-31
888
+
889
%C(auto) in a custom format string that commands in `git log`
890
family takes unconditionally turned the color on, ignoring
891
--no-color or --color=auto with output not connected to a tty;
@@ -755,6 +898,8 @@ of the repositories listed at
898
(merged to 'next' on 2016-05-31 at c32acf1)
899
+ daemon: enable SO_KEEPALIVE for all sockets
900
901
+ Originally merged to 'next' on 2016-05-31
902
+
903
When "git daemon" is run without --[init-]timeout specified, a
904
connection from a client that silently goes offline can hang around
905
for a long time, wasting resources. The socket-level KEEPALIVE has
@@ -775,8 +920,7 @@ of the repositories listed at
920
Allow a custom "git upload-pack" replacement to respond to
921
"fetch/clone" request.
922
778
- Still under discussion???
779
- ($gmane/295705).
923
+ Will merge to 'next'.
924
925
926
* rs/xdiff-hunk-with-func-line (2016-06-09) 9 commits
@@ -792,6 +936,8 @@ of the repositories listed at
936
+ xdiff: factor out match_func_rec()
937
+ t4051: rewrite, add more tests
938
939
+ Originally merged to 'next' on 2016-06-10
940
+
941
"git show -W" (extend hunks to cover the entire function, delimited
942
by lines that match the "funcname" pattern) used to show the entire
943
file when a change added an entire function at the end of the file,
@@ -804,6 +950,8 @@ of the repositories listed at
950
(merged to 'next' on 2016-05-31 at 0d07b9c)
951
+ submodule update: make use of the existing fetch_in_submodule function
952
953
+ Originally merged to 'next' on 2016-05-31
954
+
955
Minor simplification.
956
957
Will merge to 'master'.
@@ -821,12 +969,15 @@ of the repositories listed at
969
(this branch uses jc/attr and sb/pathspec-label; is tangled with jc/attr-more.)
970
971
Will hold.
972
+ The jc/attr topic that this depends on needs to be redone.
973
974
975
* ah/no-verify-signature-with-pull-rebase (2016-05-20) 1 commit
976
(merged to 'next' on 2016-05-31 at 30add83)
977
+ pull: warn on --verify-signatures with --rebase
978
979
+ Originally merged to 'next' on 2016-05-31
980
+
981
"git pull --rebase --verify-signature" learned to warn the user
982
that "--verify-signature" is a no-op.
983
@@ -865,6 +1016,8 @@ of the repositories listed at
1016
+ commit.c: use strchrnul() to scan for one line
1017
(this branch is used by jc/attr-more, sb/pathspec-label and sb/submodule-default-paths.)
1018
1019
+ Originally merged to 'next' on 2016-05-31
1020
+
1021
The attributes API has been updated so that it can later be
1022
optimized using the knowledge of which attributes are queried.
1023
@@ -926,6 +1079,8 @@ of the repositories listed at
1079
+ builtin/apply: avoid parameter shadowing 'p_value' global
1080
+ builtin/apply: make gitdiff_verify_name() return void
1081
1082
+ Originally merged to 'next' on 2016-06-06
1083
+
1084
The "git apply" standalone program is being libified; this is the
1085
first step to move many state variables into a structure that can
1086
be explicitly (re)initialized to make the machinery callable more
@@ -963,6 +1118,8 @@ of the repositories listed at
1118
+ Documentation: fix a typo
1119
(this branch is used by sb/submodule-default-paths; uses jc/attr; is tangled with jc/attr-more.)
1120
1121
+ Originally merged to 'next' on 2016-06-03
1122
+
1123
The pathspec mechanism learned ":(attr:X)$pattern" pathspec magic
1124
to limit paths that match $pattern further by attribute settings.
1125
The preload-index mechanism is disabled when the new pathspec magic
@@ -1024,10 +1181,13 @@ of the repositories listed at
1181
+ t1404: demonstrate a bug resolving references
1182
(this branch is used by mh/ref-iterators, mh/ref-store and mh/update-ref-errors.)
1183
1184
+ Originally merged to 'next' on 2016-06-03
1185
+
1186
Further preparatory work on the refs API before the pluggable
1187
backend series can land.
1188
1030
- Will merge to 'master'.
1189
+ Will eject from 'next'.
1190
+ Will be replaced with the updated one from Michael after that.
1191
1192
1193
* ew/fast-import-unpack-limit (2016-05-29) 2 commits
@@ -1036,6 +1196,8 @@ of the repositories listed at
1196
(merged to 'next' on 2016-05-11 at ffd4efb)
1197
+ fast-import: implement unpack limit
1198
1199
+ Originally merged to 'next' on 2016-05-29
1200
+
1201
"git fast-import" learned the same performance trick to avoid
1202
creating too small a packfile as "git fetch" and "git push" have,
1203
using *.unpackLimit configuration.
@@ -1109,7 +1271,8 @@ of the repositories listed at
1271
optionally interface with the watchman daemon to further reduce the
1272
refresh cost.
1273
1112
- Are people happy with this version? If so will merge to 'next'.
1274
+ Belated review comments still trickling in.
1275
+ Will hold.
1276
($gmane/295106).
1277
1278
@@ -1142,89 +1305,3 @@ of the repositories listed at
1305
It has been reported that git-gui still uses the deprecated syntax,
1306
which needs to be fixed before this final step can proceed.
1307
($gmane/282594)
1145
-
1146
---------------------------------------------------
1147
-[Discarded]
1148
-
1149
-* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
1150
- . am: make a direct call to merge_recursive
1151
- . merge_recursive_options: introduce the "gently" flag
1152
-
1153
- The merge_recursive_generic() function has been made a bit safer to
1154
- call from inside a process. "git am -3" was taught to make a direct
1155
- call to the function when falling back to three-way merge.
1156
-
1157
- Being able to make a direct call would be good in general, but as a
1158
- performance thing, the change needs to be backed up by numbers.
1159
-
1160
- I haven't gone through the "gently" change with fine toothed comb;
1161
- I can see that the change avoids calling die(), but I haven't made
1162
- sure that the program states (e.g. what's in the in-core index) are
1163
- adjusted sensibly when it returns to the caller instead of dying,
1164
- or the codepaths that used to die() are free of resource leaks.
1165
- The original code certainly did not care the program states at the
1166
- point of dying exactly because it knew it is going to exit, but now
1167
- they have to care, and they need to be audited.
1168
-
1169
- Has a lot of conflict when merged to 'pu' these days, so let's
1170
- eject it from our tree for now.
1171
-
1172
- Will discard.
1173
- ($gmane/292205)
1174
-
1175
-
1176
-* nd/i-t-a-commitable (2016-06-06) 3 commits
1177
- . commit: don't count i-t-a entries when checking if the new commit is empty
1178
- . Resurrect "diff-lib.c: adjust position of i-t-a entries in diff"
1179
- . diff.h: extend "flags" field to 64 bits because we're out of bits
1180
-
1181
- "rm .git/index && git add -N * && git commit" allows you to create
1182
- an empty commit without --allow-empty; attempt to forbid it.
1183
-
1184
- Retracted.
1185
- Will discard.
1186
- ($gmane/297362)
1187
-
1188
-
1189
-* jc/merge-impossible-no-commit (2016-04-26) 2 commits
1190
- . merge: warn --no-commit merge when no new commit is created
1191
- . merge: do not contaminate option_commit with --squash
1192
-
1193
- "git merge --no-commit" silently succeeded when there is no need to
1194
- create any commit, either when you are more recent than the commit
1195
- you tried to merge, or you can fast-forward to the commit you tried
1196
- to merge. The command gives a warning message in such cases.
1197
-
1198
- Just tying loose ends in a discussion. Unless somebody else
1199
- champions this topic, I'll drop it.
1200
-
1201
- Will discard.
1202
-
1203
-
1204
-* bc/cocci-object-id (2016-06-06) 8 commits
1205
- . merge-recursive: convert merge_recursive_generic to object_id
1206
- . merge-recursive: convert leaf functions to use struct object_id
1207
- . merge-recursive: convert struct merge_file_info to object_id
1208
- . merge-recursive: convert struct stage_data to use object_id
1209
- . Rename struct diff_filespec's sha1_valid member.
1210
- . Convert struct diff_filespec to struct object_id
1211
- . Apply standard object_id Coccinelle transformations.
1212
- . Add basic Coccinelle transforms.
1213
-
1214
- Move from "unsigned char [20]" to "struct object_id" continues,
1215
- with help from an automated tool.
1216
-
1217
- Will discard.
1218
- ($gmane/296749)
1219
-
1220
-
1221
-* az/p4-bare-no-rebase (2016-02-19) 1 commit
1222
- - git-p4.py: Don't try to rebase on submit from bare repository
1223
-
1224
- "git p4 submit" attempts to do a rebase, which would fail if done
1225
- in a bare repository. Not doing this rebase would paper over the
1226
- failure, which is what this patch does, but it is unclear what the
1227
- side effect of not rebasing is.
1228
-
1229
- Retracted.
1230
- ($gmane/296722)