What's cooking (2013/04 #07)
Junio C Hamano committed
Apr 22, 2013 at 13:01 UTC
eba9f55f5841837fdcbf84575a4c0b6ca45b5457
1 file changed
+303
-358
whats-cooking.txt
+303
-358
@@ -1,16 +1,20 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2013, #06; Thu, 18)
4
-X-master-at: 1468a5839309033feb2e58943babdd48b8e2d151
5
-X-next-at: 630c2117d6a92f48910bfc4663f752cfaa0b30fa
3
+Subject: What's cooking in git.git (Apr 2013, #07; Mon, 22)
4
+X-master-at: 118f60ee06612083ff4f1810424e80a3e896f73e
5
+X-next-at: 46dda50f1b80376d17129b9546d08f602af44864
6
7
-What's cooking in git.git (Apr 2013, #06; Thu, 18)
7
+What's cooking in git.git (Apr 2013, #07; Mon, 22)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
+Both of the two topics on preparing "git add" users for the
15
+behaviour change in Git 2.0 are in 'master'. We may want to tweak
16
+the wording of warning messages and such before the feature freeze.
17
+
18
You can find the changes described here in the integration branches
19
of the repositories listed at
20
@@ -19,177 +23,250 @@ of the repositories listed at
23
--------------------------------------------------
24
[Graduated to "master"]
25
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
26
+* ap/strbuf-humanize (2013-04-10) 2 commits
27
+ (merged to 'next' on 2013-04-14 at 66d7af5)
28
+ + count-objects: add -H option to humanize sizes
29
+ + strbuf: create strbuf_humanise_bytes() to show byte sizes
30
33
- In addition to a user visible change to offer more options to
34
- cherry-pick, generally cleans up and simplifies the code.
31
+ Teach "--human-readable" aka "-H" option to "git count-objects" to
32
+ show various large numbers in Ki/Mi/GiB scaled as necessary.
33
34
+ I've decided to let this topic supersede mc/count-objects-kibibytes.
35
+ Human users will get an even easier output with "-H" and by not
36
+ changing the output without an explicit option we do not have to
37
+ break third-party tools that may have been reading from the output
38
+ of this command.
39
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
40
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.
41
+* as/clone-reference-with-gitfile (2013-04-09) 2 commits
42
+ (merged to 'next' on 2013-04-15 at ab0d128)
43
+ + clone: Allow repo using gitfile as a reference
44
+ + clone: Fix error message for reference repository
45
46
+ "git clone" did not work if a repository pointed at by the
47
+ "--reference" option is a gitfile that points at another place.
48
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
49
56
- Describe what happens when a command that operates on "the current
57
- branch" is run on a detached HEAD.
50
+* fc/branch-upstream-color (2013-04-15) 1 commit
51
+ (merged to 'next' on 2013-04-15 at 2fc50fd)
52
+ + branch: colour upstream branches
53
54
+ Add more colors to "git branch -vv" output.
55
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
56
64
- Document where the configuration is read by the git-daemon when its
65
- --user option is used.
57
+* fc/remote-hg (2013-04-11) 21 commits
58
+ (merged to 'next' on 2013-04-16 at cbeaf41)
59
+ + remote-hg: activate graphlog extension for hg_log()
60
+ + remote-hg: fix bad file paths
61
+ + remote-hg: document location of stored hg repository
62
+ + remote-hg: fix bad state issue
63
+ + remote-hg: add 'insecure' option
64
+ + remote-hg: add simple mail test
65
+ + remote-hg: add basic author tests
66
+ + remote-hg: show more proper errors
67
+ + remote-hg: force remote push
68
+ + remote-hg: push to the appropriate branch
69
+ + remote-hg: update tags globally
70
+ + remote-hg: update remote bookmarks
71
+ + remote-hg: refactor export
72
+ + remote-hg: split bookmark handling
73
+ + remote-hg: redirect buggy mercurial output
74
+ + remote-hg: trivial test cleanups
75
+ + remote-hg: make sure fake bookmarks are updated
76
+ + remote-hg: fix for files with spaces
77
+ + remote-hg: properly report errors on bookmark pushes
78
+ + remote-hg: add missing config variable in doc
79
+ + remote-hg: trivial cleanups
80
81
+ Updates remote-hg helper (in contrib/).
82
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
83
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).
84
+* jk/a-thread-only-dies-once (2013-04-16) 2 commits
85
+ (merged to 'next' on 2013-04-18 at 3208f44)
86
+ + run-command: use thread-aware die_is_recursing routine
87
+ + usage: allow pluggable die-recursion checks
88
89
+ A regression fix for the logic to detect die() handler triggering
90
+ itself recursively.
91
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
92
81
- A regression fix for the recently graduated topic.
93
+* jk/chopped-ident (2013-04-17) 3 commits
94
+ (merged to 'next' on 2013-04-19 at ecec2d4)
95
+ + blame: handle broken commit headers gracefully
96
+ + pretty: handle broken commit headers gracefully
97
+ + cat-file: print tags raw for "cat-file -p"
98
99
+ A commit object whose author or committer ident are malformed
100
+ crashed some code that trusted that a name, an email and an
101
+ timestamp can always be found in it.
102
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"
103
88
- The resolution of some corner cases by "git merge-tree" were
89
- inconsistent between top-of-the-tree and in a subdirectory.
104
+* jk/doc-http-backend (2013-04-13) 3 commits
105
+ (merged to 'next' on 2013-04-19 at 7932840)
106
+ + doc/http-backend: match query-string in apache half-auth example
107
+ + doc/http-backend: give some lighttpd config examples
108
+ + doc/http-backend: clarify "half-auth" repo configuration
109
110
+ Improve documentation to illustrate "push authenticated, fetch
111
+ anonymous" configuration for smart HTTP servers.
112
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
113
97
- Fix longstanding issues with the test harness when used with --root=<there>
98
- option.
114
+* jx/i18n-branch-error-messages (2013-04-15) 1 commit
115
+ (merged to 'next' on 2013-04-18 at 630c211)
116
+ + i18n: branch: mark strings for translation
117
118
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
119
+* lf/read-blob-data-from-index (2013-04-17) 3 commits
120
+ (merged to 'next' on 2013-04-17 at 611208f)
121
+ + convert.c: remove duplicate code
122
+ + read_blob_data_from_index(): optionally return the size of blob data
123
+ + attr.c: extract read_index_data() as read_blob_data_from_index()
124
105
- Update the informational message when "git checkout" leaves the
106
- detached head state.
125
+ Reduce duplicated code between convert.c and attr.c.
126
127
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
128
+* mv/sequencer-pick-error-diag (2013-04-11) 1 commit
129
+ (merged to 'next' on 2013-04-16 at a2da926)
130
+ + cherry-pick: make sure all input objects are commits
131
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.
132
+ "git cherry-pick $blob $tree" is diagnosed as a nonsense.
133
134
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
135
+* mv/ssl-ftp-curl (2013-04-12) 1 commit
136
+ (merged to 'next' on 2013-04-15 at 7fdada6)
137
+ + Support FTP-over-SSL/TLS for regular FTP
138
139
+ Does anybody really use commit walkers over ftp???
140
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
141
129
- Attempts to reduce the stack footprint of sha1_object_info()
130
- and unpack_entry() codepaths.
142
+* nd/checkout-keep-sparse (2013-04-15) 1 commit
143
+ (merged to 'next' on 2013-04-19 at 803dabc)
144
+ + checkout: add --ignore-skip-worktree-bits in sparse checkout mode
145
132
---------------------------------------------------
133
-[New Topics]
146
+ Make the initial "sparse" selection of the paths more sticky across
147
+ "git checkout".
148
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
149
140
- A regression fix for the logic to detect die() handler triggering
141
- itself recursively.
150
+* rt/commentchar-fmt-merge-msg (2013-04-18) 1 commit
151
+ (merged to 'next' on 2013-04-18 at 96799bd)
152
+ + t6200: avoid path mangling issue on Windows
153
143
- Will fast-track to 'master'.
154
+ A test fix for recent update.
155
+
156
+
157
+* ta/glossary (2013-04-15) 4 commits
158
+ (merged to 'next' on 2013-04-19 at 63ee8a4)
159
+ + glossary: improve definitions of refspec and pathspec
160
+ + The name of the hash function is "SHA-1", not "SHA1"
161
+ + glossary: improve description of SHA-1 related topics
162
+ + glossary: remove outdated/misleading/irrelevant entries
163
164
165
+* th/bisect-final-log (2013-04-15) 1 commit
166
+ (merged to 'next' on 2013-04-19 at 89d2041)
167
+ + bisect: Store first bad commit as comment in log file
168
+
169
+ Leave a commit to note what the final outcome was in the bisect log
170
+ file.
171
+
172
* tr/copy-revisions-from-stdin (2013-04-16) 1 commit
173
(merged to 'next' on 2013-04-16 at d882870)
174
+ read_revisions_from_stdin: make copies for handle_revision_arg
175
176
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').
177
+ revisions, which was triggered by mv/sequence-pick-error-diag topic.
178
154
- Will merge to 'master'.
179
+--------------------------------------------------
180
+[New Topics]
181
182
+* jh/checkout-auto-tracking (2013-04-21) 8 commits
183
+ (merged to 'next' on 2013-04-22 at 2356700)
184
+ + glossary: Update and rephrase the definition of a remote-tracking branch
185
+ + branch.c: Validate tracking branches with refspecs instead of refs/remotes/*
186
+ + t9114.2: Don't use --track option against "svn-remote"-tracking branches
187
+ + t7201.24: Add refspec to keep --track working
188
+ + t3200.39: tracking setup should fail if there is no matching refspec.
189
+ + checkout: Use remote refspecs when DWIMming tracking branches
190
+ + t2024: Show failure to use refspec when DWIMming remote branch names
191
+ + t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>'
192
+
193
+ Updates "git checkout foo" that DWIMs the intended "upstream" and
194
+ turns it into "git checkout -t -b foo remotes/origin/foo" to
195
+ correctly take existing remote definitions into account. The
196
+ remote "origin" may be what uniquely map its own branch to
197
+ remotes/some/where/foo but that some/where may not be "origin".
198
+
199
+ Will cook in 'next'.
200
+
201
+
202
+* mg/more-textconv (2013-04-19) 6 commits
203
+ - grep: honor --textconv for the case rev:path
204
+ - grep: allow to use textconv filters
205
+ - t7008: demonstrate behavior of grep with textconv
206
+ - cat-file: do not die on --textconv without textconv filters
207
+ - show: honor --textconv for blobs
208
+ - t4030: demonstrate behavior of show with textconv
209
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()
210
+ Will be rerolled.
211
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.
212
213
+* jk/receive-pack-deadlocks-with-early-failure (2013-04-19) 1 commit
214
+ (merged to 'next' on 2013-04-22 at 1e27177)
215
+ + receive-pack: close sideband fd on early pack errors
216
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"
217
+ When receive-pack detects error in the pack header it received in
218
+ order to decide which of unpack-objects or index-pack to run, it
219
+ returned without closing the error stream, which led to a hang
220
+ sideband thread.
221
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.
222
+ Will fast-track to 'master'.
223
178
- Will merge to 'next'.
224
225
+* fc/untracked-zsh-prompt (2013-04-21) 1 commit
226
+ (merged to 'next' on 2013-04-22 at 472da3e)
227
+ + prompt: fix untracked files for zsh
228
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
229
+ Will fast-track to 'master'.
230
185
- A test fix for recent update.
231
187
- Will fast-track to 'master'.
232
+* jn/glossary-revision (2013-04-21) 1 commit
233
+ - glossary: a revision is just a commit
234
+
235
+ The wording for "revision" in the glossary wanted to say it refers
236
+ to "commit (noun) as a concept" but it was badly phrased.
237
+
238
+ Will cook in 'next'.
239
+
240
+ This may need further updates to hint that in contexts where it is
241
+ clear, the word may refer to an object name, not necessarily a
242
+ commit.
243
+
244
+
245
+* rr/shortlog-doc (2013-04-22) 8 commits
246
+ - builtin/shortlog.c: make usage string consistent with log
247
+ - builtin/log.c: make usage string consistent with doc
248
+ - git-shortlog.txt: make SYNOPSIS match log, update OPTIONS
249
+ - git-log.txt: rewrite note on why "--" may be required
250
+ - git-log.txt: generalize <since>..<until>
251
+ - git-log.txt: order OPTIONS properly; move <since>..<until>
252
+ - revisions.txt: clarify the .. and ... syntax
253
+ - git-shortlog.txt: remove (-h|--help) from OPTIONS
254
+
255
+ Update documentation for "log" and "shortlog".
256
+
257
+ Looked reasonable.
258
+ Will merge to 'next'.
259
+
260
+
261
+* mh/multimail (2013-04-21) 1 commit
262
+ - git-multimail: a replacement for post-receive-email
263
+
264
+ Waiting for comments.
265
266
--------------------------------------------------
267
[Stalled]
268
192
-* jc/format-patch (2013-02-21) 2 commits
269
+* jc/format-patch (2013-04-22) 2 commits
270
- format-patch: --inline-single
271
- format-patch: rename "no_inline" field
272
@@ -213,7 +290,7 @@ of the repositories listed at
290
Waiting for a reroll after a review.
291
292
216
-* jk/commit-info-slab (2013-04-13) 3 commits
293
+* jk/commit-info-slab (2013-04-19) 3 commits
294
- commit-slab: introduce a macro to define a slab for new type
295
- commit-slab: avoid large realloc
296
- commit: allow associating auxiliary info on-demand
@@ -233,90 +310,83 @@ of the repositories listed at
310
--------------------------------------------------
311
[Cooking]
312
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
313
+* jc/prune-all (2013-04-18) 3 commits
314
+ (merged to 'next' on 2013-04-22 at b00ccf6)
315
+ + api-parse-options.txt: document "no-" for non-boolean options
316
+ + git-gc.txt, git-reflog.txt: document new expiry options
317
+ + date.c: add parse_expiry_date()
318
252
- Looked sensible.
319
+ We used the approxidate() parser for "--expire=<timestamp>" options
320
+ of various commands, but it is better to treat --expire=all and
321
+ --expire=now a bit more specially than using the current timestamp.
322
+ Update "git gc" and "git reflog" with a new parsing function for
323
+ expiry dates.
324
254
- Will merge to 'next' after waiting for further comments for a few days.
325
+ Will cook in 'next'.
326
+
327
+
328
+* nd/pretty-formats (2013-04-18) 13 commits
329
+ (merged to 'next' on 2013-04-22 at 3d63014)
330
+ + pretty: support %>> that steal trailing spaces
331
+ + pretty: support truncating in %>, %< and %><
332
+ + pretty: support padding placeholders, %< %> and %><
333
+ + pretty: add %C(auto) for auto-coloring
334
+ + pretty: split color parsing into a separate function
335
+ + pretty: two phase conversion for non utf-8 commits
336
+ + utf8.c: add reencode_string_len() that can handle NULs in string
337
+ + utf8.c: add utf8_strnwidth() with the ability to skip ansi sequences
338
+ + utf8.c: move display_mode_esc_sequence_len() for use by other functions
339
+ + pretty: share code between format_decoration and show_decorations
340
+ + pretty-formats.txt: wrap long lines
341
+ + pretty: get the correct encoding for --pretty:format=%e
342
+ + pretty: save commit encoding from logmsg_reencode if the caller needs it
343
+
344
+ pretty-printing body of the commit that is stored in non UTF-8
345
+ encoding did not work well. The early part of this series fixes
346
+ it. And then it adds %C(auto) specifier that turns the coloring on
347
+ when we are emitting to the terminal, and adds column-aligning
348
+ format directives.
349
+
350
+ Will merge to 'master'.
351
352
353
* 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
354
+ (merged to 'next' on 2013-04-21 at d2a5c70)
355
+ + dir.c: git-status --ignored: don't scan the work tree twice
356
+ + dir.c: git-status --ignored: don't scan the work tree three times
357
+ + dir.c: git-status: avoid is_excluded checks for tracked files
358
+ + dir.c: replace is_path_excluded with now equivalent is_excluded API
359
+ + dir.c: unify is_excluded and is_path_excluded APIs
360
+ + dir.c: move prep_exclude
361
+ + dir.c: factor out parts of last_exclude_matching for later reuse
362
+ + dir.c: git-clean -d -X: don't delete tracked directories
363
+ + dir.c: make 'git-status --ignored' work within leading directories
364
+ + dir.c: git-status --ignored: don't list empty directories as ignored
365
+ + dir.c: git-ls-files --directories: don't hide empty directories
366
+ + dir.c: git-status --ignored: don't list empty ignored directories
367
+ + dir.c: git-status --ignored: don't list files in ignored directories
368
+ + dir.c: git-status --ignored: don't drop ignored directories
369
370
Rerolls kb/status-ignored-optim topic (reverted from 'next').
371
With help from Karsten, conflicts with as/check-ignore topic have
372
been sorted out and it is now in 'pu'.
373
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
-
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
-
297
- Will merge to 'master'.
298
-
299
-
300
-* mv/ssl-ftp-curl (2013-04-12) 1 commit
301
- (merged to 'next' on 2013-04-15 at 7fdada6)
302
- + Support FTP-over-SSL/TLS for regular FTP
303
-
304
- Does anybody really use commit walkers over ftp???
305
-
374
Will merge to 'master'.
375
376
377
* as/check-ignore (2013-04-11) 5 commits
310
- - Documentation: add caveats about I/O buffering for check-{attr,ignore}
311
- - check-ignore: allow incremental streaming of queries via --stdin
312
- - check-ignore: move setup into cmd_check_ignore()
313
- - check-ignore: add -n / --non-matching option
314
- - t0008: remove duplicated test fixture data
378
+ (merged to 'next' on 2013-04-21 at 7515aa8)
379
+ + Documentation: add caveats about I/O buffering for check-{attr,ignore}
380
+ + check-ignore: allow incremental streaming of queries via --stdin
381
+ + check-ignore: move setup into cmd_check_ignore()
382
+ + check-ignore: add -n / --non-matching option
383
+ + t0008: remove duplicated test fixture data
384
385
Enhance "check-ignore" (1.8.2 update) to work more like "check-attr"
386
over bidi-pipes.
387
319
- Will merge to 'next' after waiting for further comments for a few days.
388
+ Will cook in 'next'.
389
+ The test in the second from the tip needs to be updated.
390
391
392
* mh/packed-refs-various (2013-04-15) 33 commits
@@ -357,192 +427,78 @@ of the repositories listed at
427
Updates reading and updating packed-refs file, correcting corner
428
case bugs.
429
430
+ Waiting for comments.
431
+
432
433
* jk/remote-helper-with-signed-tags (2013-04-15) 3 commits
362
- - transport-helper: add 'signed-tags' capability
363
- - transport-helper: pass --signed-tags=warn-strip to fast-export
364
- - fast-export: add --signed-tags=warn-strip mode
434
+ (merged to 'next' on 2013-04-21 at 0231d45)
435
+ + transport-helper: add 'signed-tags' capability
436
+ + transport-helper: pass --signed-tags=warn-strip to fast-export
437
+ + fast-export: add --signed-tags=warn-strip mode
438
439
Allows remote-helpers to declare they can handle signed tags, and
440
issue a warning when using those that don't.
441
369
- Will merge to 'next' after waiting for further comments for a few days.
442
+ Will merge to 'master'.
443
444
445
* 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
446
+ (merged to 'next' on 2013-04-22 at a5d4812)
447
+ + gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility
448
+ + gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM
449
450
Reword gitweb configuration instrutions.
451
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
382
- (merged to 'next' on 2013-04-18 at 630c211)
383
- + i18n: branch: mark strings for translation
384
-
452
Will merge to 'master'.
453
454
388
-* nd/checkout-keep-sparse (2013-04-15) 1 commit
389
- - checkout: add --ignore-skip-worktree-bits in sparse checkout mode
390
-
391
- Make the initial "sparse" selection of the paths more sticky across
392
- "git checkout".
393
-
394
- Will merge to 'next'.
395
-
396
-
397
-* ta/glossary (2013-04-15) 4 commits
398
- - glossary: improve definitions of refspec and pathspec
399
- - The name of the hash function is "SHA-1", not "SHA1"
400
- - glossary: improve description of SHA-1 related topics
401
- - glossary: remove outdated/misleading/irrelevant entries
402
-
403
- Will merge to 'next'.
404
-
405
-
406
-* th/bisect-final-log (2013-04-15) 1 commit
407
- - bisect: Store first bad commit as comment in log file
408
-
409
- Will merge to 'next'.
410
-
411
-
412
-* ap/strbuf-humanize (2013-04-10) 2 commits
413
- (merged to 'next' on 2013-04-14 at 66d7af5)
414
- + count-objects: add -H option to humanize sizes
415
- + strbuf: create strbuf_humanise_bytes() to show byte sizes
416
-
417
- Teach "--human-readable" aka "-H" option to "git count-objects" to
418
- show various large numbers in Ki/Mi/GiB scaled as necessary.
419
-
420
- I've decided to let this topic supersede mc/count-objects-kibibytes.
421
- Human users will get an even easier output with "-H" and by not
422
- changing the output without an explicit option we do not have to
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)
431
- + clone: Allow repo using gitfile as a reference
432
- + clone: Fix error message for reference repository
433
-
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
-
437
- Will merge to 'master' after eyeballing it once again.
438
-
439
-
455
* 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
-
451
- Rerolled with much more clarifications than before.
452
-
453
- Will merge to 'next' after waiting for further comments for a few days.
454
-
456
+ (merged to 'next' on 2013-04-22 at 5ba6467)
457
+ + transport-helper: update remote helper namespace
458
+ + transport-helper: trivial code shuffle
459
+ + transport-helper: warn when refspec is not used
460
+ + transport-helper: clarify pushing without refspecs
461
+ + transport-helper: update refspec documentation
462
+ + transport-helper: clarify *:* refspec
463
+ + transport-helper: improve push messages
464
+ + transport-helper: mention helper name when it dies
465
+ + transport-helper: report errors properly
466
+
467
+ Update transport helper to report errors and maintain ref hierarchy
468
+ used to keep track of remote helper state better.
469
456
-* jk/doc-http-backend (2013-04-13) 3 commits
457
- - doc/http-backend: match query-string in apache half-auth example
458
- - doc/http-backend: give some lighttpd config examples
459
- - doc/http-backend: clarify "half-auth" repo configuration
460
-
461
- Improve documentation to illustrate "push authenticated, fetch
462
- anonymous" configuration for smart HTTP servers.
463
-
464
- Will merge to 'next'.
470
+ Will merge to 'master'.
471
472
467
-* jk/submodule-subdirectory-ok (2013-04-10) 2 commits
468
- - submodule: drop the top-level requirement
469
- - rev-parse: add --prefix option
473
+* jk/submodule-subdirectory-ok (2013-04-18) 2 commits
474
+ (merged to 'next' on 2013-04-22 at f211e25)
475
+ + submodule: drop the top-level requirement
476
+ + rev-parse: add --prefix option
477
478
Allow various subcommands of "git submodule" to be run not from the
479
top of the working tree of the superproject.
480
474
- Worthy goal, but not quite there yet.
475
- $gmane/221575
476
-
477
-
478
-* mv/sequencer-pick-error-diag (2013-04-11) 1 commit
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
-
484
- Will merge to 'master' with the 'tr/copy-revisions-from-stdin' topic.
485
-
486
-
487
-* fc/remote-hg (2013-04-11) 21 commits
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'.
481
+ Will cook in 'next'.
482
483
484
* jl/submodule-mv (2013-04-11) 4 commits
517
- - rm: delete .gitmodules entry of submodules removed from the work tree
518
- - Teach mv to update the path entry in .gitmodules for moved submodules
519
- - Teach mv to move submodules using a gitfile
520
- - Teach mv to move submodules together with their work trees
485
+ (merged to 'next' on 2013-04-19 at 45ae3c9)
486
+ + rm: delete .gitmodules entry of submodules removed from the work tree
487
+ + Teach mv to update the path entry in .gitmodules for moved submodules
488
+ + Teach mv to move submodules using a gitfile
489
+ + Teach mv to move submodules together with their work trees
490
491
"git mv A B" when moving a submodule A does "the right thing",
492
inclusing relocating its working tree and adjusting the paths in
493
the .gitmodules file.
494
526
- Will merge to 'next'.
495
+ Will cook in 'next'.
496
497
529
-* jn/add-2.0-u-A-sans-pathspec (2013-04-03) 6 commits
498
+* jn/add-2.0-u-A-sans-pathspec (2013-04-03) 1 commit
499
- git add: -u/-A now affects the entire working tree
531
- (merged to 'next' on 2013-04-05 at eae93ef)
532
- + add -A: only show pathless 'add -A' warning when changes exist outside cwd
533
- + add -u: only show pathless 'add -u' warning when changes exist outside cwd
534
- + add: make warn_pathless_add() a no-op after first call
535
- + add: add a blank line at the end of pathless 'add [-u|-A]' warning
536
- + add: make pathless 'add [-u|-A]' warning a file-global function
500
538
- "git add -u/-A" without any pathspec traditionally limited its
539
- operation to the current directory when run from a subdirectory,
540
- but in Git 2.0, they will affect the entire working tree. Start
541
- training users to explicitly say "." or ":/" to smooth out the
542
- transition hump with the earlier parts of this series, and flip the
543
- default as the final step.
544
-
545
- Will merge to 'master' the early bits and cook the rest in 'next' until Git 2.0.
501
+ Will cook in 'next' until Git 2.0.
502
503
504
* nd/magic-pathspecs (2013-03-31) 45 commits
@@ -597,31 +553,11 @@ of the repositories listed at
553
Will be rerolled.
554
555
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
606
-
607
- In Git 2.0, "git add pathspec" will mean "git add -A pathspec". If
608
- you did this in a working tree that tracks dir/lost and dir/another:
609
-
610
- $ rm dir/lost
611
- $ edit dir/another
612
- $ git add dir
613
-
614
- The last step will not only notices and records updated
615
- dir/another, but also notices and records the removal of dir/lost
616
- in the index.
617
-
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
-
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
556
+* tr/line-log (2013-04-22) 13 commits
557
+ (merged to 'next' on 2013-04-22 at 8f2c1de)
558
+ + git-log(1): remove --full-line-diff description
559
+ (merged to 'next' on 2013-04-21 at cd92620)
560
+ + line-log: fix documentation formatting
561
(merged to 'next' on 2013-04-15 at 504559e)
562
+ log -L: improve comments in process_all_files()
563
+ log -L: store the path instead of a diff_filespec
@@ -637,6 +573,8 @@ of the repositories listed at
573
+ Export rewrite_parents() for 'log -L'
574
+ Refactor parse_loc
575
576
+ Will cook in 'next'.
577
+
578
579
* jc/push-2.0-default-to-simple (2013-04-03) 1 commit
580
- push: switch default from "matching" to "simple"
@@ -644,3 +582,10 @@ of the repositories listed at
582
The early bits to adjust the tests have been merged to 'master'.
583
584
Will cook in 'next' until Git 2.0.
585
+
586
+
587
+* jc/add-2.0-delete-default (2013-04-21) 1 commit
588
+ - git add <pathspec>... defaults to "-A"
589
+
590
+ Will cook in 'next' until Git 2.0.
591
+