What's cooking (2012/06 #01)
Junio C Hamano committed
Jun 3, 2012 at 17:22 UTC
5321cb29c8f709669c5e4a04f502cd984623592c
1 file changed
+118
-207
whats-cooking.txt
+118
-207
@@ -1,221 +1,103 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2012, #07; Thu, 31)
3
-X-master-at: b2478aa0858811c29061ed32c2686468b89d7296
4
-X-next-at: 11af7cdeca7ffbfb4387fb8253081fd22c3dd697
2
+Subject: What's cooking in git.git (Jun 2012, #01; Sun, 3)
3
+X-master-at: 3fe4498197ced84886b4adaddf18f1109b477f8e
4
+X-next-at: 281ad67c6ed0afb147ad426ff961c221b935af77
5
6
-What's cooking in git.git (May 2012, #07; Thu, 31)
6
+What's cooking in git.git (Jun 2012, #01; Sun, 3)
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
+v1.7.11-rc1 has been tagged. Except for trivially obvious and small
13
+fixes to older bugs and trivially obvious and small patches to
14
+documentation, please consider we are in "regression fix only"
15
+mode. Finding and fixing since v1.7.10 is the top priority.
16
+
17
You can find the changes described here in the integration branches of the
18
repositories listed at
19
20
http://git-blame.blogspot.com/p/git-public-repositories.html
21
17
---------------------------------------------------
18
-[Graduated to "master"]
19
-
20
-* ap/checkout-no-progress-for-non-tty (2012-05-24) 1 commit
21
- (merged to 'next' on 2012-05-24 at dc473bd)
22
- + checkout: no progress messages if !isatty(2).
23
-
24
-"git checkout" gave progress display even when the standard error
25
-stream was not connected to the tty, which made little sense.
26
-
27
-* fc/git-complete-helper-fix (2012-05-20) 2 commits
28
- (merged to 'next' on 2012-05-23 at 6124da2)
29
- + completion: add support for backwards compatibility
30
- + completion: rename internal helpers _git and _gitk
31
-
32
-Would help people who relied on (unofficial) _git/_gitk helper in their
33
-completion tweaks.
34
-
35
-* jk/fetch-pack-remove-dups-optim (2012-05-24) 6 commits
36
- (merged to 'next' on 2012-05-24 at cf56fe6)
37
- + fetch-pack: sort incoming heads list earlier
38
- (merged to 'next' on 2012-05-23 at 6057c21)
39
- + fetch-pack: avoid quadratic loop in filter_refs
40
- + fetch-pack: sort the list of incoming refs
41
- + add sorting infrastructure for list refs
42
- + fetch-pack: avoid quadratic behavior in remove_duplicates
43
- + fetch-pack: sort incoming heads
44
-
45
-The way "fetch-pack" that is given multiple references to fetch tried to
46
-remove duplicates was very inefficient.
47
-
48
-* jk/format-person-part-buffer-limit (2012-05-22) 1 commit
49
- (merged to 'next' on 2012-05-23 at ef025b0)
50
- + pretty: avoid buffer overflow in format_person_part
51
-
52
-* jk/ident-gecos-strbuf (2012-05-24) 22 commits
53
- (merged to 'next' on 2012-05-24 at 7148763)
54
- + format-patch: do not use bogus email addresses in message ids
55
- + ident: reject bogus email addresses with IDENT_STRICT
56
- + ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT
57
- + format-patch: use GIT_COMMITTER_EMAIL in message ids
58
- + ident: let callers omit name with fmt_indent
59
- + ident: refactor NO_DATE flag in fmt_ident
60
- + ident: reword empty ident error message
61
- (merged to 'next' on 2012-05-23 at 6fce816)
62
- + format-patch: refactor get_patch_filename
63
- + ident: trim whitespace from default name/email
64
- + ident: use a dynamic strbuf in fmt_ident
65
- + ident: use full dns names to generate email addresses
66
- + ident: report passwd errors with a more friendly message
67
- + drop length limitations on gecos-derived names and emails
68
- + ident: don't write fallback username into git_default_name
69
- + fmt_ident: drop IDENT_WARN_ON_NO_NAME code
70
- + format-patch: use default email for generating message ids
71
- + ident: trim trailing newline from /etc/mailname
72
- + move git_default_* variables to ident.c
73
- + move identity config parsing to ident.c
74
- + fmt-merge-msg: don't use static buffer in record_person
75
- + http-push: do not access git_default_email directly
76
- + ident: split setup_ident into separate functions
77
-
78
-Fixes quite a lot of brokenness when ident information needs to be taken
79
-from the system and cleans up the code.
80
-
81
-* jk/ident-split-fix (2012-05-22) 1 commit
82
- (merged to 'next' on 2012-05-23 at 811c9ec)
83
- + fix off-by-one error in split_ident_line
84
-
85
-An author/committer name that is a single character was mishandled as an
86
-invalid name by mistake.
87
-
88
-* jk/pretty-commit-header-incomplete-line (2012-05-22) 1 commit
89
- (merged to 'next' on 2012-05-23 at f788433)
90
- + avoid segfault when reading header of malformed commits
91
-
92
-* mh/fetch-pack-constness (2012-05-22) 4 commits
93
- (merged to 'next' on 2012-05-23 at be95121)
94
- + cmd_fetch_pack(): respect constness of argv parameter
95
- + cmd_fetch_pack(): combine the loop termination conditions
96
- + cmd_fetch_pack(): handle non-option arguments outside of the loop
97
- + cmd_fetch_pack(): declare dest to be const
98
-
99
-Tighten constness of some local variables in a callchain.
100
-
101
-* mh/ref-api (2012-05-24) 1 commit
102
- (merged to 'next' on 2012-05-24 at c8d54c0)
103
- + Avoid sorting if references are added to ref_cache in order
104
-
105
-* mh/ref-api-lazy-loose (2012-05-20) 1 commit
106
- (merged to 'next' on 2012-05-23 at c41a30a)
107
- + free_ref_entry(): do not trigger reading of loose refs
108
-
109
-The code to lazily read loose refs by mistake unnecessarily read the refs
110
-in a subhierarchy when we free the data for the subhierarchy.
111
-
112
-* mh/test-keep-prove-cache (2012-05-20) 1 commit
113
- (merged to 'next' on 2012-05-23 at 870d1f9)
114
- + t/Makefile: retain cache t/.prove across prove runs
115
-
116
-* ng/pack-objects-cleanup (2012-05-18) 2 commits
117
- (merged to 'next' on 2012-05-23 at f90b1ba)
118
- + pack-objects: refactor write_object() into helper functions
119
- + pack-objects, streaming: turn "xx >= big_file_threshold" to ".. > .."
120
-
121
-* rs/dir-strbuf-read-recursive-fix (2012-05-11) 2 commits
122
- (merged to 'next' on 2012-05-23 at 2e22549)
123
- + dir: simplify fill_directory()
124
- + dir: respect string length argument of read_directory_recursive()
125
-
126
-* rs/maint-grep-F (2012-05-21) 4 commits
127
- (merged to 'next' on 2012-05-23 at b24143c)
128
- + grep: stop leaking line strings with -f
129
- + grep: support newline separated pattern list
130
- + grep: factor out do_append_grep_pat()
131
- + grep: factor out create_grep_pat()
132
-
133
-"git grep -e '$pattern'", unlike the case where the patterns are read from
134
-a file, did not treat individual lines in the given pattern argument as
135
-separate regular expressions as it should.
136
-
137
-* rs/refs-string-slice (2012-05-22) 4 commits
138
- (merged to 'next' on 2012-05-23 at d224de1)
139
- + refs: do not create ref_entry when searching
140
- + refs: use strings directly in find_containing_dir()
141
- + refs: convert parameter of create_dir_entry() to length-limited string
142
- + refs: convert parameter of search_ref_dir() to length-limited string
143
-
144
-Avoid unnecessary temporary allocations while looking for matching refs
145
-inside refs API.
146
-
147
-* rs/xdiff-fast-hash-fix (2012-05-23) 3 commits
148
- (merged to 'next' on 2012-05-23 at 8df26a5)
149
- + xdiff: import new 32-bit version of count_masked_bytes()
150
- + xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines
151
- + xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines
152
-
153
-* sp/sh-windows-pwd (2012-05-16) 1 commit
154
- (merged to 'next' on 2012-05-23 at 63004c3)
155
- + git-sh-setup: define workaround wrappers before they are used
156
-
157
-* va/git-p4-test (2012-05-23) 2 commits
158
- - git-p4: Verify detection of "empty" branch creation
159
- - git-p4: Test changelists touching two branches
160
-
161
-Rerolled and Acked by Pete.
162
-
22
--------------------------------------------------
23
[New Topics]
24
166
-* jl/submodule-report-new-path-once (2012-05-29) 1 commit
167
- (merged to 'next' on 2012-05-30 at e482dd9)
168
- + submodules: print "registered for path" message only once
25
+* jc/ls-files-i-dir (2012-06-03) 2 commits
26
+ - ls-files -i: micro-optimize path_excluded()
27
+ - ls-files -i: pay attention to exclusion of leading paths
28
170
-Will merge to master by 1.7.11 final.
29
+"git ls-files --exclude=t -i" did not consider anything under t/
30
+as excluded, as it did not pay attention to exclusion of leading
31
+paths while walking the index.
32
172
-* mm/levenstein-penalize-deletion-less (2012-05-29) 1 commit
173
- (merged to 'next' on 2012-05-30 at b2a0346)
174
- + Reduce cost of deletion in levenstein distance (4 -> 3)
33
+* jc/request-pull-match-tagname (2012-06-01) 1 commit
34
+ - request-pull: really favor a matching tag
35
176
-Will merge to master by 1.7.11 final.
36
+"git request-pull $url dev" when the tip of "dev" branch was tagged
37
+with "ext4-for-linus" used the contents from the tag in the output
38
+but still asked the "dev" branch to be pulled, not the tag.
39
178
-* nd/exclude-workaround-top-heavy (2012-05-29) 2 commits
179
- - exclude: do strcmp as much as possible before fnmatch
180
- - Unindent excluded_from_list()
40
+* db/vcs-svn (2012-06-01) 6 commits
41
+ - vcs-svn: drop no-op reset methods
42
+ - vcs-svn: fix signedness warnings
43
+ - vcs-svn: prefer strstr over memmem
44
+ - vcs-svn: prefer constcmp to prefixcmp
45
+ - vcs-svn: simplify cleanup in apply_one_window()
46
+ - vcs-svn: fix clang-analyzer error
47
182
-* nd/stream-pack-objects (2012-05-29) 1 commit
183
- - pack-objects: use streaming interface for reading large loose blobs
48
+* jk/version-string (2012-06-03) 3 commits
49
+ - http: get default user-agent from git_user_agent
50
+ - version: add git_user_agent function
51
+ - move git_version_string into version.c
52
185
-* vr/rebase-autosquash-does-not-imply-i (2012-05-29) 1 commit
186
- (merged to 'next' on 2012-05-30 at 10dd3af)
187
- + Do not autosquash in case of an implied interactive rebase
53
+* mm/api-credentials-doc (2012-06-03) 3 commits
54
+ - api-credentials.txt: mention credential.helper explicitly
55
+ - api-credentials.txt: add "see also" section
56
+ - api-credentials.txt: show the big picture first
57
189
-Will merge to master by 1.7.11 final.
58
+--------------------------------------------------
59
+[Graduated to "master"]
60
191
-* nh/empty-rebase (2012-05-29) 1 commit
192
- (merged to 'next' on 2012-05-30 at 270703a)
193
- + cherry-pick: regression fix for empty commits
61
+* ef/http-o-depends-on-gvf (2012-05-31) 1 commit
62
+ (merged to 'next' on 2012-05-31 at 11af7cd)
63
+ + Makefile: add missing GIT-VERSION-FILE dependency
64
195
-Will merge to master by 1.7.11 final.
65
+A compilation fix.
66
67
* ef/maint-rebase-error-message (2012-05-30) 1 commit
68
(merged to 'next' on 2012-05-30 at 5194fe3)
69
+ rebase: report invalid commit correctly
70
201
-Will merge to master by 1.7.11 final.
71
+When "git rebase" was given a bad commit to replay the history on,
72
+its error message did not correctly give the command line argument
73
+it had trouble parsing.
74
203
-* jk/clone-local (2012-05-30) 2 commits
204
- - clone: allow --no-local to turn off local optimizations
205
- - docs/clone: mention that --local may be ignored
75
+* jl/submodule-report-new-path-once (2012-05-29) 1 commit
76
+ (merged to 'next' on 2012-05-30 at e482dd9)
77
+ + submodules: print "registered for path" message only once
78
207
-* jk/no-more-asciidoc7 (2012-05-30) 2 commits
208
- - docs: drop antique comment from Makefile
209
- - docs: drop asciidoc7compatible flag
79
+"git submodule init" said "registered for path" even for a submodule
80
+that was already registered.
81
211
-* jk/no-op-push-message (2012-05-30) 1 commit
212
- - improve no-op push output
82
+* mm/levenstein-penalize-deletion-less (2012-05-29) 1 commit
83
+ (merged to 'next' on 2012-05-30 at b2a0346)
84
+ + Reduce cost of deletion in levenstein distance (4 -> 3)
85
214
-* ef/http-o-depends-on-gvf (2012-05-31) 1 commit
215
- (merged to 'next' on 2012-05-31 at 11af7cd)
216
- + Makefile: add missing GIT-VERSION-FILE dependency
86
+"git tags" errored out, suggesting "git stage" while "git tag" is
87
+a far more appropriate choice.
88
+
89
+* nh/empty-rebase (2012-05-29) 1 commit
90
+ (merged to 'next' on 2012-05-30 at 270703a)
91
+ + cherry-pick: regression fix for empty commits
92
218
-Will merge to master by 1.7.11 final.
93
+Fix for a new topic that happened in the 1.7.11 track.
94
+
95
+* vr/rebase-autosquash-does-not-imply-i (2012-05-29) 1 commit
96
+ (merged to 'next' on 2012-05-30 at 10dd3af)
97
+ + Do not autosquash in case of an implied interactive rebase
98
+
99
+"git rebase -p" should not pay attention to rebase.autosquash nor
100
+"git rebase -p --autosquash".
101
102
--------------------------------------------------
103
[Stalled]
@@ -228,6 +110,27 @@ I queued only the later two patches from this series, even though they do
110
not make much sense without the first one that seems to need a bit more
111
work, so that we won't forget.
112
113
+* jk/no-op-push-message (2012-05-30) 1 commit
114
+ - improve no-op push output
115
+
116
+Rewords the status message of "git push" that pushed only one ref
117
+differently from "Everything up-to-date", to give a bit more help to
118
+people who get the message when their current branch is not pushed.
119
+
120
+It probably is a better idea to add a message that says that the
121
+current was not pushed to address the problem in a more direct way.
122
+
123
+* fc/git-prompt-script (2012-05-22) 5 commits
124
+ - completion: split __git_ps1 into a separate script
125
+ - completion: remove executable mode
126
+ - Merge branch 'fc/git-complete-helper' into fc/git-prompt-script
127
+ - tests: add tests for the bash prompt functions in the completion script
128
+ - tests: move code to run tests under bash into a helper library
129
+ (this branch is tangled with sg/bash-prompt.)
130
+
131
+The last remaining sticking point is what to do with the duplicated shell
132
+function.
133
+
134
* sg/bash-prompt (2012-05-09) 4 commits
135
- completion: respect $GIT_DIR
136
- completion: use __gitdir() in _git_log()
@@ -310,19 +213,35 @@ not working :-(.
213
--------------------------------------------------
214
[Cooking]
215
313
-* fc/git-prompt-script (2012-05-22) 5 commits
314
- - completion: split __git_ps1 into a separate script
315
- - completion: remove executable mode
316
- - Merge branch 'fc/git-complete-helper' into fc/git-prompt-script
317
- - tests: add tests for the bash prompt functions in the completion script
318
- - tests: move code to run tests under bash into a helper library
319
- (this branch is tangled with sg/bash-prompt.)
216
+* nd/exclude-workaround-top-heavy (2012-05-29) 2 commits
217
+ - exclude: do strcmp as much as possible before fnmatch
218
+ - Unindent excluded_from_list()
219
321
-The last remaining sticking point is what to do with the duplicated shell
322
-function.
220
+Attempts to optimize matching with an exclude pattern with a deep
221
+directory hierarchy by taking the part that specifies leading path
222
+without wildcard literally.
223
+
224
+The code to check for wildcard needs to be redone.
225
+
226
+* nd/stream-pack-objects (2012-05-29) 1 commit
227
+ - pack-objects: use streaming interface for reading large loose blobs
228
+
229
+* jk/clone-local (2012-05-30) 2 commits
230
+ - clone: allow --no-local to turn off local optimizations
231
+ - docs/clone: mention that --local may be ignored
232
+
233
+"git clone --local $path" started its life as an experiment to
234
+optionally use link/copy when cloning a repository on the disk, but
235
+we didn't deprecate it after we made the option a no-op to always
236
+use the optimization.
237
+
238
+* jk/no-more-asciidoc7 (2012-05-30) 2 commits
239
+ - docs: drop antique comment from Makefile
240
+ - docs: drop asciidoc7compatible flag
241
242
* cr/persistent-https (2012-05-30) 1 commit
325
- - Add persistent-https to contrib
243
+ (merged to 'next' on 2012-06-01 at c647464)
244
+ + Add persistent-https to contrib
245
246
A remote helper that acts as a proxy that caches ssl session for the
247
https:// transport is added to the contrib/ area.
@@ -336,12 +255,11 @@ https:// transport is added to the contrib/ area.
255
Use streaming API to read from the object store to avoid having to hold
256
a large blob object in-core while running index-pack.
257
339
-* js/submodule-relative (2012-05-29) 3 commits
340
- - t7403-*.sh: Avoid use of the nonportable '==' operator
341
- - submodule: fix handling of relative superproject origin URLs
342
- - submodule: document handling of relative superproject origin URLs
343
-
344
-Reroll went to v7 but hasn't settled yet.
258
+* js/submodule-relative (2012-06-03) 4 commits
259
+ - submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo/bar
260
+ - submodule: fix sync handling of some relative superproject origin URLs
261
+ - submodule: document failure to handle relative superproject origin URLs
262
+ - submodule: additional regression tests for relative URLs
263
264
* mm/push-default-switch-warning (2012-04-26) 2 commits
265
- t5541: warning message is given even with --quiet
@@ -359,10 +277,3 @@ Will squash the two, but this has to wait for a few release cycles.
277
+ git-daemon wrapper to wait until daemon is ready
278
279
Reverted from 'next' to replace it with js/daemon-test-race-fix.
362
-
363
-* jc/revert-nh-empty-rebase (2012-05-23) 1 commit
364
- . Revert nh/empty-rebase topic
365
-
366
-The earlier series was found to regress the more important "cherry-pick";
367
-I'd prefer to see it fixed, but in case if it does not happen soon, this
368
-is a fallback measure that can be merged before 1.7.11 final.