What's cooking (2013/04 #06)
Junio C Hamano committed
Apr 18, 2013 at 14:09 UTC
ec6cf6181d20c8679c0accf772266d084ba20e91
1 file changed
+287
-377
whats-cooking.txt
+287
-377
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2013, #05; Mon, 15)
4
-X-master-at: aec3f77941205909f0671aa9767315a50e20ff87
5
-X-next-at: 7fdada62084c4fa855f6cf269a638ff1faea5ba2
3
+Subject: What's cooking in git.git (Apr 2013, #06; Thu, 18)
4
+X-master-at: 1468a5839309033feb2e58943babdd48b8e2d151
5
+X-next-at: 630c2117d6a92f48910bfc4663f752cfaa0b30fa
6
7
-What's cooking in git.git (Apr 2013, #05; Mon, 15)
7
+What's cooking in git.git (Apr 2013, #06; Thu, 18)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -19,120 +19,200 @@ of the repositories listed at
19
--------------------------------------------------
20
[Graduated to "master"]
21
22
-* jk/diff-algo-finishing-touches (2013-04-05) 2 commits
23
- (merged to 'next' on 2013-04-11 at af83b2b)
24
- + diff: allow unstuck arguments with --diff-algorithm
25
- + git-merge(1): document diff-algorithm option to merge-recursive
22
+* fc/completion (2013-04-14) 8 commits
23
+ (merged to 'next' on 2013-04-14 at a509746)
24
+ + completion: small optimization
25
+ + completion: inline __gitcomp_1 to its sole callsite
26
+ + completion: get rid of compgen
27
+ + completion: add __gitcomp_nl tests
28
+ + completion: add new __gitcompadd helper
29
+ + completion: get rid of empty COMPREPLY assignments
30
+ + completion: trivial test improvement
31
+ + completion: add more cherry-pick options
32
+
33
+ In addition to a user visible change to offer more options to
34
+ cherry-pick, generally cleans up and simplifies the code.
35
27
- "git diff --diff-algorithm algo" is also understood as "git diff
28
- --diff-algorithm=algo".
36
37
+* fc/send-email-annotate (2013-04-14) 7 commits
38
+ (merged to 'next' on 2013-04-14 at 4af1076)
39
+ + rebase-am: explicitly disable cover-letter
40
+ + format-patch: trivial cleanups
41
+ + format-patch: add format.coverLetter configuration variable
42
+ + log: update to OPT_BOOL
43
+ + format-patch: refactor branch name calculation
44
+ + format-patch: improve head calculation for cover-letter
45
+ + send-email: make annotate configurable
46
31
-* jk/diff-graph-submodule-summary (2013-04-05) 1 commit
32
- (merged to 'next' on 2013-04-11 at 70dfa8d)
33
- + submodule: print graph output next to submodule log
47
+ Allows format-patch --cover-letter to be configurable; the most
48
+ notable is the "auto" mode to create cover-letter only for multi
49
+ patch series.
50
+
51
+
52
+* jc/detached-head-doc (2013-04-05) 1 commit
53
+ (merged to 'next' on 2013-04-14 at 24b9271)
54
+ + glossary: extend "detached HEAD" description
55
+
56
+ Describe what happens when a command that operates on "the current
57
+ branch" is run on a detached HEAD.
58
+
59
+
60
+* jk/daemon-user-doc (2013-04-12) 1 commit
61
+ (merged to 'next' on 2013-04-14 at 56c08ff)
62
+ + doc: clarify that "git daemon --user=<user>" option does not export HOME=~user
63
+
64
+ Document where the configuration is read by the git-daemon when its
65
+ --user option is used.
66
+
67
+
68
+* jk/http-dumb-namespaces (2013-04-09) 1 commit
69
+ (merged to 'next' on 2013-04-15 at 4bfa834)
70
+ + http-backend: respect GIT_NAMESPACE with dumb clients
71
+
72
+ Allow smart-capable HTTP servers to be restricted via the
73
+ GIT_NAMESPACE mechanism when talking with commit-walker clients
74
+ (they already do so when talking with smart HTTP clients).
75
35
- Make "git diff --graph" work better with submodule log output.
76
77
+* jk/http-error-messages (2013-04-16) 1 commit
78
+ (merged to 'next' on 2013-04-16 at 4a32517)
79
+ + http: set curl FAILONERROR each time we select a handle
80
38
-* jk/http-error-messages (2013-04-06) 9 commits
39
- (merged to 'next' on 2013-04-11 at 7a03981)
40
- + http: drop http_error function
41
- + remote-curl: die directly with http error messages
42
- + http: re-word http error message
43
- + http: simplify http_error helper function
44
- + remote-curl: consistently report repo url for http errors
45
- + remote-curl: always show friendlier 404 message
46
- + remote-curl: let servers override http 404 advice
47
- + remote-curl: show server content on http errors
48
- + http: add HTTP_KEEP_ERROR option
81
+ A regression fix for the recently graduated topic.
82
50
- Improve error reporting from the http transfer clients.
83
84
+* jk/merge-tree-added-identically (2013-04-08) 1 commit
85
+ (merged to 'next' on 2013-04-15 at 35fd4b9)
86
+ + merge-tree: don't print entries that match "local"
87
53
-* jk/show-branch-strbuf (2013-04-06) 1 commit
54
- (merged to 'next' on 2013-04-11 at 7a20aa5)
55
- + show-branch: use strbuf instead of static buffer
88
+ The resolution of some corner cases by "git merge-tree" were
89
+ inconsistent between top-of-the-tree and in a subdirectory.
90
57
- "git show-branch" was not prepared to show a very long run of
58
- ancestor operators e.g. foobar^2~2^2^2^2...^2~4 correctly.
91
92
+* jk/test-trash (2013-04-14) 2 commits
93
+ (merged to 'next' on 2013-04-15 at 15a6624)
94
+ + t/test-lib.sh: drop "$test" variable
95
+ + t/test-lib.sh: fix TRASH_DIRECTORY handling
96
61
-* lf/bundle-with-tip-wo-message (2013-04-07) 1 commit
62
- (merged to 'next' on 2013-04-11 at bb9f869)
63
- + bundle: Accept prerequisites without commit messages
97
+ Fix longstanding issues with the test harness when used with --root=<there>
98
+ option.
99
65
- "git bundle" did not like a bundle created using a commit without
66
- any message as its one of the prerequistes.
100
101
+* kb/co-orphan-suggestion-short-sha1 (2013-04-08) 1 commit
102
+ (merged to 'next' on 2013-04-14 at 8caf7fd)
103
+ + checkout: abbreviate hash in suggest_reattach
104
69
-* po/help-guides (2013-04-03) 5 commits
70
- (merged to 'next' on 2013-04-04 at 3d99b28)
71
- + doc: include --guide option description for "git help"
72
- + help: mention -a and -g option, and 'git help <concept>' usage.
73
- + builtin/help.c: add list_common_guides_help() function
74
- + builtin/help.c: add --guide option
75
- + builtin/help.c: split "-a" processing into two
105
+ Update the informational message when "git checkout" leaves the
106
+ detached head state.
107
77
- "git help" learned "-g" option to show the list of guides just like
78
- list of commands are given with "-a".
79
- * po/help-guides (2013-04-12) 1 commit
80
- - help: mark common_guides[] as translatable
108
82
- Finishing touches.
109
+* rs/empty-archive (2013-04-10) 1 commit
110
+ (merged to 'next' on 2013-04-15 at eab39bc)
111
+ + t5004: fix issue with empty archive test and bsdtar
112
113
+ Implementations of "tar" of BSD descend have found to have trouble
114
+ with reading an otherwise empty tar archive with pax headers and
115
+ causes an unnecessary test failure.
116
85
-* rt/commentchar-fmt-merge-msg (2013-04-07) 2 commits
86
- (merged to 'next' on 2013-04-11 at 6af638b)
87
- + fmt-merge-msg: use core.commentchar in tag signatures completely
88
- + fmt-merge-msg: respect core.commentchar in people credits
117
90
- The new core.commentchar configuration was not applied to a few
91
- places.
118
+* th/t9903-symlinked-workdir (2013-04-11) 1 commit
119
+ (merged to 'next' on 2013-04-15 at f062dc6)
120
+ + t9903: Don't fail when run from path accessed through symlink
121
122
94
-* tr/perl-keep-stderr-open (2013-04-04) 2 commits
95
- (merged to 'next' on 2013-04-07 at 04f737a)
96
- + t9700: do not close STDERR
97
- + perl: redirect stderr to /dev/null instead of closing
123
+* tr/packed-object-info-wo-recursion (2013-03-27) 3 commits
124
+ (merged to 'next' on 2013-03-29 at b1c3858)
125
+ + sha1_file: remove recursion in unpack_entry
126
+ + Refactor parts of in_delta_base_cache/cache_or_unpack_entry
127
+ + sha1_file: remove recursion in packed_object_info
128
99
- Closing (not redirecting to /dev/null) the standard error stream is
100
- not a very smart thing to do. Later open may return file
101
- descriptor #2 for unrelated purpose, and error reporting code may
102
- write into them.
129
+ Attempts to reduce the stack footprint of sha1_object_info()
130
+ and unpack_entry() codepaths.
131
132
--------------------------------------------------
133
[New Topics]
134
107
-* kb/status-ignored-optim-2 (2013-04-15) 14 commits
108
- . dir.c: git-status --ignored: don't scan the work tree twice
109
- . dir.c: git-status --ignored: don't scan the work tree three times
110
- . dir.c: git-status: avoid is_excluded checks for tracked files
111
- . dir.c: replace is_path_excluded with now equivalent is_excluded API
112
- . dir.c: unify is_excluded and is_path_excluded APIs
113
- . dir.c: move prep_exclude
114
- . dir.c: factor out parts of last_exclude_matching for later reuse
115
- . dir.c: git-clean -d -X: don't delete tracked directories
116
- . dir.c: make 'git-status --ignored' work within leading directories
117
- . dir.c: git-status --ignored: don't list empty directories as ignored
118
- . dir.c: git-ls-files --directories: don't hide empty directories
119
- . dir.c: git-status --ignored: don't list empty ignored directories
120
- . dir.c: git-status --ignored: don't list files in ignored directories
121
- . dir.c: git-status --ignored: don't drop ignored directories
122
-
123
- Rerolls kb/status-ignored-optim topic (reverted from 'next'). Not
124
- merged to 'pu' as it heavily interferes with as/check-ignore topic.
135
+* jk/a-thread-only-dies-once (2013-04-16) 2 commits
136
+ (merged to 'next' on 2013-04-18 at 3208f44)
137
+ + run-command: use thread-aware die_is_recursing routine
138
+ + usage: allow pluggable die-recursion checks
139
140
+ A regression fix for the logic to detect die() handler triggering
141
+ itself recursively.
142
127
-* fc/branch-upstream-color (2013-04-15) 1 commit
128
- (merged to 'next' on 2013-04-15 at 2fc50fd)
129
- + branch: colour upstream branches
143
+ Will fast-track to 'master'.
144
131
- Add more colors to "git branch -vv" output.
145
+
146
+* tr/copy-revisions-from-stdin (2013-04-16) 1 commit
147
+ (merged to 'next' on 2013-04-16 at d882870)
148
+ + read_revisions_from_stdin: make copies for handle_revision_arg
149
+
150
+ A fix to a long-standing issue in the command line parser for
151
+ revisions, which was triggered by mv/sequence-pick-error-diag topic
152
+ (now in 'next').
153
154
Will merge to 'master'.
155
156
157
+* jc/prune-all (2013-04-18) 3 commits
158
+ - api-parse-options.txt: document "no-" for non-boolean options
159
+ - git-gc.txt, git-reflog.txt: document new expiry options
160
+ - date.c: add parse_expiry_date()
161
+
162
+ We used the approxidate() parser for "--expire=<timestamp>" options
163
+ of various commands, but it is better to treat --expire=all and
164
+ --expire=now a bit more specially than using the current timestamp.
165
+ Update "git gc" and "git reflog" with a new parsing function for
166
+ expiry dates.
167
+
168
+
169
+* jk/chopped-ident (2013-04-17) 3 commits
170
+ - blame: handle broken commit headers gracefully
171
+ - pretty: handle broken commit headers gracefully
172
+ - cat-file: print tags raw for "cat-file -p"
173
+
174
+ A commit object whose author or committer ident are malformed
175
+ crashed some code that trusted that a name, an email and an
176
+ timestamp can always be found in it.
177
+
178
+ Will merge to 'next'.
179
+
180
+
181
+* rt/commentchar-fmt-merge-msg (2013-04-18) 1 commit
182
+ (merged to 'next' on 2013-04-18 at 96799bd)
183
+ + t6200: avoid path mangling issue on Windows
184
+
185
+ A test fix for recent update.
186
+
187
+ Will fast-track to 'master'.
188
+
189
+--------------------------------------------------
190
+[Stalled]
191
+
192
+* jc/format-patch (2013-02-21) 2 commits
193
+ - format-patch: --inline-single
194
+ - format-patch: rename "no_inline" field
195
+
196
+ A new option to send a single patch to the standard output to be
197
+ appended at the bottom of a message. I personally have no need for
198
+ this, but it was easy enough to cobble together. Tests, docs and
199
+ stripping out more MIMEy stuff are left as exercises to interested
200
+ parties.
201
+
202
+ Not ready for inclusion.
203
+
204
+
205
+* jk/gitweb-utf8 (2013-04-08) 4 commits
206
+ - gitweb: Fix broken blob action parameters on blob/commitdiff pages
207
+ - gitweb: Don't append ';js=(0|1)' to external links
208
+ - gitweb: Make feed title valid utf8
209
+ - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
210
+
211
+ Various fixes to gitweb.
212
+
213
+ Waiting for a reroll after a review.
214
+
215
+
216
* jk/commit-info-slab (2013-04-13) 3 commits
217
- commit-slab: introduce a macro to define a slab for new type
218
- commit-slab: avoid large realloc
@@ -142,20 +222,75 @@ of the repositories listed at
222
of flag bits on commit objects.
223
224
145
-* jk/test-trash (2013-04-14) 2 commits
146
- (merged to 'next' on 2013-04-15 at 15a6624)
147
- + t/test-lib.sh: drop "$test" variable
148
- + t/test-lib.sh: fix TRASH_DIRECTORY handling
225
+* jn/config-ignore-inaccessible (2013-04-15) 1 commit
226
+ - config: allow inaccessible configuration under $HOME
227
+
228
+ When $HOME is misconfigured to point at an unreadable directory, we
229
+ used to complain and die. This loosens the check.
230
+
231
+ I do not think we agreed that this is a good idea, though.
232
+
233
+--------------------------------------------------
234
+[Cooking]
235
+
236
+* nd/pretty-formats (2013-04-17) 14 commits
237
+ - pretty: support %>> that steal trailing spaces
238
+ - pretty: support truncating in %>, %< and %><
239
+ - pretty: support padding placeholders, %< %> and %><
240
+ - SQUASH??? review comments (round #2)
241
+ - pretty: add %C(auto) for auto-coloring
242
+ - pretty: split color parsing into a separate function
243
+ - pretty: two phase conversion for non utf-8 commits
244
+ - utf8.c: add reencode_string_len() that can handle NULs in string
245
+ - utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences
246
+ - utf8.c: move display_mode_esc_sequence_len() for use by other functions
247
+ - pretty: share code between format_decoration and show_decorations
248
+ - pretty-formats.txt: wrap long lines
249
+ - pretty: get the correct encoding for --pretty:format=%e
250
+ - pretty: save commit encoding from logmsg_reencode if the caller needs it
251
+
252
+ Looked sensible.
253
+
254
+ Will merge to 'next' after waiting for further comments for a few days.
255
150
- Fix longstanding issues with the test harness when used with --root=<there>
151
- option.
256
+
257
+* kb/status-ignored-optim-2 (2013-04-15) 14 commits
258
+ - dir.c: git-status --ignored: don't scan the work tree twice
259
+ - dir.c: git-status --ignored: don't scan the work tree three times
260
+ - dir.c: git-status: avoid is_excluded checks for tracked files
261
+ - dir.c: replace is_path_excluded with now equivalent is_excluded API
262
+ - dir.c: unify is_excluded and is_path_excluded APIs
263
+ - dir.c: move prep_exclude
264
+ - dir.c: factor out parts of last_exclude_matching for later reuse
265
+ - dir.c: git-clean -d -X: don't delete tracked directories
266
+ - dir.c: make 'git-status --ignored' work within leading directories
267
+ - dir.c: git-status --ignored: don't list empty directories as ignored
268
+ - dir.c: git-ls-files --directories: don't hide empty directories
269
+ - dir.c: git-status --ignored: don't list empty ignored directories
270
+ - dir.c: git-status --ignored: don't list files in ignored directories
271
+ - dir.c: git-status --ignored: don't drop ignored directories
272
+
273
+ Rerolls kb/status-ignored-optim topic (reverted from 'next').
274
+ With help from Karsten, conflicts with as/check-ignore topic have
275
+ been sorted out and it is now in 'pu'.
276
+
277
+ Will merge to 'next' after waiting for further comments for a few days.
278
+
279
+
280
+* fc/branch-upstream-color (2013-04-15) 1 commit
281
+ (merged to 'next' on 2013-04-15 at 2fc50fd)
282
+ + branch: colour upstream branches
283
+
284
+ Add more colors to "git branch -vv" output.
285
+
286
+ Will merge to 'master'.
287
288
154
-* lf/read-blob-data-from-index (2013-04-15) 3 commits
155
- (merged to 'next' on 2013-04-15 at 09f92c6)
156
- + convert.c: Remove duplicate code
157
- + Add size parameter to read_blob_data_from_index_path()
158
- + Add public function read_blob_data_from_index_path()
289
+* lf/read-blob-data-from-index (2013-04-17) 3 commits
290
+ (merged to 'next' on 2013-04-17 at 611208f)
291
+ + convert.c: remove duplicate code
292
+ + read_blob_data_from_index(): optionally return the size of blob data
293
+ + attr.c: extract read_index_data() as read_blob_data_from_index()
294
295
Reduce duplicated code between convert.c and attr.c.
296
@@ -181,6 +316,8 @@ of the repositories listed at
316
Enhance "check-ignore" (1.8.2 update) to work more like "check-attr"
317
over bidi-pipes.
318
319
+ Will merge to 'next' after waiting for further comments for a few days.
320
+
321
322
* mh/packed-refs-various (2013-04-15) 33 commits
323
- refs: handle the main ref_cache specially
@@ -229,28 +366,21 @@ of the repositories listed at
366
Allows remote-helpers to declare they can handle signed tags, and
367
issue a warning when using those that don't.
368
232
- Comments?
233
-
234
-
235
-* jn/config-ignore-inaccessible (2013-04-15) 1 commit
236
- - config: allow inaccessible configuration under $HOME
237
-
238
- When $HOME is misconfigured to point at an unreadable directory, we
239
- used to complain and die. This loosens the check.
240
-
241
- I do not think we agreed that this is a good idea, though.
369
+ Will merge to 'next' after waiting for further comments for a few days.
370
371
244
-* jn/gitweb-install-doc (2013-04-15) 1 commit
372
+* jn/gitweb-install-doc (2013-04-17) 2 commits
373
+ - gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility
374
- gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM
375
376
Reword gitweb configuration instrutions.
377
249
- Will merge to 'next'.
378
+ Will merge to 'next' after waiting for further comments for a few days.
379
380
381
* jx/i18n-branch-error-messages (2013-04-15) 1 commit
253
- - i18n: branch: mark strings for translation
382
+ (merged to 'next' on 2013-04-18 at 630c211)
383
+ + i18n: branch: mark strings for translation
384
385
Will merge to 'master'.
386
@@ -278,43 +408,6 @@ of the repositories listed at
408
409
Will merge to 'next'.
410
281
---------------------------------------------------
282
-[Stalled]
283
-
284
-* nd/pretty-formats (2013-04-01) 12 commits
285
- - pretty: support %>> that steal trailing spaces
286
- - pretty: support truncating in %>, %< and %><
287
- - pretty: support padding placeholders, %< %> and %><
288
- - pretty: add %C(auto) for auto-coloring on the next placeholder
289
- - pretty: two phase conversion for non utf-8 commits
290
- - utf8: keep NULs in reencode_string()
291
- - pretty: get the correct encoding for --pretty:format=%e
292
- - pretty: save commit encoding from logmsg_reencode if the caller needs it
293
- - utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences
294
- - utf8.c: move display_mode_esc_sequence_len() for use by other functions
295
- - pretty: share code between format_decoration and show_decorations
296
- - pretty-formats.txt: wrap long lines
297
-
298
- A mixed bag of a bugfix and two fun enhancements on pretty formats
299
- placeholder.
300
-
301
- Expecting a reroll.
302
-
303
-
304
-* jc/format-patch (2013-02-21) 2 commits
305
- - format-patch: --inline-single
306
- - format-patch: rename "no_inline" field
307
-
308
- A new option to send a single patch to the standard output to be
309
- appended at the bottom of a message. I personally have no need for
310
- this, but it was easy enough to cobble together. Tests, docs and
311
- stripping out more MIMEy stuff are left as exercises to interested
312
- parties.
313
-
314
- Not ready for inclusion.
315
-
316
---------------------------------------------------
317
-[Cooking]
411
412
* ap/strbuf-humanize (2013-04-10) 2 commits
413
(merged to 'next' on 2013-04-14 at 66d7af5)
@@ -330,6 +423,8 @@ of the repositories listed at
423
break third-party tools that may have been reading from the output
424
of this command.
425
426
+ Will merge to 'master'.
427
+
428
429
* as/clone-reference-with-gitfile (2013-04-09) 2 commits
430
(merged to 'next' on 2013-04-15 at ab0d128)
@@ -339,18 +434,23 @@ of the repositories listed at
434
"git clone" did not work if a repository pointed at by the
435
"--reference" option is a gitfile that points at another place.
436
342
- Waiting for comments.
437
+ Will merge to 'master' after eyeballing it once again.
438
439
345
-* fc/transport-helper-error-reporting (2013-04-11) 3 commits
440
+* fc/transport-helper-error-reporting (2013-04-17) 9 commits
441
+ - transport-helper: update remote helper namespace
442
+ - transport-helper: trivial code shuffle
443
+ - transport-helper: warn when refspec is not used
444
+ - transport-helper: clarify pushing without refspecs
445
+ - transport-helper: update refspec documentation
446
+ - transport-helper: clarify *:* refspec
447
- transport-helper: improve push messages
448
- transport-helper: mention helper name when it dies
449
- transport-helper: report errors properly
450
350
- Rerolled enough times. In-code comments may want to be further
351
- extended to explain tricky parts, but seems to be ready otherwise.
451
+ Rerolled with much more clarifications than before.
452
353
- Will merge to 'next'.
453
+ Will merge to 'next' after waiting for further comments for a few days.
454
455
456
* jk/doc-http-backend (2013-04-13) 3 commits
@@ -364,17 +464,6 @@ of the repositories listed at
464
Will merge to 'next'.
465
466
367
-* jk/gitweb-utf8 (2013-04-08) 4 commits
368
- - gitweb: Fix broken blob action parameters on blob/commitdiff pages
369
- - gitweb: Don't append ';js=(0|1)' to external links
370
- - gitweb: Make feed title valid utf8
371
- - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
372
-
373
- Various fixes to gitweb.
374
-
375
- Waiting for a reroll after a review.
376
-
377
-
467
* jk/submodule-subdirectory-ok (2013-04-10) 2 commits
468
- submodule: drop the top-level requirement
469
- rev-parse: add --prefix option
@@ -382,118 +471,44 @@ of the repositories listed at
471
Allow various subcommands of "git submodule" to be run not from the
472
top of the working tree of the superproject.
473
385
- Waiting for comments.
386
-
387
-
388
-* kb/co-orphan-suggestion-short-sha1 (2013-04-08) 1 commit
389
- (merged to 'next' on 2013-04-14 at 8caf7fd)
390
- + checkout: abbreviate hash in suggest_reattach
391
-
392
- Update the informational message when "git checkout" leaves the
393
- detached head state.
394
-
395
- Will merge to 'master'.
474
+ Worthy goal, but not quite there yet.
475
+ $gmane/221575
476
477
478
* mv/sequencer-pick-error-diag (2013-04-11) 1 commit
399
- - cherry-pick: make sure all input objects are commits
479
+ (merged to 'next' on 2013-04-16 at a2da926)
480
+ + cherry-pick: make sure all input objects are commits
481
482
"git cherry-pick $blob $tree" is diagnosed as a nonsense.
483
403
- Will merge to 'next'.
404
-
405
-
406
-* rs/empty-archive (2013-04-10) 1 commit
407
- (merged to 'next' on 2013-04-15 at eab39bc)
408
- + t5004: fix issue with empty archive test and bsdtar
409
-
410
- Implementations of "tar" of BSD descend have found to have trouble
411
- with reading an otherwise empty tar archive with pax headers and
412
- causes an unnecessary test failure.
413
-
414
- Will merge to 'master'.
415
-
416
-
417
-* th/t9903-symlinked-workdir (2013-04-11) 1 commit
418
- (merged to 'next' on 2013-04-15 at f062dc6)
419
- + t9903: Don't fail when run from path accessed through symlink
420
-
421
- Will merge to 'master'.
422
-
423
-
424
-* fc/completion (2013-04-14) 8 commits
425
- (merged to 'next' on 2013-04-14 at a509746)
426
- + completion: small optimization
427
- + completion: inline __gitcomp_1 to its sole callsite
428
- + completion: get rid of compgen
429
- + completion: add __gitcomp_nl tests
430
- + completion: add new __gitcompadd helper
431
- + completion: get rid of empty COMPREPLY assignments
432
- + completion: trivial test improvement
433
- + completion: add more cherry-pick options
434
-
435
- Will merge to 'master'.
436
-
437
-
438
-* jk/daemon-user-doc (2013-04-12) 1 commit
439
- (merged to 'next' on 2013-04-14 at 56c08ff)
440
- + doc: clarify that "git daemon --user=<user>" option does not export HOME=~user
441
-
442
- Will merge to 'master'.
443
-
444
-
445
-* fc/send-email-annotate (2013-04-14) 7 commits
446
- (merged to 'next' on 2013-04-14 at 4af1076)
447
- + rebase-am: explicitly disable cover-letter
448
- + format-patch: trivial cleanups
449
- + format-patch: add format.coverLetter configuration variable
450
- + log: update to OPT_BOOL
451
- + format-patch: refactor branch name calculation
452
- + format-patch: improve head calculation for cover-letter
453
- + send-email: make annotate configurable
454
-
455
- Allows format-patch --cover-letter to be configurable; the most
456
- notable is the "auto" mode to create cover-letter only for multi
457
- patch series.
458
-
459
- Will merge to 'master'.
484
+ Will merge to 'master' with the 'tr/copy-revisions-from-stdin' topic.
485
486
487
* fc/remote-hg (2013-04-11) 21 commits
463
- - remote-hg: activate graphlog extension for hg_log()
464
- - remote-hg: fix bad file paths
465
- - remote-hg: document location of stored hg repository
466
- - remote-hg: fix bad state issue
467
- - remote-hg: add 'insecure' option
468
- - remote-hg: add simple mail test
469
- - remote-hg: add basic author tests
470
- - remote-hg: show more proper errors
471
- - remote-hg: force remote push
472
- - remote-hg: push to the appropriate branch
473
- - remote-hg: update tags globally
474
- - remote-hg: update remote bookmarks
475
- - remote-hg: refactor export
476
- - remote-hg: split bookmark handling
477
- - remote-hg: redirect buggy mercurial output
478
- - remote-hg: trivial test cleanups
479
- - remote-hg: make sure fake bookmarks are updated
480
- - remote-hg: fix for files with spaces
481
- - remote-hg: properly report errors on bookmark pushes
482
- - remote-hg: add missing config variable in doc
483
- - remote-hg: trivial cleanups
484
-
485
- Rerolled.
486
-
487
- Waiting for comments.
488
-
489
-
490
-* jk/http-dumb-namespaces (2013-04-09) 1 commit
491
- (merged to 'next' on 2013-04-15 at 4bfa834)
492
- + http-backend: respect GIT_NAMESPACE with dumb clients
493
-
494
- Allow smart-capable HTTP servers to be restricted via the
495
- GIT_NAMESPACE mechanism when talking with commit-walker clients
496
- (they already do so when talking with smart HTTP clients).
488
+ (merged to 'next' on 2013-04-16 at cbeaf41)
489
+ + remote-hg: activate graphlog extension for hg_log()
490
+ + remote-hg: fix bad file paths
491
+ + remote-hg: document location of stored hg repository
492
+ + remote-hg: fix bad state issue
493
+ + remote-hg: add 'insecure' option
494
+ + remote-hg: add simple mail test
495
+ + remote-hg: add basic author tests
496
+ + remote-hg: show more proper errors
497
+ + remote-hg: force remote push
498
+ + remote-hg: push to the appropriate branch
499
+ + remote-hg: update tags globally
500
+ + remote-hg: update remote bookmarks
501
+ + remote-hg: refactor export
502
+ + remote-hg: split bookmark handling
503
+ + remote-hg: redirect buggy mercurial output
504
+ + remote-hg: trivial test cleanups
505
+ + remote-hg: make sure fake bookmarks are updated
506
+ + remote-hg: fix for files with spaces
507
+ + remote-hg: properly report errors on bookmark pushes
508
+ + remote-hg: add missing config variable in doc
509
+ + remote-hg: trivial cleanups
510
+
511
+ Updates remote-hg helper (in contrib/).
512
513
Will merge to 'master'.
514
@@ -511,23 +526,6 @@ of the repositories listed at
526
Will merge to 'next'.
527
528
514
-* jc/detached-head-doc (2013-04-05) 1 commit
515
- (merged to 'next' on 2013-04-14 at 24b9271)
516
- + glossary: extend "detached HEAD" description
517
-
518
- Will merge to 'master'.
519
-
520
-
521
-* jk/merge-tree-added-identically (2013-04-08) 1 commit
522
- (merged to 'next' on 2013-04-15 at 35fd4b9)
523
- + merge-tree: don't print entries that match "local"
524
-
525
- The resolution of some corner cases by "git merge-tree" were
526
- inconsistent between top-of-the-tree and in a subdirectory.
527
-
528
- Will merge to 'master'.
529
-
530
-
529
* jn/add-2.0-u-A-sans-pathspec (2013-04-03) 6 commits
530
- git add: -u/-A now affects the entire working tree
531
(merged to 'next' on 2013-04-05 at eae93ef)
@@ -547,18 +545,6 @@ of the repositories listed at
545
Will merge to 'master' the early bits and cook the rest in 'next' until Git 2.0.
546
547
550
-* tr/packed-object-info-wo-recursion (2013-03-27) 3 commits
551
- (merged to 'next' on 2013-03-29 at b1c3858)
552
- + sha1_file: remove recursion in unpack_entry
553
- + Refactor parts of in_delta_base_cache/cache_or_unpack_entry
554
- + sha1_file: remove recursion in packed_object_info
555
-
556
- Attempts to reduce the stack footprint of sha1_object_info()
557
- and unpack_entry() codepaths.
558
-
559
- Will merge to 'master'.
560
-
561
-
548
* nd/magic-pathspecs (2013-03-31) 45 commits
549
. Rename field "raw" to "_raw" in struct pathspec
550
. pathspec: support :(glob) syntax
@@ -608,9 +594,12 @@ of the repositories listed at
594
595
Migrate the rest of codebase to use "struct pathspec" more.
596
597
+ Will be rerolled.
598
+
599
612
-* jc/add-2.0-delete-default (2013-03-08) 3 commits
600
+* jc/add-2.0-delete-default (2013-04-17) 4 commits
601
- git add <pathspec>... defaults to "-A"
602
+ - git add: rework the logic to warn "git add <pathspec>..." default change
603
(merged to 'next' on 2013-04-05 at 199442e)
604
+ git add: start preparing for "git add <pathspec>..." to default to "-A"
605
+ builtin/add.c: simplify boolean variables
@@ -629,7 +618,7 @@ of the repositories listed at
618
Start training the users for this change to say --no-all when they
619
want to ignore the removal to smooth the transition hump.
620
632
- Will merge to 'master' the early bits and cook the rest in 'next' until Git 2.0.
621
+ Will merge to 'master' the early bits and cook the tip one in 'next' until Git 2.0.
622
623
624
* tr/line-log (2013-04-12) 11 commits
@@ -649,88 +638,9 @@ of the repositories listed at
638
+ Refactor parse_loc
639
640
652
-* jc/push-2.0-default-to-simple (2013-04-03) 13 commits
641
+* jc/push-2.0-default-to-simple (2013-04-03) 1 commit
642
- push: switch default from "matching" to "simple"
654
- (merged to 'next' on 2013-04-05 at 1b42c19)
655
- + t5570: do not assume the "matching" push is the default
656
- + t5551: do not assume the "matching" push is the default
657
- + t5550: do not assume the "matching" push is the default
658
- + t9401: do not assume the "matching" push is the default
659
- + t9400: do not assume the "matching" push is the default
660
- + t7406: do not assume the "matching" push is the default
661
- + t5531: do not assume the "matching" push is the default
662
- + t5519: do not assume the "matching" push is the default
663
- + t5517: do not assume the "matching" push is the default
664
- + t5516: do not assume the "matching" push is the default
665
- + t5505: do not assume the "matching" push is the default
666
- + t5404: do not assume the "matching" push is the default
667
-
668
- Update the test suite that still assumed the push.default will
669
- forever be 'matching'. In Git 2.0, that will no longer be the
670
- case.
671
-
672
- Will merge to 'master' the early bits and cook the rest in 'next' until Git 2.0.
673
-
674
---------------------------------------------------
675
-[Discarded]
676
-
677
-* fc/transport-helper-waitpid (2013-04-07) 3 commits
678
- . SQUASH???
679
- . transport-helper: check if remote helper is alive
680
- . [EXPLAIN BETTER] run-command: add new check_command helper
681
-
682
- fc/transport-helper-error-reporting supersedes this topic.
683
-
684
-
685
-* jc/gg (2013-04-08) 3 commits
686
- . commit: add get_commit_encoding()
687
- . commit: rename parse_commit_date()
688
- . commit: shrink "indegree" field
689
- (this branch uses jc/decorate.)
690
-
691
-
692
-* mc/count-objects-kibibytes (2013-04-14) 2 commits
693
- (merged to 'next' on 2013-04-14 at ff03f2b)
694
- + Revert "count-objects: output "KiB" instead of "kilobytes""
695
- (merged to 'next' on 2013-04-05 at f4e50e8)
696
- + count-objects: output "KiB" instead of "kilobytes"
697
-
698
- The command reports the total diskspace used to store loose objects
699
- in kibibytes, but it was labelled as "kilobytes". The number now
700
- is shown with "KiB", e.g. "6750 objects, 50928 KiB".
701
-
702
- If you have scripts that decide when to run "git repack" by parsing
703
- the output from "git count-objects", this release may break them.
704
- Sorry about that. One of the scripts shipped by git-core itself
705
- also had to be adjusted. You may want to consider updating such
706
- scripts to always call "git gc --auto" to let it decide when to
707
- repack for you.
708
-
709
- Discarded.
710
-
711
-
712
-* jc/decorate (2013-04-07) 2 commits
713
- - decorate: add "clear_decoration()"
714
- - decorate: document API
715
- (this branch is used by jc/gg.)
716
-
717
- Discarded.
718
-
719
-
720
-* kb/status-ignored-optim (2013-03-19) 8 commits
721
- (merged to 'next' on 2013-04-01 at 0c12ed9)
722
- + dir.c: git-status: avoid is_excluded checks for tracked files
723
- + dir.c: replace is_path_excluded with now equivalent is_excluded API
724
- + dir.c: unify is_excluded and is_path_excluded APIs
725
- + dir.c: move prep_exclude and factor out parts of last_exclude_matching
726
- + dir.c: git-status --ignored: don't list empty directories as ignored
727
- + dir.c: git-status --ignored: don't list empty ignored directories
728
- + dir.c: git-status --ignored: don't list files in ignored directories
729
- + dir.c: git-status --ignored: don't drop ignored directories
643
731
- "git status --ignored" had many corner case bugs. Also the command
732
- has been optimized by taking advantage of the fact that paths that
733
- are already known to the index do not have to be checked against
734
- the .gitignore mechanism most of the time.
644
+ The early bits to adjust the tests have been merged to 'master'.
645
736
- Discarded.
646
+ Will cook in 'next' until Git 2.0.