What's cooking (2012/06 #07)
Junio C Hamano committed
Jun 25, 2012 at 13:07 UTC
7c519cf70b958175816ca6519f597a56b67baf9b
1 file changed
+217
-258
whats-cooking.txt
+217
-258
@@ -1,15 +1,16 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2012, #06; Thu, 21)
3
-X-master-at: 0e18bef7e62d6fffd09c394381056ec7a4a79840
4
-X-next-at: d03daced714572d0060e2bd8ae5e751b5a245f46
2
+Subject: What's cooking in git.git (Jun 2012, #07; Mon, 25)
3
+X-master-at: bc9e7dd41fe8b51cc7f2e79312a2ff777899f930
4
+X-next-at: d3f29e2e8f7ed8869c211f67f49ffecd8994f456
5
6
-What's cooking in git.git (Jun 2012, #06; Thu, 21)
6
+What's cooking in git.git (Jun 2012, #07; Mon, 25)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
11
12
-A brown-paper bag release 1.7.11.1 is out.
12
+The second batch of topics have graduated to 'master', and a handful
13
+of topics have entered 'next' for developer testing.
14
15
You can find the changes described here in the integration branches of the
16
repositories listed at
@@ -19,84 +20,111 @@ repositories listed at
20
--------------------------------------------------
21
[Graduated to "master"]
22
22
-* jc/bundle-complete-notice (2012-06-04) 1 commit
23
- (merged to 'next' on 2012-06-19 at b42227b)
24
- + tweak "bundle verify" of a complete history
23
+* cn/cherry-pick-range-docs (2012-06-15) 2 commits
24
+ (merged to 'next' on 2012-06-21 at 5cf7f97)
25
+ + git-cherry-pick.txt: clarify the use of revision range notation
26
+ + Documentation: --no-walk is no-op if range is specified
27
26
-Originally merged to 'next' on 2012-06-04.
28
+The command line argument of "git cherry-pick maint master..next" is
29
+just an ordinary revision range, which is unintuitive and at least
30
+deserves documentation.
31
28
-Running "git bundle verify" on a bundle that records a complete
29
-history said "it requires these 0 commits".
32
+* jc/ustar-checksum-is-unsigned (2012-06-13) 1 commit
33
+ (merged to 'next' on 2012-06-21 at bb8e2b0)
34
+ + archive: ustar header checksum is computed unsigned
35
31
-* jc/ls-files-i-dir (2012-06-05) 6 commits
32
- (merged to 'next' on 2012-06-19 at 4a7aa99)
33
- + dir.c: make excluded() file scope static
34
- + unpack-trees.c: use path_excluded() in check_ok_to_remove()
35
- + builtin/add.c: use path_excluded()
36
- + path_excluded(): update API to less cache-entry centric
37
- + ls-files -i: micro-optimize path_excluded()
38
- + ls-files -i: pay attention to exclusion of leading paths
36
+"git archive" incorrectly computed the header checksum; the symptom
37
+was observed only when using pathnames with hi-bit set.
38
40
-Originally merged to 'next' on 2012-06-08.
39
+* jk/no-more-asciidoc7 (2012-05-30) 2 commits
40
+ (merged to 'next' on 2012-06-19 at a36b498)
41
+ + docs: drop antique comment from Makefile
42
+ + docs: drop asciidoc7compatible flag
43
42
-"git ls-files --exclude=t -i" did not consider anything under t/
43
-as excluded, as it did not pay attention to exclusion of leading
44
-paths while walking the index. Other two users of excluded() are
45
-also updated.
44
+Originally merged to 'next' on 2012-06-05.
45
47
-* jc/request-pull-match-tagname (2012-06-01) 1 commit
48
- (merged to 'next' on 2012-06-19 at bb96d6c)
49
- + request-pull: really favor a matching tag
46
+We no longer use AsciiDoc7 syntax in our documentation and favor a
47
+more modern style.
48
51
-Originally merged to 'next' on 2012-06-05.
49
+* lm/git-blame-el (2012-06-14) 3 commits
50
+ (merged to 'next' on 2012-06-21 at 6514487)
51
+ + git-blame.el: Do not use bare 0 to mean (point-min)
52
+ + git-blame.el: Use with-current-buffer where appropriate
53
+ + git-blame.el: Do not use goto-line in lisp code
54
53
-"git request-pull $url dev" when the tip of "dev" branch was tagged
54
-with "ext4-for-linus" used the contents from the tag in the output
55
-but still asked the "dev" branch to be pulled, not the tag.
55
+* lp/no-cmd-http-fetch (2012-06-15) 1 commit
56
+ (merged to 'next' on 2012-06-21 at 242a10e)
57
+ + builtin.h: remove unused cmd_<foo> declarations
58
57
-* jk/clone-local (2012-05-30) 2 commits
58
- (merged to 'next' on 2012-06-19 at a42bbcc)
59
- + clone: allow --no-local to turn off local optimizations
60
- + docs/clone: mention that --local may be ignored
59
+Remove unused declarations of nonexisting functions from a header
60
+file.
61
62
-Originally merged to 'next' on 2012-06-05.
62
+* nd/i18n-branch-lego (2012-06-07) 1 commit
63
+ (merged to 'next' on 2012-06-21 at 0cb53fc)
64
+ + Remove i18n legos in notifying new branch tracking setup
65
64
-"git clone --local $path" started its life as an experiment to
65
-optionally use link/copy when cloning a repository on the disk, but
66
-we didn't deprecate it after we made the option a no-op to always
67
-use the optimization.
66
+Restructure the way message strings are created, in preparation for
67
+marking them for i18n.
68
+
69
+* nd/i18n-misc (2012-06-07) 3 commits
70
+ (merged to 'next' on 2012-06-21 at 0a82040)
71
+ + rerere: remove i18n legos in result message
72
+ + notes-merge: remove i18n legos in merge result message
73
+ + reflog: remove i18n legos in pruning message
74
+
75
+Restructure the way message strings are created, in preparation for
76
+marking them for i18n.
77
+
78
+* rr/doc-commit (2012-06-08) 1 commit
79
+ (merged to 'next' on 2012-06-21 at af8301c)
80
+ + commit: document a couple of options
81
+
82
+* rs/git-blame-mapcar-mapc (2012-06-10) 1 commit
83
+ (merged to 'next' on 2012-06-21 at 71a3b36)
84
+ + git-blame.el: use mapc instead of mapcar
85
+
86
+* rs/ipv6-ssh-url (2012-06-13) 1 commit
87
+ (merged to 'next' on 2012-06-21 at d0116a8)
88
+ + git: Wrong parsing of ssh urls with IPv6 literals ignores port
89
+
90
+ssh:// URLs to IPv6 hosts with custom port number were parsed
91
+incorrectly.
92
69
-The command learns "--no-local" option to turn this off, as a more
70
-explicit alternative over use of file:// URL.
93
+--------------------------------------------------
94
+[New Topics]
95
72
-* jk/maint-t1304-setfacl (2012-06-07) 1 commit
73
- (merged to 'next' on 2012-06-19 at 2449521)
74
- + t1304: improve setfacl prerequisite setup
96
+* mm/config-xdg (2012-06-25) 4 commits
97
+ - config: write to $XDG_CONFIG_HOME/git/config file when appropriate
98
+ - Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes
99
+ - Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore
100
+ - config: read (but not write) from $XDG_CONFIG_HOME/git/config file
101
76
-Originally merged to 'next' on 2012-06-08.
102
+Teach git to read various information from $XDG_CONFIG_HOME/git/ to allow
103
+the user to avoid cluttering $HOME.
104
78
-Works around a false test failure caused by a bug in ecryptofs.
105
+* mm/credential-plumbing (2012-06-25) 3 commits
106
+ - git-remote-mediawiki: add credential support
107
+ - git credential fill: output the whole 'struct credential'
108
+ - add 'git credential' plumbing command
109
80
-* jk/version-string (2012-06-03) 3 commits
81
- (merged to 'next' on 2012-06-19 at 12f8e07)
82
- + http: get default user-agent from git_user_agent
83
- + version: add git_user_agent function
84
- + move git_version_string into version.c
85
- (this branch is used by jk/version-string-dependency.)
110
+Expose the credential API to scripted Porcelain writers.
111
87
-Originally merged to 'next' on 2012-06-05.
112
+* th/diff-no-index-fixes (2012-06-22) 2 commits
113
+ - diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds changes
114
+ - diff: handle relative paths in no-index
115
89
-Teaches git native protocol agents to show software version over the
90
-wire.
116
+"git diff --no-index" did not correctly handle relative paths and
117
+did not correctly give exit codes when run under "--quiet" option.
118
92
-* vr/help-per-platform (2012-06-06) 1 commit
93
- (merged to 'next' on 2012-06-19 at d9a08ba)
94
- + help: use HTML as the default help format on Windows
119
+Will merge to 'next'.
120
+
121
+* nd/clone-single-fix (2012-06-22) 1 commit
122
+ - clone: fix ref selection in --single-branch --branch=xxx
123
96
-Originally merged to 'next' on 2012-06-08
124
+"git clone --single-branch" to clone a single branch did not limit
125
+the cloning to the specified branch.
126
98
-We used to always default to "man" format even on platforms where
99
-"man" viewer is not widely available.
127
+Will merge to 'next'.
128
129
--------------------------------------------------
130
[Stalled]
@@ -111,16 +139,27 @@ We used to always default to "man" format even on platforms where
139
140
Waiting for Jonathan's clean-up offered earlier.
141
114
-* vr/use-our-perl-in-tests (2012-06-12) 3 commits
115
- - t/README: add a bit more Don'ts
116
- - tests: enclose $PERL_PATH in duoble quotes
117
- - t: Replace 'perl' by $PERL_PATH
142
+* nl/http-proxy-more (2012-05-11) 2 commits
143
+ - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY
144
+ - http: Avoid limit of retrying request only twice
145
+
146
+I queued only the later two patches from this series, even though they do
147
+not make much sense without the first one that seems to need a bit more
148
+work, so that we won't forget.
149
+
150
+Will discard without prejudice, unless rerolled.
151
+
152
+* jk/no-op-push-message (2012-05-30) 1 commit
153
+ - improve no-op push output
154
+
155
+Rewords the status message of "git push" that pushed only one ref
156
+differently from "Everything up-to-date", to give a bit more help to
157
+people who get the message when their current branch is not pushed.
158
119
-Needs more work.
159
+I had an impression after the discussion thread that a redesign is
160
+coming, but it hasn't happened yet.
161
121
-There are still unconverted use of bare 'perl' remaining in the test
122
-scripts, the second patch needs its title typofixed, and PERL_PATH
123
-needs to be exported to the environment from test-lib.sh.
162
+Will discard without prejudice, unless rerolled.
163
164
* jc/apply-3way (2012-06-13) 19 commits
165
- apply --3way: tests
@@ -148,41 +187,6 @@ when a patch does not exactly apply to the version you have.
187
188
Waiting for comments.
189
151
-* nl/http-proxy-more (2012-05-11) 2 commits
152
- - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY
153
- - http: Avoid limit of retrying request only twice
154
-
155
-I queued only the later two patches from this series, even though they do
156
-not make much sense without the first one that seems to need a bit more
157
-work, so that we won't forget.
158
-
159
-Will discard without prejudice, unless rerolled.
160
-
161
-* jk/no-op-push-message (2012-05-30) 1 commit
162
- - improve no-op push output
163
-
164
-Rewords the status message of "git push" that pushed only one ref
165
-differently from "Everything up-to-date", to give a bit more help to
166
-people who get the message when their current branch is not pushed.
167
-
168
-I had an impression after the discussion thread that a redesign is
169
-coming, but it hasn't happened yet.
170
-
171
-Will discard without prejudice, unless rerolled.
172
-
173
-* sg/bash-prompt (2012-05-09) 4 commits
174
- . completion: respect $GIT_DIR
175
- . completion: use __gitdir() in _git_log()
176
- - tests: add tests for the bash prompt functions in the completion script
177
- - tests: move code to run tests under bash into a helper library
178
- (this branch is tangled with fc/git-prompt-script.)
179
-
180
-This is only the "correction" bits taken from the beginning of a
181
-larger series that is to be rerolled. The tip commit has been
182
-cherry-picked to fc/fc/git-prompt-script topic.
183
-
184
-Will discard without prejudice.
185
-
190
* jc/maint-push-refs-all (2012-05-04) 2 commits
191
- get_fetch_map(): tighten checks on dest refs
192
- fetch/push: allow refs/*:refs/*
@@ -192,14 +196,6 @@ There still seem to be other bugs hiding (e.g. try pushing twice).
196
197
Not ready.
198
195
-* jc/run-hook-env-1 (2012-03-11) 1 commit
196
- . run_hook(): enhance the interface to pass arbitrary environment
197
-
198
-Updates run_hook() API to be much less specific to "commit". It would
199
-only be useful if people start doing more interesting things with hooks.
200
-
201
-Will discard.
202
-
199
* jc/split-blob (2012-04-03) 6 commits
200
- chunked-object: streaming checkout
201
- chunked-object: fallback checkout codepaths
@@ -233,18 +229,19 @@ not working :-(.
229
--------------------------------------------------
230
[Cooking]
231
236
-* cn/cherry-pick-range-docs (2012-06-15) 2 commits
237
- (merged to 'next' on 2012-06-21 at 5cf7f97)
238
- + git-cherry-pick.txt: clarify the use of revision range notation
239
- + Documentation: --no-walk is no-op if range is specified
240
-
241
-The command line argument of "git cherry-pick maint master..next" is
242
-just an ordinary revision range, which is unintuitive and at least
243
-deserves documentation.
232
+* vr/use-our-perl-in-tests (2012-06-24) 5 commits
233
+ - test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier
234
+ - t/README: add a bit more Don'ts
235
+ - tests: enclose $PERL_PATH in double quotes
236
+ - t/test-lib.sh: export PERL_PATH for use in scripts
237
+ - t: Replace 'perl' by $PERL_PATH
238
245
-Will merge to 'master'.
239
+The tip one is iffy and needs to be carefully proof-read by folks
240
+who have worked on adding various features to the test suite, e.g.
241
+valgrind, testing in an out of tree trash area, running under prove,
242
+etc.
243
247
-* jc/sha1-name-more (2012-06-21) 9 commits
244
+* jc/sha1-name-more (2012-06-23) 9 commits
245
- sha1_name.c: get_describe_name() by definition groks only commits
246
- sha1_name.c: teach get_short_sha1() a commit-only option
247
- sha1_name.c: allow get_short_sha1() to take other flags
@@ -259,6 +256,9 @@ Teaches the object name parser that a "git describe" output is
256
always a commit object, to prolong the lifetime of abbreviated
257
object name in it.
258
259
+It has a handful of failing tests that show directions for a couple
260
+of enhancement ideas.
261
+
262
* jk/version-string-dependency (2012-06-20) 11 commits
263
- Makefile: move GIT-VERSION-FILE dependencies closer to use
264
- Makefile: build instaweb similar to other scripts
@@ -272,14 +272,13 @@ object name in it.
272
- Makefile: fold MISC_H into LIB_H
273
- Makefile: sort LIB_H list
274
275
-Will hold in 'pu' to give Peff and Jonathan to work out improvements
275
+Will keep in 'pu' to give Peff and Jonathan to work out improvements
276
for a week or so.
277
278
* jn/perl-makemaker-leading-paths (2012-06-15) 1 commit
279
- perl/Makefile: move "mkdir -p" to module installation loop for maintainability
280
281
-Will wait for a few days to see if somebody comes up with a more
282
-concise and cleaner way to do this, but otherwise this looked good.
281
+Will merge to 'next' after waiting for a few more days.
282
283
* mm/verify-filename-fix (2012-06-18) 2 commits
284
(merged to 'next' on 2012-06-21 at d03dace)
@@ -300,36 +299,22 @@ like "git log" does when it walks.
299
300
Note that this is different from Thomas's patch.
301
303
-* fc/git-prompt-script (2012-06-19) 7 commits
304
- - completion: respect $GIT_DIR
305
- - completion: warn people about duplicated function
306
- - completion: split __git_ps1 into a separate script
307
- - completion: remove executable mode
308
- - Merge branch 'fc/git-complete-helper' into fc/git-prompt-script
309
- - tests: add tests for the bash prompt functions in the completion script
310
- - tests: move code to run tests under bash into a helper library
311
- (this branch is tangled with sg/bash-prompt.)
302
+Waiting for response from original author.
303
313
-Splits a rather heavy-ish "git completion" script out and creates a
304
+* fc/git-prompt-script (2012-06-19) 7 commits
305
+ (merged to 'next' on 2012-06-25 at e690a02)
306
+ + completion: respect $GIT_DIR
307
+ + completion: warn people about duplicated function
308
+ + completion: split __git_ps1 into a separate script
309
+ + completion: remove executable mode
310
+ + Merge branch 'fc/git-complete-helper' into fc/git-prompt-script
311
+ + tests: add tests for the bash prompt functions in the completion script
312
+ + tests: move code to run tests under bash into a helper library
313
+
314
+Split a rather heavy-ish "git completion" script out to create a
315
separate "git prompting" script, to help lazy-autoloading of the
316
completion part while making prompting part always available.
317
317
-Will merge to 'next'.
318
-
319
-* lm/git-blame-el (2012-06-14) 3 commits
320
- (merged to 'next' on 2012-06-21 at 6514487)
321
- + git-blame.el: Do not use bare 0 to mean (point-min)
322
- + git-blame.el: Use with-current-buffer where appropriate
323
- + git-blame.el: Do not use goto-line in lisp code
324
-
325
-Will merge to 'master'.
326
-
327
-* lp/no-cmd-http-fetch (2012-06-15) 1 commit
328
- (merged to 'next' on 2012-06-21 at 242a10e)
329
- + builtin.h: remove unused cmd_<foo> declarations
330
-
331
-Will merge to 'master'.
332
-
318
* jk/diff-no-index-pager (2012-06-15) 2 commits
319
(merged to 'next' on 2012-06-21 at e2a2562)
320
+ do not run pager with diff --no-index --quiet
@@ -339,147 +324,100 @@ Will merge to 'master'.
324
325
Will merge to 'master'.
326
342
-* nd/i18n-branch-lego (2012-06-07) 1 commit
343
- (merged to 'next' on 2012-06-21 at 0cb53fc)
344
- + Remove i18n legos in notifying new branch tracking setup
345
-
346
-Restructure the way message strings are created, in preparation for
347
-marking them for i18n.
348
-
349
-Will merge to 'master'.
350
-
351
-* nd/i18n-misc (2012-06-07) 3 commits
352
- (merged to 'next' on 2012-06-21 at 0a82040)
353
- + rerere: remove i18n legos in result message
354
- + notes-merge: remove i18n legos in merge result message
355
- + reflog: remove i18n legos in pruning message
356
-
357
-Restructure the way message strings are created, in preparation for
358
-marking them for i18n.
359
-
360
-Will merge to 'master'.
361
-
362
-* rr/doc-commit (2012-06-08) 1 commit
363
- (merged to 'next' on 2012-06-21 at af8301c)
364
- + commit: document a couple of options
365
-
366
-Will merge to 'master'.
367
-
327
* hv/remote-end-hung-up (2012-06-19) 1 commit
369
- - remove the impression of unexpectedness when access is denied
328
+ (merged to 'next' on 2012-06-25 at d3f29e2)
329
+ + remove the impression of unexpectedness when access is denied
330
371
-Will merge to 'next'.
331
+When we get disconnected while expecting a response from the remote
332
+side because authentication failed, we issued an error message "The
333
+remote side hung up unexpectedly." Give hint that it may be a
334
+permission problem in the message when we can reasonably suspect it.
335
373
-* hv/submodule-checkout-nuke-submodules (2012-06-11) 1 commit
374
- - update-index: allow overwriting existing submodule index entries
336
+* hv/submodule-update-nuke-submodules (2012-06-11) 1 commit
337
+ (merged to 'next' on 2012-06-25 at bbfcd02)
338
+ + update-index: allow overwriting existing submodule index entries
339
376
-Will merge to 'next'.
340
+"git add" allows adding a regular file to the path where a submodule
341
+used to exist, but "git update-index" does not allow an equivalent
342
+operation to Porcelain writers.
343
344
* jc/rev-list-simplify-merges-first-parent (2012-06-13) 3 commits
379
- - revision: ignore side parents while running simplify-merges
380
- - revision: note the lack of free() in simplify_merges()
381
- - revision: "simplify" options imply topo-order sort
382
-
383
-I need to send this out to the list for re-review.
384
-
385
-* jc/ustar-checksum-is-unsigned (2012-06-13) 1 commit
386
- (merged to 'next' on 2012-06-21 at bb8e2b0)
387
- + archive: ustar header checksum is computed unsigned
388
-
389
-"git archive" incorrectly computed the header checksum; the symptom
390
-was observed only when using pathnames with hi-bit set.
391
-
392
-Will merge to 'master'.
393
-
394
-* rs/git-blame-mapcar-mapc (2012-06-10) 1 commit
395
- (merged to 'next' on 2012-06-21 at 71a3b36)
396
- + git-blame.el: use mapc instead of mapcar
397
-
398
-Will merge to 'master'.
399
-
400
-* rs/ipv6-ssh-url (2012-06-13) 1 commit
401
- (merged to 'next' on 2012-06-21 at d0116a8)
402
- + git: Wrong parsing of ssh urls with IPv6 literals ignores port
403
-
404
-Will merge to 'master'.
405
-
406
-ssh:// URLs to IPv6 hosts with custom port number were parsed
407
-incorrectly.
345
+ (merged to 'next' on 2012-06-25 at 4c5ffbe)
346
+ + revision: ignore side parents while running simplify-merges
347
+ + revision: note the lack of free() in simplify_merges()
348
+ + revision: "simplify" options imply topo-order sort
349
+
350
+When "--simplify-merges/by-decoration" is given together with
351
+"--first-parent" to "git log", the combination of these options
352
+makes the simplification logic to use in-core commit objects that
353
+haven't been examined for relevance, either producing incorrect
354
+result or taking too long to produce any output. Teach the
355
+simplification logic to ignore commits that the first-parent
356
+traversal logic ignored when both are in effect to work around the
357
+issue.
358
359
* nd/exclude-workaround-top-heavy (2012-06-07) 3 commits
410
- - exclude: do strcmp as much as possible before fnmatch
411
- - dir.c: get rid of the wildcard symbol set in no_wildcard()
412
- - Unindent excluded_from_list()
360
+ (merged to 'next' on 2012-06-25 at 08429bb)
361
+ + exclude: do strcmp as much as possible before fnmatch
362
+ + dir.c: get rid of the wildcard symbol set in no_wildcard()
363
+ + Unindent excluded_from_list()
364
414
-Attempts to optimize matching with an exclude pattern with a deep
365
+Attempt to optimize matching with an exclude pattern with a deep
366
directory hierarchy by taking the part that specifies leading path
367
without wildcard literally.
368
418
-Will merge to 'next'.
419
-
369
* lk/more-helpful-status-hints (2012-06-14) 4 commits
421
- - status: better advices when splitting a commit (during rebase -i)
422
- - status: don't suggest "git rm" or "git add" if not appropriate
423
- - t7512-status-help.sh: better advices for git status
424
- - wt-status.*: better advices for git status added
370
+ (merged to 'next' on 2012-06-25 at 6502d4b)
371
+ + status: better advices when splitting a commit (during rebase -i)
372
+ + status: don't suggest "git rm" or "git add" if not appropriate
373
+ + t7512-status-help.sh: better advices for git status
374
+ + wt-status.*: better advices for git status added
375
426
-Will merge to 'next'.
376
+Give finer classification to various states of paths in conflicted
377
+state and offer advice messages in the "git status" output.
378
379
* jk/no-more-pre-exec-callback (2012-06-05) 1 commit
380
- pager: drop "wait for output to run less" hack
381
431
-On hold for 6 months until ancient "less" goes extinct.
382
+Will defer for 6 months until ancient "less" goes extinct.
383
384
* lk/rebase-i-x (2012-06-13) 1 commit
434
- - rebase -i: teach "--exec <cmd>"
385
+ (merged to 'next' on 2012-06-25 at 8252da2)
386
+ + rebase -i: teach "--exec <cmd>"
387
436
-Adds -x <cmd> to "rebase -i" to insert "exec <cmd>" after each
388
+Teach "-x <cmd>" to "rebase -i" to insert "exec <cmd>" after each
389
commit in the resulting history.
390
439
-Will merge to 'next'.
440
-
391
* nd/stream-pack-objects (2012-05-29) 1 commit
442
- - pack-objects: use streaming interface for reading large loose blobs
443
-
444
-Will merge to 'next'.
445
-
446
-* jk/no-more-asciidoc7 (2012-05-30) 2 commits
447
- (merged to 'next' on 2012-06-19 at a36b498)
448
- + docs: drop antique comment from Makefile
449
- + docs: drop asciidoc7compatible flag
392
+ (merged to 'next' on 2012-06-25 at fa91345)
393
+ + pack-objects: use streaming interface for reading large loose blobs
394
451
-Originally merged to 'next' on 2012-06-05.
452
-
453
-We no longer use AsciiDoc7 syntax in our documentation and favor a
454
-more modern style.
455
-
456
-Will merge to 'master'.
395
+"pack-objects" learned to read large loose blobs using the streaming API,
396
+without the need to hold everything in core at once.
397
398
* nd/stream-index-pack (2012-05-24) 4 commits
459
- - index-pack: use streaming interface for collision test on large blobs
460
- - index-pack: factor out unpack core from get_data_from_pack
461
- - index-pack: use streaming interface on large blobs (most of the time)
462
- - index-pack: hash non-delta objects while reading from stream
399
+ (merged to 'next' on 2012-06-25 at 3084674)
400
+ + index-pack: use streaming interface for collision test on large blobs
401
+ + index-pack: factor out unpack core from get_data_from_pack
402
+ + index-pack: use streaming interface on large blobs (most of the time)
403
+ + index-pack: hash non-delta objects while reading from stream
404
405
Use streaming API to read from the object store to avoid having to hold
406
a large blob object in-core while running index-pack.
407
467
-Will merge to 'next'.
468
-
408
* js/submodule-relative (2012-06-14) 5 commits
470
- - t7400: avoid path mangling issues
471
- - submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo/bar
472
- - submodule: fix sync handling of some relative superproject origin URLs
473
- - submodule: document failure to handle relative superproject origin URLs
474
- - submodule: additional regression tests for relative URLs
475
-
476
-Makes "git submodule" deal with nested submodule structure where a
409
+ (merged to 'next' on 2012-06-25 at 310ed77)
410
+ + t7400: avoid path mangling issues
411
+ + submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo/bar
412
+ + submodule: fix sync handling of some relative superproject origin URLs
413
+ + submodule: document failure to handle relative superproject origin URLs
414
+ + submodule: additional regression tests for relative URLs
415
+
416
+Teach "git submodule" deal with nested submodule structure where a
417
module is contained within a module whose origin is specified as a
418
relative URL to its superproject's origin.
419
480
-Will merge to 'next'.
481
-
482
-* mm/push-default-switch-warning (2012-06-20) 1 commit
420
+* mm/push-default-switch-warning (2012-06-24) 1 commit
421
- push: start warning upcoming default change for push.default
422
423
Will merge to 'next'.
@@ -508,3 +446,24 @@ forwarded to; this came from a laziness of the implementation of
446
merging of signed tags in 1.7.9. People may have different opinion
447
on making signed and unsigned annotated tag behave differently, but
448
I tend to agree that it is probably not a good idea.
449
+
450
+* jc/run-hook-env-1 (2012-03-11) 1 commit
451
+ . run_hook(): enhance the interface to pass arbitrary environment
452
+
453
+Updates run_hook() API to be much less specific to "commit". It would
454
+only be useful if people start doing more interesting things with hooks.
455
+
456
+Will discard.
457
+
458
+* sg/bash-prompt (2012-05-09) 4 commits
459
+ . completion: respect $GIT_DIR
460
+ . completion: use __gitdir() in _git_log()
461
+ - tests: add tests for the bash prompt functions in the completion script
462
+ - tests: move code to run tests under bash into a helper library
463
+ (this branch is tangled with fc/git-prompt-script.)
464
+
465
+This is only the "correction" bits taken from the beginning of a
466
+larger series that is to be rerolled. The tip commit has been
467
+cherry-picked to fc/fc/git-prompt-script topic.
468
+
469
+Will discard without prejudice.