What's cooking (2016/04 #02)
Junio C Hamano committed
Apr 4, 2016 at 14:15 UTC
dfed1af1eb6e7b48a8f62563dc60ec5055e6a2c4
1 file changed
+347
-298
whats-cooking.txt
+347
-298
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2016, #01; Fri, 1)
4
-X-master-at: 90f7b16b3adc78d4bbabbd426fb69aa78c714f71
5
-X-next-at: 9d4de1f0cb995171390ad99185bae1b0cbc1de70
3
+Subject: What's cooking in git.git (Apr 2016, #02; Mon, 4)
4
+X-master-at: 6a269e52a5d0c82567c5b39cc194cc90f9fa9156
5
+X-next-at: a49ec4a3520e76c257792c73d6347383649ee5c2
6
7
-What's cooking in git.git (Apr 2016, #01; Fri, 1)
7
+What's cooking in git.git (Apr 2016, #02; Mon, 4)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,11 +12,13 @@ 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
-There are quite a few topics that have been cooking in 'next' during
16
-the pre-2.8 freeze period that are ready to be merged to 'master';
17
-the first batch will be merged early next week, and then the tip of
18
-'next' will be rebuilt on top sometime mid next week. Let's start
19
-looking at new shiny toys after all that happens.
15
+The tip of 'next' has been rewound, the first maintenance release
16
+v2.8.1 that most everybody can safely ignore has been tagged, and
17
+the first batch of topics that have been cooking in 'next' during
18
+the pre-2.8 freeze period are now in 'master'.
19
+
20
+There are a handful of topics that are stuck; they are marked as
21
+"Needs review", "Needs an Ack", etc. in the following list.
22
23
You can find the changes described here in the integration branches
24
of the repositories listed at
@@ -26,13 +28,258 @@ of the repositories listed at
28
--------------------------------------------------
29
[New Topics]
30
29
-* jn/mergetools-examdiff (2016-03-28) 2 commits
31
+* es/format-patch-doc-hide-no-patch (2016-04-04) 1 commit
32
+ - git-format-patch.txt: don't show -s as shorthand for multiple options
33
+
34
+ "git format-patch --help" showed `-s` and `--no-patch` as if these
35
+ are valid options to the command. We already hide `--patch` option
36
+ from the documentation, because format-patch is about showing the
37
+ diff, and the documentation now hides these options as well.
38
+
39
+ Will merge to next.
40
+
41
+
42
+* jk/branch-shortening-funny-symrefs (2016-04-04) 1 commit
43
+ - branch: fix shortening of non-remote symrefs
44
+
45
+ A change back in version 2.7 to "git branch" broke display of a
46
+ symbolic refs in a non-standard place in the refs/ hierarchy (we
47
+ expect symbolic refs to appear in refs/remotes/*/HEAD to point at
48
+ the primary branch the remote has, and as .git/HEAD to point at the
49
+ branch we locally checked out).
50
+
51
+ Will merge to next.
52
+ and later down to maint-2.7.
53
+
54
+--------------------------------------------------
55
+[Graduated to "master"]
56
+
57
+* es/test-gpg-tags (2016-03-06) 4 commits
58
+ (merged to 'next' on 2016-03-15 at 617119f)
59
+ + t6302: skip only signed tags rather than all tests when GPG is missing
60
+ + t6302: also test annotated in addition to signed tags
61
+ + t6302: normalize names and descriptions of signed tags
62
+ + lib-gpg: drop unnecessary "missing GPG" warning
63
+
64
+ A test for tags has been restructured so that more parts of it can
65
+ easily be run on a platform without a working GnuPG.
66
+
67
+
68
+* gf/fetch-pack-direct-object-fetch (2016-03-05) 2 commits
69
+ (merged to 'next' on 2016-03-06 at 5628860)
70
+ + fetch-pack: update the documentation for "<refs>..." arguments
71
+ (merged to 'next' on 2016-03-04 at 49199e0)
72
+ + fetch-pack: fix object_id of exact sha1
73
+
74
+ Fetching of history by naming a commit object name directly didn't
75
+ work across remote-curl transport.
76
+
77
+
78
+* jc/index-pack (2016-03-03) 2 commits
79
+ (merged to 'next' on 2016-03-15 at 42efaa7)
80
+ + index-pack: add a helper function to derive .idx/.keep filename
81
+ + Merge branch 'jc/maint-index-pack-keep' into jc/index-pack
82
+ (this branch is used by jc/bundle; uses jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)
83
+
84
+ Code clean-up.
85
+
86
+
87
+* jc/maint-index-pack-keep (2016-03-03) 1 commit
88
+ (merged to 'next' on 2016-03-04 at bc1d37a)
89
+ + index-pack: correct --keep[=<msg>]
90
+ (this branch is used by jc/bundle, jc/index-pack and jc/index-pack-clone-bundle.)
91
+
92
+ "git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.
93
+
94
+
95
+* jk/add-i-highlight (2016-02-28) 1 commit
96
+ (merged to 'next' on 2016-03-04 at 4ac3aa1)
97
+ + add--interactive: allow custom diff highlighting programs
98
+
99
+ A new "interactive.diffFilter" configuration can be used to
100
+ customize the diff shown in "git add -i" session.
101
+
102
+
103
+* jk/config-get-urlmatch (2016-02-28) 3 commits
104
+ (merged to 'next' on 2016-03-04 at feeb192)
105
+ + Documentation/git-config: fix --get-all description
106
+ + Documentation/git-config: use bulleted list for exit codes
107
+ + config: fail if --get-urlmatch finds no value
108
+
109
+ "git config --get-urlmatch", unlike other variants of the "git
110
+ config --get" family, did not signal error with its exit status
111
+ when there was no matching configuration.
112
+
113
+
114
+* jk/credential-clear-config (2016-02-26) 1 commit
115
+ (merged to 'next' on 2016-03-04 at f7b26b7)
116
+ + credential: let empty credential specs reset helper list
117
+
118
+ The credential.helper configuration variable is cumulative and
119
+ there is no good way to override it from the command line. As
120
+ a special case, giving an empty string as its value now serves
121
+ as the signal to clear the values specified in various files.
122
+
123
+
124
+* jk/getwholeline-getdelim-empty (2016-03-05) 1 commit
125
+ (merged to 'next' on 2016-03-15 at e70d4bd)
126
+ + strbuf_getwholeline: NUL-terminate getdelim buffer on error
127
+
128
+ strbuf_getwholeline() did not NUL-terminate the buffer on certain
129
+ corner cases in its error codepath.
130
+
131
+
132
+* jk/rev-parse-local-env-vars (2016-02-29) 2 commits
133
+ (merged to 'next' on 2016-03-04 at a0300d5)
134
+ + rev-parse: let some options run outside repository
135
+ + t1515: add tests for rev-parse out-of-repo helpers
136
+
137
+ The "--local-env-vars" and "--resolve-git-dir" options of "git
138
+ rev-parse" failed to work outside a repository when the command's
139
+ option parsing was rewritten in 1.8.5 era.
140
+
141
+
142
+* jk/startup-info (2016-03-07) 6 commits
143
+ (merged to 'next' on 2016-03-15 at eb95e5f)
144
+ + use setup_git_directory() in test-* programs
145
+ + grep: turn off gitlink detection for --no-index
146
+ + mailmap: do not resolve blobs in a non-repository
147
+ + remote: don't resolve HEAD in non-repository
148
+ + setup: set startup_info->have_repository more reliably
149
+ + setup: make startup_info available everywhere
150
+
151
+ The startup_info data, which records if we are working inside a
152
+ repository (among other things), are now uniformly available to Git
153
+ subcommand implementations, and Git avoids attempting to touch
154
+ references when we are not in a repository.
155
+
156
+
157
+* mm/diff-renames-default (2016-02-25) 5 commits
158
+ (merged to 'next' on 2016-02-25 at 947c399)
159
+ + diff: activate diff.renames by default
160
+ + log: introduce init_log_defaults()
161
+ + t: add tests for diff.renames (true/false/unset)
162
+ + t4001-diff-rename: wrap file creations in a test
163
+ + Documentation/diff-config: fix description of diff.renames
164
+
165
+ The end-user facing Porcelain level commands like "diff" and "log"
166
+ now enables the rename detection by default.
167
+
168
+
169
+* mm/lockfile-error-message (2016-03-01) 2 commits
170
+ (merged to 'next' on 2016-03-04 at 04ed7e6)
171
+ + lockfile: improve error message when lockfile exists
172
+ + lockfile: mark strings for translation
173
+
174
+
175
+* mm/readme-markdown (2016-04-01) 2 commits
176
+ - git.spec: use README.md, not README
177
+ (merged to 'next' on 2016-03-01 at 81f3858)
178
+ + README.md: don't take 'commandname' literally
179
+
180
+ The top-level README file has been updated to be more appropriate
181
+ for the sign on the front door to welcome new acquaintances to Git
182
+ by toning down inside jokes and making it into MarkDown.
183
+
184
+
185
+* mp/upload-pack-use-embedded-args (2016-02-25) 1 commit
186
+ (merged to 'next' on 2016-02-26 at f0a54e5)
187
+ + upload-pack: use argv_array for pack_objects
188
+
189
+ The embedded args argv-array in the child process is used to build
190
+ the command line to run pack-objects instead of using a separate
191
+ array of strings.
192
+
193
+
194
+* rj/xdiff-prepare-plug-leak-on-error-codepath (2016-03-04) 2 commits
195
+ (merged to 'next' on 2016-03-15 at f72755e)
196
+ + xdiff/xprepare: fix a memory leak
197
+ + xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
198
+
199
+ A small memory leak in an error codepath has been plugged in xdiff
200
+ code.
201
+
202
+--------------------------------------------------
203
+[Stalled]
204
+
205
+* ec/annotate-deleted (2015-11-20) 1 commit
206
+ - annotate: skip checking working tree if a revision is provided
207
+
208
+ Usability fix for annotate-specific "<file> <rev>" syntax with deleted
209
+ files.
210
+
211
+ Waiting for review.
212
+
213
+
214
+* dg/subtree-rebase-test (2016-01-19) 1 commit
215
+ - contrib/subtree: Add a test for subtree rebase that loses commits
216
+
217
+ Reviewed up to v5.
218
+ Will be rerolled.
219
+ ($gmane/284426)
220
+
221
+
222
+* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
223
+ - am: make a direct call to merge_recursive
224
+ - merge_recursive_options: introduce the "gently" flag
225
+
226
+ The merge_recursive_generic() function has been made a bit safer to
227
+ call from inside a process. "git am -3" was taught to make a direct
228
+ call to the function when falling back to three-way merge.
229
+
230
+ Being able to make a direct call would be good in general, but as a
231
+ performance thing, the change needs to be backed up by numbers.
232
+
233
+ Needs review.
234
+
235
+ I haven't gone through the "gently" change with fine toothed comb;
236
+ I can see that the change avoids calling die(), but I haven't made
237
+ sure that the program states (e.g. what's in the in-core index) are
238
+ adjusted sensibly when it returns to the caller instead of dying,
239
+ or the codepaths that used to die() are free of resource leaks.
240
+ The original code certainly did not care the program states at the
241
+ point of dying exactly because it knew it is going to exit, but now
242
+ they have to care, and they need to be audited.
243
+
244
+
245
+* dk/gc-more-wo-pack (2016-01-13) 4 commits
246
+ - gc: clean garbage .bitmap files from pack dir
247
+ - t5304: ensure non-garbage files are not deleted
248
+ - t5304: test .bitmap garbage files
249
+ - prepare_packed_git(): find more garbage
250
+
251
+ Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
252
+ .bitmap and .keep files.
253
+
254
+ Waiting for a reroll.
255
+ ($gmane/284368).
256
+
257
+
258
+* jc/diff-b-m (2015-02-23) 5 commits
259
+ . WIPWIP
260
+ . WIP: diff-b-m
261
+ - diffcore-rename: allow easier debugging
262
+ - diffcore-rename.c: add locate_rename_src()
263
+ - diffcore-break: allow debugging
264
+
265
+ "git diff -B -M" produced incorrect patch when the postimage of a
266
+ completely rewritten file is similar to the preimage of a removed
267
+ file; such a resulting file must not be expressed as a rename from
268
+ other place.
269
+
270
+ The fix in this patch is broken, unfortunately.
271
+ Will discard.
272
+
273
+--------------------------------------------------
274
+[Cooking]
275
+
276
+* jn/mergetools-examdiff (2016-04-04) 2 commits
277
- mergetools: add support for ExamDiff
278
- mergetools: create mergetool_find_win32_cmd() helper function for winmerge
279
280
"git mergetools" learned to drive ExamDiff.
281
35
- Waiting for an Ack by the area expert.
282
+ Will merge to 'next'.
283
284
285
* kn/for-each-tag-branch (2016-03-30) 1 commit
@@ -183,13 +430,13 @@ of the repositories listed at
430
431
432
* tb/safe-crlf-output-fix (2016-04-01) 7 commits
186
- - convert.c: more safer crlf handling with text attribute
187
- - correct blame for files commited with CRLF
188
- - convert: unify the "auto" handling of CRLF
189
- - t0027: test cases for combined attributes
190
- - convert: allow core.autocrlf=input and core.eol=crlf
191
- - convert.c: stream and early out
192
- - read-cache: factor out get_sha1_from_index() helper
433
+ . convert.c: more safer crlf handling with text attribute
434
+ . correct blame for files commited with CRLF
435
+ . convert: unify the "auto" handling of CRLF
436
+ . t0027: test cases for combined attributes
437
+ . convert: allow core.autocrlf=input and core.eol=crlf
438
+ . convert.c: stream and early out
439
+ . read-cache: factor out get_sha1_from_index() helper
440
441
The "safe CRLF" facility disables line-end conversion from CRLF to
442
LF when checking in if the blob registered to the index already
@@ -197,84 +444,10 @@ of the repositories listed at
444
and instead assumed that only the configuration and attribute
445
settings determined how the data from the working tree is converted.
446
200
- Comments sent.
201
- ($gmane/290548)
202
-
203
-
204
---------------------------------------------------
205
-[Stalled]
206
-
207
-* ec/annotate-deleted (2015-11-20) 1 commit
208
- - annotate: skip checking working tree if a revision is provided
209
-
210
- Usability fix for annotate-specific "<file> <rev>" syntax with deleted
211
- files.
212
-
213
- Waiting for review.
214
-
215
-
216
-* dg/subtree-rebase-test (2016-01-19) 1 commit
217
- - contrib/subtree: Add a test for subtree rebase that loses commits
218
-
219
- Reviewed up to v5.
447
Will be rerolled.
221
- ($gmane/284426)
222
-
223
-
224
-* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
225
- - am: make a direct call to merge_recursive
226
- - merge_recursive_options: introduce the "gently" flag
227
-
228
- The merge_recursive_generic() function has been made a bit safer to
229
- call from inside a process. "git am -3" was taught to make a direct
230
- call to the function when falling back to three-way merge.
231
-
232
- Being able to make a direct call would be good in general, but as a
233
- performance thing, the change needs to be backed up by numbers.
234
-
235
- Needs review.
236
-
237
- I haven't gone through the "gently" change with fine toothed comb;
238
- I can see that the change avoids calling die(), but I haven't made
239
- sure that the program states (e.g. what's in the in-core index) are
240
- adjusted sensibly when it returns to the caller instead of dying,
241
- or the codepaths that used to die() are free of resource leaks.
242
- The original code certainly did not care the program states at the
243
- point of dying exactly because it knew it is going to exit, but now
244
- they have to care, and they need to be audited.
245
-
246
-
247
-* dk/gc-more-wo-pack (2016-01-13) 4 commits
248
- - gc: clean garbage .bitmap files from pack dir
249
- - t5304: ensure non-garbage files are not deleted
250
- - t5304: test .bitmap garbage files
251
- - prepare_packed_git(): find more garbage
252
-
253
- Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
254
- .bitmap and .keep files.
255
-
256
- Waiting for a reroll.
257
- ($gmane/284368).
448
+ ($gmane/290637)
449
450
260
-* jc/diff-b-m (2015-02-23) 5 commits
261
- . WIPWIP
262
- . WIP: diff-b-m
263
- - diffcore-rename: allow easier debugging
264
- - diffcore-rename.c: add locate_rename_src()
265
- - diffcore-break: allow debugging
266
-
267
- "git diff -B -M" produced incorrect patch when the postimage of a
268
- completely rewritten file is similar to the preimage of a removed
269
- file; such a resulting file must not be expressed as a rename from
270
- other place.
271
-
272
- The fix in this patch is broken, unfortunately.
273
- Will discard.
274
-
275
---------------------------------------------------
276
-[Cooking]
277
-
451
* ak/use-hashmap-iter-first-in-submodule-config (2016-03-23) 1 commit
452
- submodule-config: use hashmap_iter_first()
453
@@ -292,7 +465,7 @@ of the repositories listed at
465
Will merge to 'next'.
466
467
295
-* ky/branch-m-worktree (2016-03-28) 2 commits
468
+* ky/branch-m-worktree (2016-04-04) 2 commits
469
- branch -m: update all per-worktree HEADs
470
- refs: add a new function set_worktree_head_symref
471
@@ -300,7 +473,7 @@ of the repositories listed at
473
branch that is checked out in another worktree without adjusting
474
the HEAD symbolic ref for the worktree.
475
303
- Needs review by "refs" area experts.
476
+ Will merge to 'next'.
477
478
479
* nd/apply-doc (2016-03-24) 2 commits
@@ -325,6 +498,8 @@ of the repositories listed at
498
499
Minor API documentation update.
500
501
+ Will merge to 'next'.
502
+
503
504
* rt/completion-help (2016-03-24) 2 commits
505
- completion: add 'revisions' and 'everyday' to 'git help'
@@ -364,15 +539,16 @@ of the repositories listed at
539
Will merge to 'next'.
540
541
367
-* mj/pull-rebase-autostash (2016-03-29) 7 commits
542
+* mj/pull-rebase-autostash (2016-04-04) 9 commits
543
- t5520: test --[no-]autostash with pull.rebase=true
369
- - t5520: modify tests to reduce common code
370
- - t5520: use test_i18ngrep instead of test_cmp
371
- - t5520: explicitly unset rebase.autostash
544
+ - t5520: reduce commom lines of code
545
+ - t5520: factor out common "failing autostash" code
546
+ - t5520: factor out common "successful autostash" code
547
+ - t5520: use better test to check stderr output
548
+ - t5520: ensure consistent test conditions
549
- t5520: use consistent capitalization in test titles
373
- (merged to 'next' on 2016-03-23 at ebf1afa)
374
- + pull --rebase: add --[no-]autostash flag
375
- + git-pull.c: introduce git_pull_config()
550
+ - pull --rebase: add --[no-]autostash flag
551
+ - git-pull.c: introduce git_pull_config()
552
553
"git pull --rebase" learned "--[no-]autostash" option, so that
554
the rebase.autostash configuration variable set to true can be
@@ -393,19 +569,23 @@ of the repositories listed at
569
570
571
* pb/t7502-drop-dup (2016-03-11) 1 commit
396
- (merged to 'next' on 2016-03-15 at 037c877)
572
+ (merged to 'next' on 2016-04-04 at 4799cad)
573
+ t/t7502 : drop duplicate test
574
(this branch is used by pb/commit-verbose-config.)
575
576
+ Originally merged to 'next' on 2016-03-15
577
+
578
Code clean-up.
579
580
Will merge to 'master' after 2.8 final.
581
582
583
* ss/commit-squash-msg (2016-03-21) 1 commit
406
- (merged to 'next' on 2016-03-23 at 0b72631)
584
+ (merged to 'next' on 2016-04-04 at d389f19)
585
+ commit: do not lose SQUASH_MSG contents
586
587
+ Originally merged to 'next' on 2016-03-23
588
+
589
When "git merge --squash" stopped due to conflict, the concluding
590
"git commit" failed to read in the SQUASH_MSG that shows the log
591
messages from all the squashed commits.
@@ -414,16 +594,23 @@ of the repositories listed at
594
595
596
* ls/p4-map-user (2016-03-15) 1 commit
417
- (merged to 'next' on 2016-03-23 at 9e0a4f5)
597
+ (merged to 'next' on 2016-04-04 at a56b011)
598
+ git-p4: map a P4 user to Git author name and email address
599
600
+ Originally merged to 'next' on 2016-03-23
601
+
602
+ "git p4" now allows P4 author names to be mapped to Git author
603
+ names.
604
+
605
Will merge to 'master' after 2.8 final.
606
607
608
* jc/merge-refuse-new-root (2016-03-23) 1 commit
424
- (merged to 'next' on 2016-03-23 at d7da4cf)
609
+ (merged to 'next' on 2016-04-04 at cd70fd6)
610
+ merge: refuse to create too cool a merge by default
611
612
+ Originally merged to 'next' on 2016-03-23
613
+
614
"git merge" used to allow merging two branches that have no common
615
base by default, which led to a brand new history of an existing
616
project created and then get pulled by an unsuspecting maintainer,
@@ -437,23 +624,37 @@ of the repositories listed at
624
625
626
* jk/credential-cache-comment-exit (2016-03-18) 1 commit
440
- (merged to 'next' on 2016-03-23 at d2b8cc7)
627
+ (merged to 'next' on 2016-04-04 at 50427fe)
628
+ credential-cache--daemon: clarify "exit" action semantics
629
630
+ Originally merged to 'next' on 2016-03-23
631
+
632
+ A code clarification.
633
+
634
Will merge to 'master' after 2.8 final.
635
636
637
* jk/send-email-rtrim-mailrc-alias (2016-03-18) 1 commit
447
- (merged to 'next' on 2016-03-23 at 74f1f44)
638
+ (merged to 'next' on 2016-04-04 at 4d54956)
639
+ send-email: ignore trailing whitespace in mailrc alias file
640
641
+ Originally merged to 'next' on 2016-03-23
642
+
643
+ "git send-email" had trouble parsing alias file in mailrc format
644
+ when lines in it had trailing whitespaces on them.
645
+
646
Will merge to 'master' after 2.8 final.
647
648
649
* jk/test-httpd-config-nosystem (2016-03-18) 1 commit
454
- (merged to 'next' on 2016-03-23 at 245263b)
650
+ (merged to 'next' on 2016-04-04 at 5fa6274)
651
+ t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
652
653
+ Originally merged to 'next' on 2016-03-23
654
+
655
+ The tests that involve running httpd leaked the system-wide
656
+ configuration in /etc/gitconfig to the tested environment.
657
+
658
Will merge to 'master' after 2.8 final.
659
660
@@ -477,19 +678,23 @@ of the repositories listed at
678
679
680
* sb/clone-t57-t56 (2016-03-16) 1 commit
480
- (merged to 'next' on 2016-03-23 at 5df850d)
681
+ (merged to 'next' on 2016-04-04 at 5c20247)
682
+ clone tests: rename t57* => t56*
683
684
+ Originally merged to 'next' on 2016-03-23
685
+
686
Rename bunch of tests on "git clone" for better organization.
687
688
Will merge to 'master' after 2.8 final.
689
690
691
* sb/rebase-x (2016-03-18) 2 commits
489
- (merged to 'next' on 2016-03-23 at ef8861b)
692
+ (merged to 'next' on 2016-04-04 at feda620)
693
+ t3404: cleanup double empty lines between tests
694
+ rebase: decouple --exec from --interactive
695
696
+ Originally merged to 'next' on 2016-03-23
697
+
698
"git rebase -x" can be used without passing "-i" option.
699
700
Will merge to 'master' after 2.8 final.
@@ -498,11 +703,10 @@ of the repositories listed at
703
* cc/apply (2016-04-01) 4 commits
704
- builtin/apply: free patch when parse_chunk() fails
705
- builtin/apply: handle parse_binary() failure
501
- (merged to 'next' on 2016-03-24 at 70623f2)
502
- + apply: remove unused call to free() in gitdiff_{old,new}name()
503
- + builtin/apply: get rid of useless 'name' variable
706
+ - apply: remove unused call to free() in gitdiff_{old,new}name()
707
+ - builtin/apply: get rid of useless 'name' variable
708
505
- Code clean-up.
709
+ Minor code clean-up.
710
711
Will merge to 'next'.
712
@@ -529,9 +733,11 @@ of the repositories listed at
733
734
735
* jv/merge-nothing-into-void (2016-03-23) 1 commit
532
- (merged to 'next' on 2016-03-23 at 40b905d)
736
+ (merged to 'next' on 2016-04-04 at aa37405)
737
+ merge: fix NULL pointer dereference when merging nothing into void
738
739
+ Originally merged to 'next' on 2016-03-23
740
+
741
"git merge FETCH_HEAD" dereferenced NULL pointer when merging
742
nothing into an unborn history (which is arguably unusual usage,
743
which perhaps was the reason why nobody noticed it).
@@ -540,9 +746,11 @@ of the repositories listed at
746
747
748
* la/tag-force-signing-annotated-tags (2016-03-22) 1 commit
543
- (merged to 'next' on 2016-03-24 at 424da3f)
749
+ (merged to 'next' on 2016-04-04 at a49ec4a)
750
+ tag: add the option to force signing of annotated tags
751
752
+ Originally merged to 'next' on 2016-03-24
753
+
754
"git tag" can create an annotated tag without explicitly given an
755
"-a" (or "-s") option (i.e. when a tag message is given). A new
756
configuration variable, tag.forceSignAnnotated, can be used to tell
@@ -552,151 +760,29 @@ of the repositories listed at
760
761
762
* cc/doc-recommend-performance-trace-to-file (2016-03-07) 1 commit
555
- (merged to 'next' on 2016-03-23 at 086b9f2)
763
+ (merged to 'next' on 2016-04-04 at 26f94c0)
764
+ Documentation: talk about pager in api-trace.txt
765
766
+ Originally merged to 'next' on 2016-03-23
767
+
768
+ A minor documentation update.
769
+
770
Will merge to 'master' after 2.8 final.
771
772
773
* da/mergetool-delete-delete-conflict (2016-03-10) 2 commits
562
- (merged to 'next' on 2016-03-15 at 281a81a)
774
+ (merged to 'next' on 2016-04-04 at 34e645f)
775
+ mergetool: honor tempfile configuration when resolving delete conflicts
776
+ mergetool: support delete/delete conflicts
777
778
+ Originally merged to 'next' on 2016-03-15
779
+
780
"git mergetool" did not work well with conflicts that both sides
781
deleted.
782
783
Will merge to 'master' after 2.8 final.
784
785
572
-* es/test-gpg-tags (2016-03-06) 4 commits
573
- (merged to 'next' on 2016-03-15 at 617119f)
574
- + t6302: skip only signed tags rather than all tests when GPG is missing
575
- + t6302: also test annotated in addition to signed tags
576
- + t6302: normalize names and descriptions of signed tags
577
- + lib-gpg: drop unnecessary "missing GPG" warning
578
-
579
- A test for tags has been restructured so that more parts of it can
580
- easily be run on a platform without a working GnuPG.
581
-
582
- Will merge to 'master' after 2.8 final.
583
-
584
-
585
-* jk/getwholeline-getdelim-empty (2016-03-05) 1 commit
586
- (merged to 'next' on 2016-03-15 at e70d4bd)
587
- + strbuf_getwholeline: NUL-terminate getdelim buffer on error
588
-
589
- strbuf_getwholeline() did not NUL-terminate the buffer on certain
590
- corner cases in its error codepath.
591
-
592
- Will merge to 'master' after 2.8 final.
593
-
594
-
595
-* jk/startup-info (2016-03-07) 6 commits
596
- (merged to 'next' on 2016-03-15 at eb95e5f)
597
- + use setup_git_directory() in test-* programs
598
- + grep: turn off gitlink detection for --no-index
599
- + mailmap: do not resolve blobs in a non-repository
600
- + remote: don't resolve HEAD in non-repository
601
- + setup: set startup_info->have_repository more reliably
602
- + setup: make startup_info available everywhere
603
-
604
- The startup_info data, which records if we are working inside a
605
- repository (among other things), are now uniformly available to Git
606
- subcommand implementations, and Git avoids attempting to touch
607
- references when we are not in a repository.
608
-
609
- Will merge to 'master' after 2.8 final.
610
-
611
-
612
-* rj/xdiff-prepare-plug-leak-on-error-codepath (2016-03-04) 2 commits
613
- (merged to 'next' on 2016-03-15 at f72755e)
614
- + xdiff/xprepare: fix a memory leak
615
- + xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
616
-
617
- A small memory leak in an error codepath has been plugged in xdiff
618
- code.
619
-
620
- Will merge to 'master' after 2.8 final.
621
-
622
-
623
-* jc/index-pack (2016-03-03) 2 commits
624
- (merged to 'next' on 2016-03-15 at 42efaa7)
625
- + index-pack: add a helper function to derive .idx/.keep filename
626
- + Merge branch 'jc/maint-index-pack-keep' into jc/index-pack
627
- (this branch is used by jc/bundle; uses jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)
628
-
629
- Code clean-up.
630
-
631
- Will merge to 'master' after 2.8 final.
632
-
633
-
634
-* jc/maint-index-pack-keep (2016-03-03) 1 commit
635
- (merged to 'next' on 2016-03-04 at bc1d37a)
636
- + index-pack: correct --keep[=<msg>]
637
- (this branch is used by jc/bundle, jc/index-pack and jc/index-pack-clone-bundle.)
638
-
639
- "git index-pack --keep[=<msg>] pack-$name.pack" simply did not work.
640
-
641
- Will merge to 'master' after 2.8 final.
642
-
643
-
644
-* mm/readme-markdown (2016-04-01) 2 commits
645
- - git.spec: use README.md, not README
646
- (merged to 'next' on 2016-03-01 at 81f3858)
647
- + README.md: don't take 'commandname' literally
648
-
649
- The top-level README file has been updated to be more appropriate
650
- for the sign on the front door to welcome new acquaintances to Git
651
- by toning down inside jokes and making it into MarkDown.
652
-
653
- Will merge to 'next'.
654
-
655
-
656
-* gf/fetch-pack-direct-object-fetch (2016-03-05) 2 commits
657
- (merged to 'next' on 2016-03-06 at 5628860)
658
- + fetch-pack: update the documentation for "<refs>..." arguments
659
- (merged to 'next' on 2016-03-04 at 49199e0)
660
- + fetch-pack: fix object_id of exact sha1
661
-
662
- Fetching of history by naming a commit object name directly didn't
663
- work across remote-curl transport.
664
-
665
- Will merge to 'master' after 2.8 final.
666
-
667
-
668
-* jk/add-i-highlight (2016-02-28) 1 commit
669
- (merged to 'next' on 2016-03-04 at 4ac3aa1)
670
- + add--interactive: allow custom diff highlighting programs
671
-
672
- Will merge to 'master' after 2.8 final.
673
-
674
-
675
-* jk/config-get-urlmatch (2016-02-28) 3 commits
676
- (merged to 'next' on 2016-03-04 at feeb192)
677
- + Documentation/git-config: fix --get-all description
678
- + Documentation/git-config: use bulleted list for exit codes
679
- + config: fail if --get-urlmatch finds no value
680
-
681
- "git config --get-urlmatch", unlike other variants of the "git
682
- config --get" family, did not signal error with its exit status
683
- when there was no matching configuration.
684
-
685
- Will merge to 'master' after 2.8 final.
686
-
687
-
688
-* jk/rev-parse-local-env-vars (2016-02-29) 2 commits
689
- (merged to 'next' on 2016-03-04 at a0300d5)
690
- + rev-parse: let some options run outside repository
691
- + t1515: add tests for rev-parse out-of-repo helpers
692
-
693
- The "--local-env-vars" and "--resolve-git-dir" options of "git
694
- rev-parse" failed to work outside a repository when the command's
695
- option parsing was rewritten in 1.8.5 era.
696
-
697
- Will merge to 'master' after 2.8 final.
698
-
699
-
786
* sg/completion-updates (2016-02-28) 21 commits
787
- completion: cache the path to the repository
788
- completion: extract repository discovery from __gitdir()
@@ -724,18 +810,14 @@ of the repositories listed at
810
($gmane/287839)
811
812
727
-* mm/lockfile-error-message (2016-03-01) 2 commits
728
- (merged to 'next' on 2016-03-04 at 04ed7e6)
729
- + lockfile: improve error message when lockfile exists
730
- + lockfile: mark strings for translation
731
-
732
- Will merge to 'master' after 2.8 final.
733
-
734
-
813
* ss/exc-flag-is-a-collection-of-bits (2016-03-01) 1 commit
736
- (merged to 'next' on 2016-03-04 at 5ea48c7)
814
+ (merged to 'next' on 2016-04-04 at 9f0207e)
815
+ dir: store EXC_FLAG_* values in unsigned integers
816
817
+ Originally merged to 'next' on 2016-03-04
818
+
819
+ Code clean-up.
820
+
821
Will merge to 'master' after 2.8 final.
822
823
@@ -746,7 +828,6 @@ of the repositories listed at
828
- bundle: keep a copy of bundle file name in the in-core bundle header
829
- bundle: plug resource leak
830
- bundle doc: 'verify' is not about verifying the bundle
749
- (this branch uses jc/index-pack and jc/maint-index-pack-keep; is tangled with jc/index-pack-clone-bundle.)
831
832
The beginning of "split bundle", which could be one of the
833
ingredients to allow "git clone" traffic off of the core server
@@ -754,31 +835,20 @@ of the repositories listed at
835
836
837
* ss/receive-pack-parse-options (2016-03-01) 1 commit
757
- (merged to 'next' on 2016-03-04 at c577ea7)
838
+ (merged to 'next' on 2016-04-04 at fd6ab4c)
839
+ builtin/receive-pack.c: use parse_options API
840
841
+ Originally merged to 'next' on 2016-03-04
842
+
843
The command line argument parser for "receive-pack" has been
844
rewritten to use parse-options.
845
846
Will merge to 'master' after 2.8 final.
847
848
766
-* jk/credential-clear-config (2016-02-26) 1 commit
767
- (merged to 'next' on 2016-03-04 at f7b26b7)
768
- + credential: let empty credential specs reset helper list
769
-
770
- The credential.helper configuration variable is cumulative and
771
- there is no good way to override it from the command line. As
772
- a special case, giving an empty string as its value now serves
773
- as the signal to clear the values specified in various files.
774
-
775
- Will merge to 'master' after 2.8 final.
776
-
777
-
849
* jk/submodule-c-credential (2016-03-23) 7 commits
779
- (merged to 'next' on 2016-03-23 at 952367a)
850
+ (merged to 'next' on 2016-04-04 at 8de8e8c)
851
+ git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS
781
- (merged to 'next' on 2016-03-15 at 81df5b1)
852
+ git: submodule honor -c credential.* from command line
853
+ quote: implement sq_quotef()
854
+ submodule: fix segmentation fault in submodule--helper clone
@@ -786,6 +856,8 @@ of the repositories listed at
856
+ submodule: check argc count for git submodule--helper clone
857
+ submodule: don't pass empty string arguments to submodule--helper clone
858
859
+ Originally merged to 'next' on 2016-03-23
860
+
861
"git -c credential.<var>=<value> submodule" can now be used to
862
propagate configuration variables related to credential helper
863
down to the submodules.
@@ -831,31 +903,6 @@ of the repositories listed at
903
Needs review.
904
905
834
-* mm/diff-renames-default (2016-02-25) 5 commits
835
- (merged to 'next' on 2016-02-25 at 947c399)
836
- + diff: activate diff.renames by default
837
- + log: introduce init_log_defaults()
838
- + t: add tests for diff.renames (true/false/unset)
839
- + t4001-diff-rename: wrap file creations in a test
840
- + Documentation/diff-config: fix description of diff.renames
841
-
842
- The end-user facing Porcelain level commands like "diff" and "log"
843
- now enables the rename detection by default.
844
-
845
- Will merge to 'master' after 2.8 final.
846
-
847
-
848
-* mp/upload-pack-use-embedded-args (2016-02-25) 1 commit
849
- (merged to 'next' on 2016-02-26 at f0a54e5)
850
- + upload-pack: use argv_array for pack_objects
851
-
852
- The embedded args argv-array in the child process is used to build
853
- the command line to run pack-objects instead of using a separate
854
- array of strings.
855
-
856
- Will merge to 'master' after 2.8 final.
857
-
858
-
906
* sb/submodule-init (2016-03-15) 2 commits
907
. submodule: port init from shell to C
908
. submodule: port resolve_relative_url from shell to C
@@ -908,7 +955,7 @@ of the repositories listed at
955
956
957
* sb/submodule-parallel-update (2016-03-01) 10 commits
911
- (merged to 'next' on 2016-03-15 at a8bf6c5)
958
+ (merged to 'next' on 2016-04-04 at a0aea8d)
959
+ clone: allow an explicit argument for parallel submodule clones
960
+ submodule update: expose parallelism to the user
961
+ submodule helper: remove double 'fatal: ' prefix
@@ -921,6 +968,8 @@ of the repositories listed at
968
+ submodule-config: keep update strategy around
969
(this branch is used by sb/clone-shallow-passthru and sb/submodule-init.)
970
971
+ Originally merged to 'next' on 2016-03-15
972
+
973
A major part of "git submodule update" has been ported to C to take
974
advantage of the recently added framework to run download tasks in
975
parallel.