What's cooking (2012/06 #08)
Junio C Hamano committed
Jun 28, 2012 at 16:32 UTC
bc1ab8649adf59f2fc4929340e5810c373cccb4a
1 file changed
+295
-261
whats-cooking.txt
+295
-261
@@ -1,15 +1,15 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2012, #07; Mon, 25)
3
-X-master-at: bc9e7dd41fe8b51cc7f2e79312a2ff777899f930
4
-X-next-at: d3f29e2e8f7ed8869c211f67f49ffecd8994f456
2
+Subject: What's cooking in git.git (Jun 2012, #08; Thu, 28)
3
+X-master-at: e7b44f182bc1b2ac32eadbc477a76a185f49ac88
4
+X-next-at: ce5f79f7997da38c414b6b9006eda871419ecfe7
5
6
-What's cooking in git.git (Jun 2012, #07; Mon, 25)
6
+What's cooking in git.git (Jun 2012, #08; Thu, 28)
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
-The second batch of topics have graduated to 'master', and a handful
12
+The third 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
@@ -20,112 +20,255 @@ repositories listed at
20
--------------------------------------------------
21
[Graduated to "master"]
22
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
23
+* fc/git-prompt-script (2012-06-19) 7 commits
24
+ (merged to 'next' on 2012-06-25 at e690a02)
25
+ + completion: respect $GIT_DIR
26
+ + completion: warn people about duplicated function
27
+ + completion: split __git_ps1 into a separate script
28
+ + completion: remove executable mode
29
+ + Merge branch 'fc/git-complete-helper' into fc/git-prompt-script
30
+ + tests: add tests for the bash prompt functions in the completion script
31
+ + tests: move code to run tests under bash into a helper library
32
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.
33
+Split a rather heavy-ish "git completion" script out to create a
34
+separate "git prompting" script, to help lazy-autoloading of the
35
+completion part while making prompting part always available.
36
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
37
+* hv/submodule-update-nuke-submodules (2012-06-11) 1 commit
38
+ (merged to 'next' on 2012-06-25 at bbfcd02)
39
+ + update-index: allow overwriting existing submodule index entries
40
36
-"git archive" incorrectly computed the header checksum; the symptom
37
-was observed only when using pathnames with hi-bit set.
41
+"git add" allows adding a regular file to the path where a submodule
42
+used to exist, but "git update-index" does not allow an equivalent
43
+operation to Porcelain writers.
44
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
45
+* jc/rev-list-simplify-merges-first-parent (2012-06-13) 3 commits
46
+ (merged to 'next' on 2012-06-25 at 4c5ffbe)
47
+ + revision: ignore side parents while running simplify-merges
48
+ + revision: note the lack of free() in simplify_merges()
49
+ + revision: "simplify" options imply topo-order sort
50
+
51
+When "git log" is given "--simplify-merges/by-decoration" together
52
+with "--first-parent", the combination of these options makes the
53
+simplification logic to use in-core commit objects that haven't been
54
+examined for relevance, either producing incorrect result or taking
55
+too long to produce any output. Teach the simplification logic to
56
+ignore commits that the first-parent traversal logic ignored when
57
+both are in effect to work around the issue.
58
44
-Originally merged to 'next' on 2012-06-05.
59
+* jk/diff-no-index-pager (2012-06-15) 2 commits
60
+ (merged to 'next' on 2012-06-21 at e2a2562)
61
+ + do not run pager with diff --no-index --quiet
62
+ + fix pager.diff with diff --no-index
63
46
-We no longer use AsciiDoc7 syntax in our documentation and favor a
47
-more modern style.
64
+"git diff --no-index" did not work with pagers correctly.
65
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
66
+* js/submodule-relative (2012-06-14) 5 commits
67
+ (merged to 'next' on 2012-06-25 at 310ed77)
68
+ + t7400: avoid path mangling issues
69
+ + submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo/bar
70
+ + submodule: fix sync handling of some relative superproject origin URLs
71
+ + submodule: document failure to handle relative superproject origin URLs
72
+ + submodule: additional regression tests for relative URLs
73
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
74
+Teach "git submodule" deal with nested submodule structure where a
75
+module is contained within a module whose origin is specified as a
76
+relative URL to its superproject's origin.
77
59
-Remove unused declarations of nonexisting functions from a header
60
-file.
78
+* lk/more-helpful-status-hints (2012-06-14) 4 commits
79
+ (merged to 'next' on 2012-06-25 at 6502d4b)
80
+ + status: better advices when splitting a commit (during rebase -i)
81
+ + status: don't suggest "git rm" or "git add" if not appropriate
82
+ + t7512-status-help.sh: better advices for git status
83
+ + wt-status.*: better advices for git status added
84
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
85
+Give finer classification to various states of paths in conflicted
86
+state and offer advice messages in the "git status" output.
87
66
-Restructure the way message strings are created, in preparation for
67
-marking them for i18n.
88
+* lk/rebase-i-x (2012-06-13) 1 commit
89
+ (merged to 'next' on 2012-06-25 at 8252da2)
90
+ + rebase -i: teach "--exec <cmd>"
91
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
92
+Teach "-x <cmd>" to "rebase -i" to insert "exec <cmd>" after each
93
+commit in the resulting history.
94
75
-Restructure the way message strings are created, in preparation for
76
-marking them for i18n.
95
+* mm/verify-filename-fix (2012-06-18) 2 commits
96
+ (merged to 'next' on 2012-06-21 at d03dace)
97
+ + verify_filename(): ask the caller to chose the kind of diagnosis
98
+ + sha1_name: do not trigger detailed diagnosis for file arguments
99
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
100
+"git diff COPYING HEAD:COPYING" gave a nonsense error message that
101
+claimed that the treeish HEAD did not have COPYING in it.
102
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
103
+* nd/exclude-workaround-top-heavy (2012-06-07) 3 commits
104
+ (merged to 'next' on 2012-06-25 at 08429bb)
105
+ + exclude: do strcmp as much as possible before fnmatch
106
+ + dir.c: get rid of the wildcard symbol set in no_wildcard()
107
+ + Unindent excluded_from_list()
108
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
109
+Attempt to optimize matching with an exclude pattern with a deep
110
+directory hierarchy by taking the part that specifies leading path
111
+without wildcard literally.
112
90
-ssh:// URLs to IPv6 hosts with custom port number were parsed
91
-incorrectly.
113
+* nd/stream-index-pack (2012-05-24) 4 commits
114
+ (merged to 'next' on 2012-06-25 at 3084674)
115
+ + index-pack: use streaming interface for collision test on large blobs
116
+ + index-pack: factor out unpack core from get_data_from_pack
117
+ + index-pack: use streaming interface on large blobs (most of the time)
118
+ + index-pack: hash non-delta objects while reading from stream
119
+
120
+Use streaming API to read from the object store to avoid having to hold
121
+a large blob object in-core while running index-pack.
122
+
123
+* nd/stream-pack-objects (2012-05-29) 1 commit
124
+ (merged to 'next' on 2012-06-25 at fa91345)
125
+ + pack-objects: use streaming interface for reading large loose blobs
126
+
127
+"pack-objects" learned to read large loose blobs using the streaming API,
128
+without the need to hold everything in core at once.
129
130
--------------------------------------------------
131
[New Topics]
132
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
133
+* tb/sanitize-decomposed-utf-8-pathname (2012-06-25) 1 commit
134
+ - git on Mac OS and precomposed unicode
135
102
-Teach git to read various information from $XDG_CONFIG_HOME/git/ to allow
103
-the user to avoid cluttering $HOME.
136
+Teaches git to normalize pathnames read from readdir(3) and all
137
+arguments from the command line into precomposed UTF-8 (assuming
138
+that they come as decomposed UTF-8) to work around issues on Mac OS.
139
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
140
+I think there still are other places that need conversion
141
+(e.g. paths that are read from stdin for some commands), but this
142
+should be a step in the right direction.
143
110
-Expose the credential API to scripted Porcelain writers.
144
+Will merge to 'next'.
145
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
146
+* cw/no-detaching-an-unborn (2012-06-26) 1 commit
147
+ - git-checkout: disallow --detach on unborn branch
148
116
-"git diff --no-index" did not correctly handle relative paths and
117
-did not correctly give exit codes when run under "--quiet" option.
149
+"git checkout --detach" when you are still on an unborn branch
150
+should be forbidden, but it wasn't.
151
152
Will merge to 'next'.
153
121
-* nd/clone-single-fix (2012-06-22) 1 commit
122
- - clone: fix ref selection in --single-branch --branch=xxx
154
+* cw/rebase-i-root (2012-06-26) 2 commits
155
+ - Add tests for rebase -i --root without --onto
156
+ - rebase -i: support --root without --onto
157
124
-"git clone --single-branch" to clone a single branch did not limit
125
-the cloning to the specified branch.
158
+"git rebase [-i] --root $tip" can now be used to rewrite all the
159
+history down to the root.
160
+
161
+Will merge to 'next'.
162
+
163
+* js/fast-export-paths-with-spaces (2012-06-27) 1 commit
164
+ - fast-export: quote paths with spaces
165
+
166
+"git fast-export" produced an input stream for fast-import without
167
+properly quoting pathnames when they contain SPs in them.
168
+
169
+Will merge to 'next'.
170
+
171
+* mm/mediawiki-file-attachments (2012-06-27) 5 commits
172
+ - git-remote-mediawiki: import "File:" attachments
173
+ - git-remote-mediawiki: split get_mw_pages into smaller functions
174
+ - git-remote-mediawiki: send "File:" attachments to a remote wiki
175
+ - git-remote-mediawiki: don't "use encoding 'utf8';"
176
+ - git-remote-mediawiki: don't compute the diff when getting commit message
177
+ (this branch uses mm/credential-plumbing.)
178
+
179
+"mediawiki" remote helper (in contrib/) learned to handle file
180
+attachments.
181
182
Will merge to 'next'.
183
184
+* mz/rebase-no-mbox (2012-06-26) 4 commits
185
+ - am: don't call mailinfo if $rebasing
186
+ - am --rebasing: get patch body from commit, not from mailbox
187
+ - rebase --root: print usage on too many args
188
+ - rebase: don't source git-sh-setup twice
189
+
190
+Teach "am --rebasing" codepath to grab authorship, log message and
191
+the patch text directly out of existing commits.
192
+
193
+Will merge to 'next'.
194
+
195
+* pw/git-p4-tests (2012-06-27) 10 commits
196
+ - git p4 test: fix badp4dir test
197
+ - git p4 test: split up big t9800 test
198
+ - git p4 test: cleanup_git should make a new $git
199
+ - git p4 test: copy source indeterminate
200
+ - git p4 test: check for error message in failed test
201
+ - git p4 test: rename some "git-p4 command" strings
202
+ - git p4 test: never create default test repo
203
+ - git p4 test: simplify quoting involving TRASH_DIRECTORY
204
+ - git p4 test: use real_path to resolve p4 client symlinks
205
+ - git p4 test: wait longer for p4d to start and test its pid
206
+
207
+More "git p4" tests.
208
+
209
+Will merge to 'next'.
210
+
211
+* rj/platform-pread-may-be-thread-unsafe (2012-06-26) 1 commit
212
+ (merged to 'next' on 2012-06-28 at ce5f79f)
213
+ + index-pack: Disable threading on cygwin
214
+
215
+On Cygwin, the platform pread(3) is not thread safe, just like our
216
+own compat/ emulation, and cannot be used in the index-pack program.
217
+
218
+* jc/refactor-diff-stdin (2012-06-28) 3 commits
219
+ - diff-index.c: "git diff" has no need to read blob from the standard input
220
+ - diff-index.c: unify handling of command line paths
221
+ - diff-index.c: do not pretend paths are pathspecs
222
+
223
+Due to the way "git diff --no-index" is bolted onto by touching the
224
+low level code that is shared with the rest of the "git diff" code,
225
+even though it has to work in a very different way, any comparison
226
+that involves a file "-" at the root level incorrectly tried to read
227
+from the standard input. This cleans up the no-index codepath
228
+further to remove code that reads from the standard input from the
229
+core side, which is never necessary when git is running its usual
230
+diff operation.
231
+
232
+Will merge to 'next', and later down to older maintenance releases.
233
+
234
+* mz/empty-rebase-test (2012-06-27) 1 commit
235
+ - add test case for rebase of empty commit
236
+
237
+We did not have test to make sure "git rebase" without extra options
238
+filters out an empty commit in the original history.
239
+
240
+* cw/help-over-network (2012-06-28) 2 commits
241
+ - Allow help.htmlpath to be a URL prefix
242
+ - Add config variable to set HTML path for git-help --web
243
+
244
+"git help -w $cmd" can show HTML version of documentation for
245
+"git-$cmd" by setting help.htmlpath to somewhere other than the
246
+default location where the build procedure installs them locally;
247
+the variable can even point at a http:// URL.
248
+
249
+* lt/commit-tree-guess-utf-8 (2012-06-28) 1 commit
250
+ - commit/commit-tree: correct latin1 to utf-8
251
+
252
+Teaches "git commit" and "git commit-tree" the "we are told to use
253
+utf-8 in log message, but this does not look like utf-8---attempt to
254
+pass it through convert-from-latin1-to-utf8 and see if it makes
255
+sense" heuristics "git mailinfo" already uses.
256
+
257
+A draft from Linus received privately without a log message.
258
+Hopefully it will be rerolled.
259
+
260
+* jc/test-lib-source-build-options-early (2012-06-24) 1 commit
261
+ - test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier
262
+ (this branch uses vr/use-our-perl-in-tests.)
263
+
264
+Reorders t/test-lib.sh so that we dot-source GIT-BUILD-OPTIONS that
265
+records the shell and Perl the user told us to use with Git a lot
266
+early, so that test-lib.sh script itself can use "$PERL_PATH" in
267
+one of its early operations.
268
+
269
+Needs to be eyeballed by people who run tests with exotic options
270
+like valgrind, --root=/dev/shm/somewhere, etc.
271
+
272
--------------------------------------------------
273
[Stalled]
274
@@ -139,28 +282,6 @@ Will merge to 'next'.
282
283
Waiting for Jonathan's clean-up offered earlier.
284
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
-
159
-I had an impression after the discussion thread that a redesign is
160
-coming, but it hasn't happened yet.
161
-
162
-Will discard without prejudice, unless rerolled.
163
-
285
* jc/apply-3way (2012-06-13) 19 commits
286
- apply --3way: tests
287
- apply: document --3way option
@@ -185,7 +306,7 @@ Will discard without prejudice, unless rerolled.
306
"git apply" learns to wiggle the base version and perform three-way merge
307
when a patch does not exactly apply to the version you have.
308
188
-Waiting for comments.
309
+Will merge to 'next' after reading it over once again.
310
311
* jc/maint-push-refs-all (2012-05-04) 2 commits
312
- get_fetch_map(): tighten checks on dest refs
@@ -229,17 +350,59 @@ not working :-(.
350
--------------------------------------------------
351
[Cooking]
352
232
-* vr/use-our-perl-in-tests (2012-06-24) 5 commits
233
- - test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier
353
+* mm/config-xdg (2012-06-25) 4 commits
354
+ (merged to 'next' on 2012-06-28 at 57049d1)
355
+ + config: write to $XDG_CONFIG_HOME/git/config file when appropriate
356
+ + Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes
357
+ + Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore
358
+ + config: read (but not write) from $XDG_CONFIG_HOME/git/config file
359
+
360
+Teach git to read various information from $XDG_CONFIG_HOME/git/ to allow
361
+the user to avoid cluttering $HOME.
362
+
363
+Will merge to 'next'.
364
+
365
+* mm/credential-plumbing (2012-06-25) 3 commits
366
+ (merged to 'next' on 2012-06-28 at 6e6fe9f)
367
+ + git-remote-mediawiki: add credential support
368
+ + git credential fill: output the whole 'struct credential'
369
+ + add 'git credential' plumbing command
370
+ (this branch is used by mm/mediawiki-file-attachments.)
371
+
372
+Expose the credential API to scripted Porcelain writers.
373
+
374
+Will merge to 'next'.
375
+
376
+* th/diff-no-index-fixes (2012-06-22) 2 commits
377
+ (merged to 'next' on 2012-06-26 at 450e781)
378
+ + diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds changes
379
+ + diff: handle relative paths in no-index
380
+
381
+"git diff --no-index" did not correctly handle relative paths and
382
+did not correctly give exit codes when run under "--quiet" option.
383
+
384
+Will merge to 'master'.
385
+
386
+* nd/clone-single-fix (2012-06-22) 1 commit
387
+ (merged to 'next' on 2012-06-26 at c9fff5e)
388
+ + clone: fix ref selection in --single-branch --branch=xxx
389
+
390
+"git clone --single-branch" to clone a single branch did not limit
391
+the cloning to the specified branch.
392
+
393
+Will merge to 'master'.
394
+
395
+* vr/use-our-perl-in-tests (2012-06-24) 4 commits
396
- t/README: add a bit more Don'ts
397
- tests: enclose $PERL_PATH in double quotes
398
- t/test-lib.sh: export PERL_PATH for use in scripts
399
- t: Replace 'perl' by $PERL_PATH
400
+ (this branch is used by jc/test-lib-source-build-options-early.)
401
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.
402
+Some implementations of Perl terminates "lines" with CRLF even when
403
+the script is operating on just a sequence of bytes. Make sure to
404
+use "$PERL_PATH", the version of Perl the user told Git to use, in
405
+our tests to avoid unnecessary breakages in tests.
406
407
* jc/sha1-name-more (2012-06-23) 9 commits
408
- sha1_name.c: get_describe_name() by definition groks only commits
@@ -256,8 +419,10 @@ Teaches the object name parser that a "git describe" output is
419
always a commit object, to prolong the lifetime of abbreviated
420
object name in it.
421
259
-It has a handful of failing tests that show directions for a couple
260
-of enhancement ideas.
422
+It has a handful of tests that expect failure and show directions
423
+for a couple of enhancement ideas.
424
+
425
+Will merge to 'next'.
426
427
* jk/version-string-dependency (2012-06-20) 11 commits
428
- Makefile: move GIT-VERSION-FILE dependencies closer to use
@@ -276,19 +441,11 @@ Will keep in 'pu' to give Peff and Jonathan to work out improvements
441
for a week or so.
442
443
* 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 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)
285
- + verify_filename(): ask the caller to chose the kind of diagnosis
286
- + sha1_name: do not trigger detailed diagnosis for file arguments
444
+ (merged to 'next' on 2012-06-28 at 286d854)
445
+ + perl/Makefile: move "mkdir -p" to module installation loop for maintainability
446
288
-"git diff COPYING HEAD:COPYING" gave a nonsense error message that
289
-claimed that the treeish HEAD did not have COPYING in it.
290
-
291
-Will merge to 'master'.
447
+Minor build tweak. People who do not use ExtUtils::MakeMaker may
448
+want to test this before it hits the 'master' branch.
449
450
* tr/maint-show-walk (2012-06-19) 2 commits
451
- show: fix "range implies walking"
@@ -301,29 +458,6 @@ Note that this is different from Thomas's patch.
458
459
Waiting for response from original author.
460
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
-
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
321
- + fix pager.diff with diff --no-index
322
-
323
-"git diff --no-index" did not work with pagers correctly.
324
-
325
-Will merge to 'master'.
326
-
461
* hv/remote-end-hung-up (2012-06-19) 1 commit
462
(merged to 'next' on 2012-06-25 at d3f29e2)
463
+ remove the impression of unexpectedness when access is denied
@@ -333,137 +467,37 @@ side because authentication failed, we issued an error message "The
467
remote side hung up unexpectedly." Give hint that it may be a
468
permission problem in the message when we can reasonably suspect it.
469
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
-
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
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
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
-
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
-
369
-* lk/more-helpful-status-hints (2012-06-14) 4 commits
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
-
376
-Give finer classification to various states of paths in conflicted
377
-state and offer advice messages in the "git status" output.
470
+Will merge to 'master'.
471
472
* jk/no-more-pre-exec-callback (2012-06-05) 1 commit
473
- pager: drop "wait for output to run less" hack
474
475
Will defer for 6 months until ancient "less" goes extinct.
476
384
-* lk/rebase-i-x (2012-06-13) 1 commit
385
- (merged to 'next' on 2012-06-25 at 8252da2)
386
- + rebase -i: teach "--exec <cmd>"
387
-
388
-Teach "-x <cmd>" to "rebase -i" to insert "exec <cmd>" after each
389
-commit in the resulting history.
390
-
391
-* nd/stream-pack-objects (2012-05-29) 1 commit
392
- (merged to 'next' on 2012-06-25 at fa91345)
393
- + pack-objects: use streaming interface for reading large loose blobs
394
-
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
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
-
408
-* js/submodule-relative (2012-06-14) 5 commits
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
-
477
* 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'.
478
+ (merged to 'next' on 2012-06-26 at fea512a)
479
+ + push: start warning upcoming default change for push.default
480
425
-Hopwefully we can have a solidly tested series early in 1.7.12 or
481
+Hopefully we can have a solidly tested series early in 1.7.12 or
482
1.7.13 at the latest.
483
484
--------------------------------------------------
485
[Discarded]
486
431
-* cb/daemon-test-race-fix (2012-04-27) 2 commits
432
- (merged to 'next' on 2012-04-27 at 84bbcf8)
433
- + Revert "git-daemon wrapper to wait until daemon is ready"
434
- (merged to 'next' on 2012-04-24 at d5c30be)
435
- + git-daemon wrapper to wait until daemon is ready
436
-
437
-Reverted from 'next' to replace it with js/daemon-test-race-fix.
438
-
439
-* jc/merge-annotated-tag (2012-06-05) 2 commits
440
- . merge: allow fast-forwarding to an annotated but unsigned tag
441
- . merge: separte the logic to check for a signed tag
442
-
443
-"git merge anno" created a merge commit even when anno is an
444
-unsigned annotated tag that points at a commit that can be fast
445
-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.
487
+* nl/http-proxy-more (2012-05-11) 2 commits
488
+ . http: rename HTTP_REAUTH to HTTP_AUTH_RETRY
489
+ . http: Avoid limit of retrying request only twice
490
456
-Will discard.
491
+I queued only the later two patches from this series, even though they do
492
+not make much sense without the first one that seems to need a bit more
493
+work, so that we won't forget.
494
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.)
495
+* jk/no-op-push-message (2012-05-30) 1 commit
496
+ . improve no-op push output
497
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.
498
+Rewords the status message of "git push" that pushed only one ref
499
+differently from "Everything up-to-date", to give a bit more help to
500
+people who get the message when their current branch is not pushed.
501
469
-Will discard without prejudice.
502
+I had an impression after the discussion thread that a redesign is
503
+coming, but it hasn't happened yet.