What's cooking (2013/02 #04)
Junio C Hamano committed
Feb 9, 2013 at 15:25 UTC
f05cfe504bec2204bc3e0034e25576fd8baaf222
1 file changed
+285
-254
whats-cooking.txt
+285
-254
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Feb 2013, #03; Wed, 6)
4
-X-master-at: 2f19ada7f8a5bb768816cf7334f65ae0ab03c8a7
5
-X-next-at: 8bc64348c96661c4cb37542730b0df4dd12eb8c2
3
+Subject: What's cooking in git.git (Feb 2013, #04; Sat, 9)
4
+X-master-at: b3310b5e2f576ef807f90eab0e6e178b65bbfb55
5
+X-next-at: f4474081034ce8695a8a64dcf1a0414f6544ae2c
6
7
-What's cooking in git.git (Feb 2013, #03; Wed, 6)
7
+What's cooking in git.git (Feb 2013, #04; Sat, 9)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -22,98 +22,263 @@ repositories listed at
22
--------------------------------------------------
23
[Graduated to "master"]
24
25
-* ft/transport-report-segv (2013-01-31) 1 commit
26
- (merged to 'next' on 2013-02-02 at 6c450a7)
27
- + push: fix segfault when HEAD points nowhere
25
+* ab/gitweb-use-same-scheme (2013-01-28) 1 commit
26
+ (merged to 'next' on 2013-02-02 at 7e4a108)
27
+ + gitweb: refer to picon/gravatar images over the same scheme
28
29
- A failure to push due to non-ff while on an unborn branch
30
- dereferenced a NULL pointer when showing an error message.
29
+ Avoid mixed contents on a page coming via http and https when
30
+ gitweb is hosted on a https server.
31
32
33
-* jc/fake-ancestor-with-non-blobs (2013-01-31) 3 commits
34
- (merged to 'next' on 2013-02-02 at 86d457a)
35
- + apply: diagnose incomplete submodule object name better
36
- + apply: simplify build_fake_ancestor()
37
- + git-am: record full index line in the patch used while rebasing
38
- (this branch is used by jc/extended-fake-ancestor-for-gitlink.)
33
+* ct/autoconf-htmldir (2013-02-02) 1 commit
34
+ (merged to 'next' on 2013-02-05 at bba4f8c)
35
+ + Honor configure's htmldir switch
36
40
- Rebasing the history of superproject with change in the submodule
41
- has been broken since v1.7.12.
37
+ The autoconf subsystem passed --mandir down to generated
38
+ config.mak.autogen but forgot to do the same for --htmldir.
39
40
44
-* jn/auto-depend-workaround-buggy-ccache (2013-02-01) 1 commit
45
- (merged to 'next' on 2013-02-02 at db5940a)
46
- + Makefile: explicitly set target name for autogenerated dependencies
41
+* da/mergetool-docs (2013-02-02) 5 commits
42
+ (merged to 'next' on 2013-02-03 at f822dcf)
43
+ + doc: generate a list of valid merge tools
44
+ + mergetool--lib: list user configured tools in '--tool-help'
45
+ + mergetool--lib: add functions for finding available tools
46
+ + mergetool--lib: improve the help text in guess_merge_tool()
47
+ + mergetool--lib: simplify command expressions
48
+ (this branch uses jk/mergetool.)
49
48
- An age-old workaround to prevent buggy versions of ccache from
49
- breaking the auto-generation of dependencies, which unfortunately
50
- is still relevant because some people use ancient distros.
50
+ Build on top of the clean-up done by jk/mergetool and automatically
51
+ generate the list of mergetool and difftool backends the build
52
+ supports to be included in the documentation.
53
54
53
-* sb/gpg-plug-fd-leak (2013-01-31) 1 commit
54
- (merged to 'next' on 2013-02-02 at c271a31)
55
- + gpg: close stderr once finished with it in verify_signed_buffer()
55
+* jc/combine-diff-many-parents (2013-02-05) 2 commits
56
+ (merged to 'next' on 2013-02-05 at e382aa6)
57
+ + t4038: add tests for "diff --cc --raw <trees>"
58
+ + combine-diff: lift 32-way limit of combined diff
59
57
- We forgot to close the file descriptor reading from "gpg" output,
58
- killing "git log --show-signature" on a long history.
60
+ We used to have an arbitrary 32 limit for combined diff input,
61
+ resulting in incorrect number of leading colons shown when showing
62
+ the "--raw --cc" output.
63
+
64
+
65
+* jk/apply-similaritly-parsing (2013-02-03) 1 commit
66
+ (merged to 'next' on 2013-02-05 at ccf1c97)
67
+ + builtin/apply: tighten (dis)similarity index parsing
68
69
+ Make sure the similarity value shown in the "apply --summary"
70
+ output is sensible, even when the input had a bogus value.
71
61
-* ta/doc-no-small-caps (2013-02-01) 6 commits
62
- (merged to 'next' on 2013-02-02 at 77cbd0e)
63
- + Documentation: StGit is the right spelling, not StGIT
64
- + Documentation: describe the "repository" in repository-layout
65
- + Documentation: add a description for 'gitfile' to glossary
66
- + Documentation: do not use undefined terms git-dir and git-file
67
- + Documentation: the name of the system is 'Git', not 'git'
68
- + Documentation: avoid poor-man's small caps GIT
72
70
- Update documentation to change "GIT" which was a poor-man's small
71
- caps to "Git". The latter was the intended spelling.
73
+* jk/doc-makefile-cleanup (2013-02-01) 1 commit
74
+ (merged to 'next' on 2013-02-02 at 86ff373)
75
+ + Documentation/Makefile: clean up MAN*_TXT lists
76
73
- Also change "git" spelled in all-lowercase to "Git" when it refers
74
- to the system as the whole or the concept it embodies, as opposed to
75
- the command the end users would type.
77
+
78
+* jk/mergetool (2013-01-28) 8 commits
79
+ (merged to 'next' on 2013-02-03 at 2ff5dee)
80
+ + mergetools: simplify how we handle "vim" and "defaults"
81
+ + mergetool--lib: don't call "exit" in setup_tool
82
+ + mergetool--lib: improve show_tool_help() output
83
+ + mergetools/vim: remove redundant diff command
84
+ + git-difftool: use git-mergetool--lib for "--tool-help"
85
+ + git-mergetool: don't hardcode 'mergetool' in show_tool_help
86
+ + git-mergetool: remove redundant assignment
87
+ + git-mergetool: move show_tool_help to mergetool--lib
88
+ (this branch is used by da/mergetool-docs.)
89
+
90
+ Cleans up mergetool/difftool combo.
91
+
92
+
93
+* jk/python-styles (2013-01-30) 1 commit
94
+ (merged to 'next' on 2013-02-02 at 293edc1)
95
+ + CodingGuidelines: add Python coding guidelines
96
+
97
+
98
+* jk/remote-helpers-doc (2013-02-01) 1 commit
99
+ (merged to 'next' on 2013-02-02 at ce1461a)
100
+ + Rename {git- => git}remote-helpers.txt
101
+
102
+ "git help remote-helpers" did not work; 'remote-helpers' is not
103
+ a subcommand name but a concept, so its documentation should have
104
+ been in gitremote-helpers, not git-remote-helpers.
105
+
106
+
107
+* mk/tcsh-complete-only-known-paths (2013-02-03) 1 commit
108
+ (merged to 'next' on 2013-02-05 at 4409b08)
109
+ + completion: handle path completion and colon for tcsh script
110
+ (this branch uses mp/complete-paths.)
111
+
112
+ Manlio's "complete with known paths only" update to completion
113
+ scripts returns directory names without trailing slash to
114
+ compensate the addition of '/' done by bash that reads from our
115
+ completion result. tcsh completion code that reads from our
116
+ internal completion result does not add '/', so let it ask our
117
+ complletion code to keep the '/' at the end.
118
+
119
+
120
+* mp/complete-paths (2013-01-11) 1 commit
121
+ (merged to 'next' on 2013-01-30 at 70e4f1a)
122
+ + git-completion.bash: add support for path completion
123
+ (this branch is used by mk/tcsh-complete-only-known-paths.)
124
+
125
+ The completion script used to let the default completer to suggest
126
+ pathnames, which gave too many irrelevant choices (e.g. "git add"
127
+ would not want to add an unmodified path). Teach it to use a more
128
+ git-aware logic to enumerate only relevant ones.
129
+
130
+
131
+* nd/branch-error-cases (2013-01-31) 6 commits
132
+ (merged to 'next' on 2013-02-02 at cf5e745)
133
+ + branch: let branch filters imply --list
134
+ + docs: clarify git-branch --list behavior
135
+ + branch: mark more strings for translation
136
+ + Merge branch 'nd/edit-branch-desc-while-detached' into HEAD
137
+ + branch: give a more helpful message on redundant arguments
138
+ + branch: reject -D/-d without branch name
139
+
140
+ Fix various error messages and conditions in "git branch", e.g. we
141
+ advertised "branch -d/-D" to remove one or more branches but actually
142
+ implemented removal of zero or more branches---request to remove no
143
+ branches was not rejected.
144
+
145
+
146
+* sb/gpg-i18n (2013-01-31) 1 commit
147
+ (merged to 'next' on 2013-02-02 at 7a54574)
148
+ + gpg: allow translation of more error messages
149
+
150
+
151
+* sb/run-command-fd-error-reporting (2013-02-01) 1 commit
152
+ (merged to 'next' on 2013-02-02 at be7e970)
153
+ + run-command: be more informative about what failed
154
+
155
+
156
+* ss/mergetools-tortoise (2013-02-01) 2 commits
157
+ (merged to 'next' on 2013-02-03 at d306b83)
158
+ + mergetools: teach tortoisemerge to handle filenames with SP correctly
159
+ + mergetools: support TortoiseGitMerge
160
+
161
+ Update mergetools to work better with newer merge helper tortoise ships.
162
163
--------------------------------------------------
164
[New Topics]
165
80
-* jc/extended-fake-ancestor-for-gitlink (2013-02-05) 1 commit
81
- - apply: verify submodule commit object name better
166
+* jc/fetch-raw-sha1 (2013-02-07) 4 commits
167
+ - fetch: fetch objects by their exact SHA-1 object names
168
+ - upload-pack: optionally allow fetching from the tips of hidden refs
169
+ - fetch: use struct ref to represent refs to be fetched
170
+ - parse_fetch_refspec(): clarify the codeflow a bit
171
+ (this branch uses jc/hidden-refs.)
172
83
- Instead of requiring the full 40-hex object names on the index
84
- line, we can read submodule commit object names from the textual
85
- diff when synthesizing a fake ancestore tree for "git am -3".
173
+ Allows requests to fetch objects at any tip of refs (including
174
+ hidden ones). It seems that there may be use cases even outside
175
+ Gerrit (e.g. $gmane/215701).
176
+
177
+
178
+* jk/diff-graph-cleanup (2013-02-07) 6 commits
179
+ - combine-diff.c: teach combined diffs about line prefix
180
+ - diff.c: use diff_line_prefix() where applicable
181
+ - diff: add diff_line_prefix function
182
+ - diff.c: make constant string arguments const
183
+ - diff: write prefix to the correct file
184
+ - graph: output padding for merge subsequent parents
185
+
186
+ Refactors a lot of repetitive code sequence from the graph drawing
187
+ code and adds it to the combined diff output.
188
189
Will merge to 'next'.
190
191
90
-* tz/credential-authinfo (2013-02-05) 1 commit
91
- - Add contrib/credentials/netrc with GPG support
192
+* mn/send-email-works-with-credential (2013-02-07) 5 commits
193
+ - git-send-email: use git credential to obtain password
194
+ - Git.pm: add interface for git credential command
195
+ - Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe
196
+ - Git.pm: fix example in command_close_bidi_pipe documentation
197
+ - Git.pm: allow command_close_bidi_pipe to be called as method
198
93
- A new read-only credential helper (in contrib/) to interact with
94
- the .netrc/.authinfo files. Hopefully mn/send-email-authinfo topic
95
- can rebuild on top of something like this.
199
+ Hooks the credential system to send-email.
200
97
- Waiting for further reviews.
201
+ Expecting a reroll.
202
+ $gmane/215752
203
204
100
-* jx/utf8-printf-width (2013-02-05) 1 commit
101
- - Add utf8_fprintf helper which returns correct columns
205
+* tz/perl-styles (2013-02-06) 1 commit
206
+ (merged to 'next' on 2013-02-09 at c8cff17)
207
+ + Update CodingGuidelines for Perl
208
103
- Use a new helper that prints a message and counts its display width
104
- to align the help messages parse-options produces.
209
+ Add coding guidelines for writing Perl scripts for Git.
210
106
---------------------------------------------------
107
-[Stalled]
211
+ Will merge to 'master'.
212
109
-* mn/send-email-authinfo (2013-01-29) 1 commit
110
- - git-send-email: add ~/.authinfo parsing
213
112
- This triggered a subtopic to add a credential helper for
113
- authinfo/netrc files (with or without GPG encryption), but nobody
114
- seems to be working on connecting send-email to the credential
115
- framework.
214
+* al/mergetool-printf-fix (2013-02-08) 1 commit
215
+ - git-mergetool: print filename when it contains %
216
+
217
+ Will merge to 'next'.
218
+
219
+
220
+* jk/error-const-return (2013-02-08) 1 commit
221
+ - Use __VA_ARGS__ for all of error's arguments
222
+
223
+ Will merge to 'next'.
224
+
225
+
226
+* mm/allow-contrib-build (2013-02-07) 2 commits
227
+ - perl.mak: introduce $(GIT_ROOT_DIR) to allow inclusion from other directories
228
+ - Makefile: extract perl-related rules to make them available from other dirs
229
+
230
+ Will merge to 'next'.
231
+
232
+
233
+* mm/remote-mediawiki-build (2013-02-08) 2 commits
234
+ - git-remote-mediawiki: use toplevel's Makefile
235
+ - Makefile: make script-related rules usable from subdirectories
236
+
237
+ Will merge to 'next'.
238
+
239
+
240
+* nd/branch-show-rebase-bisect-state (2013-02-08) 1 commit
241
+ - branch: show rebase/bisect info when possible instead of "(no branch)"
242
+
243
+ Will merge to 'next'.
244
+
245
+
246
+* nd/count-garbage (2013-02-08) 3 commits
247
+ - count-objects: report how much disk space taken by garbage files
248
+ - count-objects: report garbage files in pack directory too
249
+ - git-count-objects.txt: describe each line in -v output
250
+
251
+ Expecting a reroll.
252
+ $gmane/215843
253
+
254
255
+* wk/gc-auto-is-available-these-days (2013-02-08) 1 commit
256
+ - user-manual: Rewrite git-gc section for automatic packing
257
+
258
+ Will merge to 'next'.
259
+
260
+
261
+* wk/man-deny-current-branch-is-default-these-days (2013-02-08) 1 commit
262
+ - user-manual: Update for receive.denyCurrentBranch=refuse
263
+
264
+ Will merge to 'next'.
265
+
266
+
267
+* bw/get-tz-offset-perl (2013-02-09) 3 commits
268
+ - cvsimport: format commit timestamp ourselves without using strftime
269
+ - perl/Git.pm: fix get_tz_offset to properly handle DST boundary cases
270
+ - Move Git::SVN::get_tz to Git::get_tz_offset
271
+
272
+ Will merge to 'next'.
273
+
274
+
275
+* mg/bisect-doc (2013-02-09) 1 commit
276
+ - git-bisect.txt: clarify that reset finishes bisect
277
+
278
+ Will merge to 'next'.
279
+
280
+--------------------------------------------------
281
+[Stalled]
282
283
* mp/diff-algo-config (2013-01-16) 3 commits
284
- diff: Introduce --diff-algorithm command line option
@@ -251,70 +416,66 @@ repositories listed at
416
--------------------------------------------------
417
[Cooking]
418
254
-* dg/subtree-fixes (2013-02-05) 6 commits
255
- - contrib/subtree: make the manual directory if needed
256
- - contrib/subtree: honor DESTDIR
257
- - contrib/subtree: fix synopsis
258
- - contrib/subtree: better error handling for 'subtree add'
259
- - contrib/subtree: use %B for split subject/body
260
- - contrib/subtree: remove test number comments
419
+* jc/extended-fake-ancestor-for-gitlink (2013-02-05) 1 commit
420
+ (merged to 'next' on 2013-02-09 at 2d3547b)
421
+ + apply: verify submodule commit object name better
422
262
- contrib/subtree updates, but here are only the ones that looked
263
- ready to be merged to 'next'. For the remainder, they will have
264
- another day.
423
+ Instead of requiring the full 40-hex object names on the index
424
+ line, we can read submodule commit object names from the textual
425
+ diff when synthesizing a fake ancestore tree for "git am -3".
426
266
- Will merge to 'next'.
427
+ Will merge to 'master'.
428
429
269
-* jl/submodule-deinit (2013-02-04) 1 commit
270
- - submodule: add 'deinit' command
430
+* tz/credential-authinfo (2013-02-05) 1 commit
431
+ - Add contrib/credentials/netrc with GPG support
432
272
- There was no Porcelain way to say "I no longer am interested in
273
- this submodule", once you express your interest in a submodule with
274
- "submodule init". "submodule deinit" is the way to do so.
433
+ A new read-only credential helper (in contrib/) to interact with
434
+ the .netrc/.authinfo files. Hopefully mn/send-email-authinfo topic
435
+ can rebuild on top of something like this.
436
276
- Will merge to 'next'.
437
+ Expecting a reroll.
438
+ $gmane/215556
439
440
279
-* ct/autoconf-htmldir (2013-02-02) 1 commit
280
- (merged to 'next' on 2013-02-05 at bba4f8c)
281
- + Honor configure's htmldir switch
441
+* jx/utf8-printf-width (2013-02-09) 1 commit
442
+ - Add utf8_fprintf helper that returns correct number of columns
443
283
- The autoconf subsystem passed --mandir down to generated
284
- config.mak.autogen but forgot to do the same for --htmldir.
444
+ Use a new helper that prints a message and counts its display width
445
+ to align the help messages parse-options produces.
446
286
- Will merge to 'master'.
447
+ Will merge to 'next'.
448
449
289
-* mk/tcsh-complete-only-known-paths (2013-02-03) 1 commit
290
- (merged to 'next' on 2013-02-05 at 4409b08)
291
- + completion: handle path completion and colon for tcsh script
292
- (this branch uses mp/complete-paths.)
450
+* dg/subtree-fixes (2013-02-05) 6 commits
451
+ (merged to 'next' on 2013-02-09 at 8f19ebe)
452
+ + contrib/subtree: make the manual directory if needed
453
+ + contrib/subtree: honor DESTDIR
454
+ + contrib/subtree: fix synopsis
455
+ + contrib/subtree: better error handling for 'subtree add'
456
+ + contrib/subtree: use %B for split subject/body
457
+ + contrib/subtree: remove test number comments
458
294
- Manlio's "complete with known paths only" update to completion
295
- scripts returns directory names without trailing slash to
296
- compensate the addition of '/' done by bash that reads from our
297
- completion result. tcsh completion code that reads from our
298
- internal completion result does not add '/', so let it ask our
299
- complletion code to keep the '/' at the end.
459
+ contrib/subtree updates, but here are only the ones that looked
460
+ ready to be merged to 'next'. For the remainder, they will have
461
+ another day.
462
463
Will merge to 'master'.
464
465
304
-* jc/combine-diff-many-parents (2013-02-05) 2 commits
305
- (merged to 'next' on 2013-02-05 at e382aa6)
306
- + t4038: add tests for "diff --cc --raw <trees>"
307
- + combine-diff: lift 32-way limit of combined diff
466
+* jl/submodule-deinit (2013-02-06) 1 commit
467
+ - submodule: add 'deinit' command
468
309
- We used to have an arbitrary 32 limit for combined diff input,
310
- resulting in incorrect number of leading colons shown when showing
311
- the "--raw --cc" output.
469
+ There was no Porcelain way to say "I no longer am interested in
470
+ this submodule", once you express your interest in a submodule with
471
+ "submodule init". "submodule deinit" is the way to do so.
472
313
- Will merge to 'master'.
473
+ Will merge to 'next'.
474
475
476
* jc/remove-export-from-config-mak-in (2013-02-03) 1 commit
317
- - config.mak.in: remove unused definitions
477
+ (merged to 'next' on 2013-02-07 at 33f7d4f)
478
+ + config.mak.in: remove unused definitions
479
480
config.mak.in template had an "export" line to cause a few
481
common makefile variables to be exported; if they need to be
@@ -323,47 +484,12 @@ repositories listed at
484
the main Makefile.
485
486
326
-* jk/apply-similaritly-parsing (2013-02-03) 1 commit
327
- (merged to 'next' on 2013-02-05 at ccf1c97)
328
- + builtin/apply: tighten (dis)similarity index parsing
329
-
330
- Make sure the similarity value shown in the "apply --summary"
331
- output is sensible, even when the input had a bogus value.
332
-
333
- Will merge to 'master'.
334
-
335
-
487
* nd/status-show-in-progress (2013-02-05) 1 commit
488
- status: show the branch name if possible in in-progress info
489
490
Will merge to 'next'.
491
492
342
-* sb/gpg-i18n (2013-01-31) 1 commit
343
- (merged to 'next' on 2013-02-02 at 7a54574)
344
- + gpg: allow translation of more error messages
345
-
346
- Will merge to 'master'.
347
-
348
-
349
-* sb/run-command-fd-error-reporting (2013-02-01) 1 commit
350
- (merged to 'next' on 2013-02-02 at be7e970)
351
- + run-command: be more informative about what failed
352
-
353
- Will merge to 'master'.
354
-
355
-
356
-* jk/remote-helpers-doc (2013-02-01) 1 commit
357
- (merged to 'next' on 2013-02-02 at ce1461a)
358
- + Rename {git- => git}remote-helpers.txt
359
-
360
- "git help remote-helpers" did not work; 'remote-helpers' is not
361
- a subcommand name but a concept, so its documentation should have
362
- been in gitremote-helpers, not git-remote-helpers.
363
-
364
- Will merge to 'master'.
365
-
366
-
493
* sp/smart-http-content-type-check (2013-02-06) 3 commits
494
(merged to 'next' on 2013-02-06 at 8bc6434)
495
+ http_request: reset "type" strbuf before adding
@@ -376,6 +502,8 @@ repositories listed at
502
back from the server side to make sure that the request is being
503
handled properly.
504
505
+ Will merge to 'master'.
506
+
507
508
* jc/mention-tracking-for-pull-default (2013-01-31) 1 commit
509
- doc: mention tracking for pull.default
@@ -391,124 +519,16 @@ repositories listed at
519
Waiting for couter-proposal patches.
520
521
394
-* jk/doc-makefile-cleanup (2013-02-01) 1 commit
395
- (merged to 'next' on 2013-02-02 at 86ff373)
396
- + Documentation/Makefile: clean up MAN*_TXT lists
397
-
398
- Will merge to 'master'.
399
-
400
-
401
-* ab/gitweb-use-same-scheme (2013-01-28) 1 commit
402
- (merged to 'next' on 2013-02-02 at 7e4a108)
403
- + gitweb: refer to picon/gravatar images over the same scheme
404
-
405
- Avoid mixed contents on a page coming via http and https when
406
- gitweb is hosted on a https server.
407
-
408
- Will merge to 'master'.
409
-
410
-
411
-* jk/python-styles (2013-01-30) 1 commit
412
- (merged to 'next' on 2013-02-02 at 293edc1)
413
- + CodingGuidelines: add Python coding guidelines
414
-
415
- Will merge to 'master'.
416
-
417
-
418
-* mp/complete-paths (2013-01-11) 1 commit
419
- (merged to 'next' on 2013-01-30 at 70e4f1a)
420
- + git-completion.bash: add support for path completion
421
- (this branch is used by mk/tcsh-complete-only-known-paths.)
422
-
423
- The completion script used to let the default completer to suggest
424
- pathnames, which gave too many irrelevant choices (e.g. "git add"
425
- would not want to add an unmodified path). Teach it to use a more
426
- git-aware logic to enumerate only relevant ones.
427
-
428
- This is logically the right thing to do, and we would really love
429
- to see people who have been involved in completion code to review
430
- and comment on the implementation.
431
-
432
- Will cook in 'next' to see if anybody screams.
433
-
434
-
435
-* ss/mergetools-tortoise (2013-02-01) 2 commits
436
- (merged to 'next' on 2013-02-03 at d306b83)
437
- + mergetools: teach tortoisemerge to handle filenames with SP correctly
438
- + mergetools: support TortoiseGitMerge
439
-
440
- Update mergetools to work better with newer merge helper tortoise ships.
441
-
442
- Will merge to 'master'.
443
-
444
-
445
-* da/mergetool-docs (2013-02-02) 5 commits
446
- (merged to 'next' on 2013-02-03 at f822dcf)
447
- + doc: generate a list of valid merge tools
448
- + mergetool--lib: list user configured tools in '--tool-help'
449
- + mergetool--lib: add functions for finding available tools
450
- + mergetool--lib: improve the help text in guess_merge_tool()
451
- + mergetool--lib: simplify command expressions
452
- (this branch uses jk/mergetool.)
453
-
454
- Build on top of the clean-up done by jk/mergetool and automatically
455
- generate the list of mergetool and difftool backends the build
456
- supports to be included in the documentation.
457
-
458
- Will merge to 'master'.
459
-
460
-
461
-* nd/branch-error-cases (2013-01-31) 6 commits
462
- (merged to 'next' on 2013-02-02 at cf5e745)
463
- + branch: let branch filters imply --list
464
- + docs: clarify git-branch --list behavior
465
- + branch: mark more strings for translation
466
- + Merge branch 'nd/edit-branch-desc-while-detached' into HEAD
467
- + branch: give a more helpful message on redundant arguments
468
- + branch: reject -D/-d without branch name
469
-
470
- Fix various error messages and conditions in "git branch", e.g. we
471
- advertised "branch -d/-D" to remove one or more branches but actually
472
- implemented removal of zero or more branches---request to remove no
473
- branches was not rejected.
474
-
475
- Will merge to 'master'.
476
-
477
-
478
-* jk/mergetool (2013-01-28) 8 commits
479
- (merged to 'next' on 2013-02-03 at 2ff5dee)
480
- + mergetools: simplify how we handle "vim" and "defaults"
481
- + mergetool--lib: don't call "exit" in setup_tool
482
- + mergetool--lib: improve show_tool_help() output
483
- + mergetools/vim: remove redundant diff command
484
- + git-difftool: use git-mergetool--lib for "--tool-help"
485
- + git-mergetool: don't hardcode 'mergetool' in show_tool_help
486
- + git-mergetool: remove redundant assignment
487
- + git-mergetool: move show_tool_help to mergetool--lib
488
- (this branch is used by da/mergetool-docs.)
489
-
490
- Cleans up mergetool/difftool combo.
491
-
492
- Will merge to 'master'.
493
-
494
-
495
-* jc/hidden-refs (2013-01-30) 7 commits
496
- - fetch: fetch objects by their exact SHA-1 object names
497
- - upload-pack: optionally allow fetching from the tips of hidden refs
498
- - fetch: use struct ref to represent refs to be fetched
499
- - parse_fetch_refspec(): clarify the codeflow a bit
522
+* jc/hidden-refs (2013-02-07) 3 commits
523
- upload/receive-pack: allow hiding ref hierarchies
524
- upload-pack: simplify request validation
525
- upload-pack: share more code
526
+ (this branch is used by jc/fetch-raw-sha1.)
527
504
- Allow the server side to unclutter the refs/ namespace it shows to
505
- the client. Optionally allow requests for histories leading to the
506
- tips of hidden refs by updated clients.
528
+ Allow the server side to redact the refs/ namespace it shows to the
529
+ client.
530
508
- Need to split the configuration into three (one for sending, one
509
- for receiving, and then another to cover both for convenience)
510
- before this topic can go forward. Perhaps people involved in the
511
- review cycle can help.
531
+ I think this is ready for 'next'.
532
533
534
* jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit
@@ -562,3 +582,14 @@ repositories listed at
582
583
Waiting for the final round of reroll before merging to 'next'.
584
After that we will go incremental.
585
+
586
+--------------------------------------------------
587
+[Discarded]
588
+
589
+* mn/send-email-authinfo (2013-01-29) 1 commit
590
+ . git-send-email: add ~/.authinfo parsing
591
+
592
+ Instead of making send-email directly read from .netrc/.authinfo,
593
+ mn/send-email-works-with-credential topic hooks the program to our
594
+ credential framework, and tz/credential-authinfo topic gives access
595
+ to these file formats to credential consumers.