What's cooking (2012/04 #08)
Junio C Hamano committed
Apr 20, 2012 at 16:59 UTC
25f444da4b0fd629aa4166485417d925672805ab
1 file changed
+235
-316
whats-cooking.txt
+235
-316
@@ -1,192 +1,112 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2012, #07; Wed, 18)
3
-X-master-at: 0bb2ee1b7d30bbab593453a4d4a6013b8b0ffc5d
4
-X-next-at: 21208e94ab61472bb7b9aa83bac2afff6f3009c7
2
+Subject: What's cooking in git.git (Apr 2012, #08; Fri, 20)
3
+X-master-at: d1ca788fcd34962a65924843ef1d0c773d565030
4
+X-next-at: 4eb253494767b9ede34703bfb1ceadefbc7924ed
5
6
-What's cooking in git.git (Apr 2012, #07; Wed, 18)
6
+What's cooking in git.git (Apr 2012, #08; Fri, 20)
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 in this cycle is now in 'master'.
12
+The third batch of topics in this cycle is now in 'master'.
13
14
You can find the changes described here in the integration branches of the
15
repositories listed at
16
17
http://git-blame.blogspot.com/p/git-public-repositories.html
18
19
---------------------------------------------------
20
-[New Topics]
21
-
22
-* js/spawn-via-shell-path-fix (2012-04-17) 1 commit
23
- - Do not use SHELL_PATH from build system in prepare_shell_cmd on Windows
24
-
25
-Mops up an unfortunate fallout from bw/spawn-via-shell-path topic.
26
-Will fast-track to 'master'.
27
-
28
-* jm/maint-strncpy-diff-no-index (2012-04-16) 1 commit
29
- - diff: avoid stack-buffer-read-overrun for very long name
30
-
31
-Will merge to 'next'.
32
-
33
-* lp/diffstat-with-graph (2012-04-18) 6 commits
34
- - Prevent graph_width of stat width from falling below min
35
- - t4052: Test diff-stat output with minimum columns
36
- - t4052: Adjust --graph --stat output for prefixes
37
- - Adjust stat width calculations to take --graph output into account
38
- - Add output_prefix_length to diff_options
39
- - t4052: test --stat output with --graph
40
-
41
-Looked reasonable.
42
-Will merge to 'next'.
43
-
44
-* jc/merge-reduce-parents-early (2012-04-17) 4 commits
45
- - builtin/merge.c: reduce parents early
46
- - builtin/merge.c: collect other parents early
47
- - builtin/merge.c: remove "remoteheads" global variable
48
- - merge tests: octopus with redundant parents
49
- (this branch is tangled with lt/octopus-simplify.)
50
-
51
-This deals with the same issue as lt/octopus-simplify, but in a bit more
52
-systematic way.
53
-
54
-* rj/mingw-isguid (2012-04-18) 1 commit
55
- - compat/mingw.h: Set S_ISUID to prevent a fast-import test failure
56
-
57
-* rj/sh-setup-mswin-pwd (2012-04-18) 1 commit
58
- - git-sh-setup.sh: Add an pwd() function for MinGW
59
-
60
-* rj/submodule-mswin-path (2012-04-18) 1 commit
61
- - git-submodule.sh: Don't use $path variable in eval_gettext string
62
-
19
--------------------------------------------------
20
[Graduated to "master"]
21
66
-* bw/spawn-via-shell-path (2012-04-03) 1 commit
67
- (merged to 'next' on 2012-04-12 at 0ff833b)
68
- + Use SHELL_PATH from build system in run_command.c:prepare_shell_cmd
69
-
70
-"sh" on the user's PATH may be utterly broken on some systems;
71
-consistently use SHELL_PATH even from inside run-command API.
72
-
73
-* jc/commit-unedited-template (2012-04-03) 5 commits
74
- (merged to 'next' on 2012-04-12 at a2e153b)
75
- + Documentation/git-commit: rephrase the "initial-ness" of templates
76
- + git-commit.txt: clarify -t requires editing message
77
- + commit: rephrase the error when user did not touch templated log message
78
- + commit: do not trigger bogus "has templated message edited" check
79
- + t7501: test the right kind of breakage
80
-
81
-When "git commit --template F" errors out because the user did not touch
82
-the message, it claimed that it aborts due to "empty message", which was
83
-utterly wrong.
84
-
85
-* jc/maint-clean-nested-worktree-in-subdir (2012-03-15) 1 commit
86
- (merged to 'next' on 2012-04-12 at 280a6e5)
87
- + clean: preserve nested git worktree in subdirectories
22
+* bw/submodule-sed-solaris (2012-04-09) 1 commit
23
+ (merged to 'next' on 2012-04-12 at 3bf1d83)
24
+ + Avoid bug in Solaris xpg4/sed as used in submodule
25
89
-Originally merged to 'next' on 2012-03-20
26
+* ct/advise-push-default (2012-04-12) 3 commits
27
+ (merged to 'next' on 2012-04-12 at b0613cd)
28
+ + Fix httpd tests that broke when non-ff push advice changed
29
+ + clean up struct ref's nonfastforward field
30
+ + push: Provide situational hints for non-fast-forward errors
31
+ (this branch is used by mm/push-default-switch-warning.)
32
91
-"git clean -d -f" (not "-d -f -f") is supposed to protect nested working
92
-trees of independent git repositories that exist in the current project
93
-working tree from getting removed, but the protection applied only to such
94
-working trees that are at the top-level of the current project by mistake.
33
+Breaks down the cases in which "git push" fails due to non-ff into three
34
+categories, and gives separate advise messages. This should be a good
35
+change regardless of mm/push-default-switch-warning topic.
36
96
-* jk/add-p-skip-conflicts (2012-04-05) 1 commit
97
- (merged to 'next' on 2012-04-12 at e65ceb1)
98
- + add--interactive: ignore unmerged entries in patch mode
37
+* jb/am-include (2012-03-28) 1 commit
38
+ (merged to 'next' on 2012-04-12 at ddbf96d)
39
+ + am: support --include option
40
100
-Excludes conflicted paths from "add -p" processing, as it is not prepared
101
-to handle them.
41
+"git am" learned the "--include" option, which is an opposite of existing
42
+the "--exclude" option.
43
103
-* jk/branch-quiet (2012-03-26) 2 commits
104
- (merged to 'next' on 2012-04-12 at 7d0a438)
105
- + teach "git branch" a --quiet option
106
- + checkout: suppress tracking message with "-q"
44
+* jc/am-report-3way (2012-03-28) 1 commit
45
+ (merged to 'next' on 2012-04-12 at cf5d599)
46
+ + am -3: list the paths that needed 3-way fallback
47
108
-Even with "-q"uiet option, "checkout" used to report setting up tracking.
109
-Also "branch" learns "-q"uiet option to squelch informational message.
48
+When "git am -3" needs to fall back to an application to a synthesized
49
+preimage followed by a 3-way merge, the paths that needed such treatment
50
+are now reported to the end user, so that the result in them can be
51
+eyeballed with extra care.
52
111
-* jk/diff-no-rename-empty (2012-03-23) 4 commits
112
- (merged to 'next' on 2012-04-12 at d1d95c5)
113
- + merge-recursive: don't detect renames of empty files
114
- + teach diffcore-rename to optionally ignore empty content
115
- + make is_empty_blob_sha1 available everywhere
116
- + drop casts from users EMPTY_TREE_SHA1_BIN
53
+* jc/fmt-merge-msg-people (2012-03-13) 1 commit
54
+ (merged to 'next' on 2012-04-12 at 4c2031c)
55
+ + fmt-merge-msg: show those involved in a merged series
56
118
-Forbids rename detection logic from matching two empty files as renames
119
-during merge-recursive to prevent mismerges.
57
+The "fmt-merge-msg" command learns to list the primary contributors
58
+involved in the side topic you are merging.
59
121
-* jk/http-backend-keep-committer-ident-env (2012-03-30) 1 commit
122
- (merged to 'next' on 2012-04-12 at b2d0136)
123
- + http-backend: respect existing GIT_COMMITTER_* variables
60
+* jc/push-upstream-sanity (2012-04-05) 1 commit
61
+ (merged to 'next' on 2012-04-12 at 288e1ad)
62
+ + push: error out when the "upstream" semantics does not make sense
63
+ (this branch is used by mm/push-default-switch-warning.)
64
125
-The smart-http backend used to always override GIT_COMMITTER_* variables
126
-with REMOTE_USER and REMOTE_ADDR.
65
+Fix broken 'push to upstream' implementation. "git push $there" without
66
+refspec, when the current branch is set to push to a remote different from
67
+$there, used to push to $there using the upstream information to a remote
68
+unreleated to $there.
69
128
-* nl/rebase-i-cheat-sheet (2012-03-20) 1 commit
129
- (merged to 'next' on 2012-04-12 at cd76fcb)
130
- + rebase -i: remind that the lines are top-to-bottom
70
+* jk/run-command-eacces (2012-04-05) 2 commits
71
+ (merged to 'next' on 2012-04-12 at ef3782e)
72
+ + run-command: treat inaccessible directories as ENOENT
73
+ + compat/mingw.[ch]: Change return type of exec functions to int
74
132
-Originally merged to 'next' on 2012-03-20
75
+When PATH contains an unreadable directory, alias expansion code did not
76
+kick in, and failed with an error that said "git-subcmd" was not found.
77
134
-* rs/combine-diff-zero-context-at-the-beginning (2012-03-25) 1 commit
135
- (merged to 'next' on 2012-04-12 at b4d92e3)
136
- + combine-diff: fix loop index underflow
78
+* js/spawn-via-shell-path-fix (2012-04-17) 1 commit
79
+ (merged to 'next' on 2012-04-19 at 3e04ef6)
80
+ + Do not use SHELL_PATH from build system in prepare_shell_cmd on Windows
81
138
-Fixes an age old corner case bug in combine diff (only triggered with -U0
139
-and the hunk at the beginning of the file needs to be shown).
82
+Mops up an unfortunate fallout from bw/spawn-via-shell-path topic.
83
141
-* rs/unpack-trees-leakfix (2012-04-10) 2 commits
142
- (merged to 'next' on 2012-04-12 at 6958b54)
143
- + unpack-trees: plug minor memory leak
144
- + unpack-trees: don't perform any index operation if we're not merging
84
+--------------------------------------------------
85
+[New Topics]
86
146
-Originally merged to 'next' on 2012-03-07
87
+* bw/test-fix-grep-gnuism (2012-04-19) 1 commit
88
+ (merged to 'next' on 2012-04-20 at ee7eec4)
89
+ + t9400: fix gnuism in grep
90
148
-* sl/autoconf (2012-03-26) 3 commits
149
- (merged to 'next' on 2012-04-12 at 68f346d)
150
- + configure: be more idiomatic
151
- + configure: avoid some code repetitions thanks to m4_{push,pop}def
152
- + configure: move definitions of private m4 macros before AC_INIT invocation
91
+Fix two places that were the only place in the test suite that gave "a\+"
92
+to platform grep and expected it to mean one or more "a", which is a
93
+blatant GNUism.
94
154
-Updates our configure.ac to follow a better "autoconf" style.
95
+* rt/cherry-revert-conflict-summary (2012-04-19) 1 commit
96
+ - sequencer: remove additional blank line
97
156
-* wk/gitweb-snapshot-use-if-modified-since (2012-03-30) 3 commits
157
- (merged to 'next' on 2012-04-12 at 611d318)
158
- + gitweb: add If-Modified-Since handling to git_snapshot().
159
- + gitweb: refactor If-Modified-Since handling
160
- + gitweb: add `status` headers to git_feed() responses.
98
+In the older days, the header "Conflicts:" in "cherry-pick" and
99
+"merge" was separated by a blank line from the list of paths that
100
+follow for readability, but when "merge" was rewritten in C, we lost
101
+it by mistake. Remove the newline from "cherry-pick" to make them
102
+match again.
103
162
-Makes 'snapshot' request to "gitweb" honor If-Modified-Since: header,
163
-based on the commit date.
104
+* js/fast-import-test-9300 (2012-04-20) 1 commit
105
+ - t9300-fast-import: avoid 'exit' in test_expect_success snippets
106
107
--------------------------------------------------
108
[Stalled]
109
168
-* cn/apply-fix-ws-can-lengthen-lines (2012-03-11) 1 commit
169
- . apply: reallocate the postimage buffer when needed
170
-
171
-Attempts to address an ancient bug that dates back to the addition
172
-of an oddball "tab-in-indent" whitespace breakage class that wants
173
-to have longer lines than the original when fixing things up; broken
174
-and results in double-frees.
175
-
176
-Will discard shortly if nothing happens.
177
-
178
-* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits
179
- - fixup! 15eaaf4
180
- - git-svn, perl/Git.pm: extend Git::prompt helper for querying users
181
- - perl/Git.pm: "prompt" helper to honor GIT_ASKPASS and SSH_ASKPASS
182
-
183
-The bottom one has been replaced with a rewrite based on comments
184
-from Ævar. The second one needs more work, both in perl/Git.pm and
185
-prompt.c, to give precedence to tty over SSH_ASKPASS when terminal
186
-is available.
187
-
188
-Will discard shortly if nothing happens.
189
-
110
* jc/split-blob (2012-04-03) 7 commits
111
- chunked-object: streaming checkout
112
- chunked-object: fallback checkout codepaths
@@ -194,7 +114,7 @@ Will discard shortly if nothing happens.
114
- bulk-checkin: allow the same data to be multiply hashed
115
- new representation types in the packstream
116
- packfile: use varint functions
197
- - varint: make it available outside the context of pack
117
+ + varint: make it available outside the context of pack
118
(this branch is tangled with jc/index-v4.)
119
120
Not ready.
@@ -222,13 +142,51 @@ not working :-(.
142
--------------------------------------------------
143
[Cooking]
144
225
-* lp/maint-diff-three-dash-with-graph (2012-03-20) 3 commits
226
- - t4202: add test for "log --graph --stat -p" separator lines
227
- - log --graph: fix break in graph lines
228
- - log --graph --stat: three-dash separator should come after graph lines
145
+* jm/maint-strncpy-diff-no-index (2012-04-16) 1 commit
146
+ (merged to 'next' on 2012-04-20 at 638ed9f)
147
+ + diff: avoid stack-buffer-read-overrun for very long name
148
+
149
+* lp/diffstat-with-graph (2012-04-18) 6 commits
150
+ - Prevent graph_width of stat width from falling below min
151
+ - t4052: Test diff-stat output with minimum columns
152
+ - t4052: Adjust --graph --stat output for prefixes
153
+ - Adjust stat width calculations to take --graph output into account
154
+ - Add output_prefix_length to diff_options
155
+ - t4052: test --stat output with --graph
156
157
+Looked reasonable.
158
Will merge to 'next'.
159
160
+* jc/merge-reduce-parents-early (2012-04-18) 5 commits
161
+ - fmt-merge-msg: discard needless merge parents
162
+ - builtin/merge.c: reduce parents early
163
+ - builtin/merge.c: collect other parents early
164
+ - builtin/merge.c: remove "remoteheads" global variable
165
+ - merge tests: octopus with redundant parents
166
+ (this branch is tangled with lt/octopus-simplify.)
167
+
168
+I based this and Linus's on top of the same test script, but it
169
+turns out that this is more correct way to deal with the issue, so
170
+I'll drop the other one.
171
+
172
+* rj/mingw-isguid (2012-04-18) 1 commit
173
+ (merged to 'next' on 2012-04-20 at 9dbebca)
174
+ + compat/mingw.h: Set S_ISUID to prevent a fast-import test failure
175
+
176
+* rj/sh-setup-mswin-pwd (2012-04-18) 1 commit
177
+ (merged to 'next' on 2012-04-20 at 6125f8d)
178
+ + git-sh-setup.sh: Add an pwd() function for MinGW
179
+
180
+* rj/submodule-mswin-path (2012-04-18) 1 commit
181
+ (merged to 'next' on 2012-04-20 at fd9f8b3)
182
+ + git-submodule.sh: Don't use $path variable in eval_gettext string
183
+
184
+* lp/maint-diff-three-dash-with-graph (2012-03-20) 3 commits
185
+ (merged to 'next' on 2012-04-20 at b6cf0ff)
186
+ + t4202: add test for "log --graph --stat -p" separator lines
187
+ + log --graph: fix break in graph lines
188
+ + log --graph --stat: three-dash separator should come after graph lines
189
+
190
* cb/cherry-pick-rev-path-confusion (2012-04-15) 1 commit
191
- cherry-pick: do not expect file arguments
192
@@ -240,12 +198,14 @@ The issue the patch addresses is real, but the way it is implemented felt
198
unnecessarily invasive a bit. It may be cleaner for this caller to add
199
the "--" to the end of the argv_array it passes to setup_revisions().
200
243
-* cb/daemon-test-race-fix (2012-04-15) 1 commit
201
+* cb/daemon-test-race-fix (2012-04-19) 1 commit
202
- git-daemon wrapper to wait until daemon is ready
203
204
Fix race condition between starting and waiting for git-daemon in the
205
test.
206
207
+Re-queued with a fix.
208
+
209
* cb/maint-report-mount-point-correctly-in-setup (2012-04-15) 1 commit
210
- properly keep track of current working directory
211
@@ -255,21 +215,18 @@ discovery stopped at a mount point.
215
Will merge to 'next'.
216
217
* jl/maint-submodule-recurse-fetch (2012-04-14) 1 commit
258
- - submodules: recursive fetch also checks new tags for submodule commits
259
-
260
-Will merge to 'next'.
218
+ (merged to 'next' on 2012-04-20 at 2769d39)
219
+ + submodules: recursive fetch also checks new tags for submodule commits
220
221
* jn/fast-import-doc (2012-04-15) 1 commit
263
- - fast-import doc: cat-blob and ls responses need to be consumed quickly
264
-
265
-Will merge to 'next'.
222
+ (merged to 'next' on 2012-04-20 at b9a7250)
223
+ + fast-import doc: cat-blob and ls responses need to be consumed quickly
224
225
* jn/more-i18ncmp (2012-04-14) 3 commits
268
- - test: am of empty patch should not succeed
269
- - test: use test_i18ncmp for "Patch format detection failed" message
270
- - test: do not rely on US English tracking-info messages
271
-
272
-Will merge to 'next'.
226
+ (merged to 'next' on 2012-04-20 at b5548a3)
227
+ + test: am of empty patch should not succeed
228
+ + test: use test_i18ncmp for "Patch format detection failed" message
229
+ + test: do not rely on US English tracking-info messages
230
231
* rl/maint-stash-i18n-save-error (2012-04-14) 1 commit
232
- stash: use eval_gettextln correctly
@@ -289,7 +246,8 @@ Will merge to 'next'.
246
247
Will merge to 'next'.
248
292
-* nl/http-proxy-more (2012-04-14) 6 commits
249
+* nl/http-proxy-more (2012-04-19) 7 commits
250
+ - http: fix proxy password passing
251
- http: fix proxy authentication
252
- http: rename HTTP_REAUTH to HTTP_AUTH_RETRY
253
- http: Avoid limit of retrying request only twice
@@ -302,42 +260,40 @@ API used to talk to the final http destinations. This still needs
260
to peek into $ENV{HTTPS_PROXY}.
261
262
* mb/fetch-call-a-non-branch-a-ref (2012-04-17) 2 commits
305
- - fetch: describe new refs based on where it came from
306
- - fetch: Give remote_ref to update_local_ref() as well
307
-
308
-Replacement to use the origin side to paint the message broke badly.
263
+ (merged to 'next' on 2012-04-20 at df2c57e)
264
+ + fetch: describe new refs based on where it came from
265
+ + fetch: Give remote_ref to update_local_ref() as well
266
267
* mh/ref-api (2012-04-10) 13 commits
311
- - do_for_each_ref(): only iterate over the subtree that was requested
312
- - refs: store references hierarchically
313
- - sort_ref_dir(): simplify logic
314
- - refs.c: rename ref_array -> ref_dir
315
- - struct ref_entry: nest the value part in a union
316
- - check_refname_component(): return 0 for zero-length components
317
- - free_ref_entry(): new function
318
- - names_conflict(): simplify implementation
319
- - repack_without_ref(): reimplement using do_for_each_ref_in_array()
320
- - do_for_each_ref_in_arrays(): new function
321
- - do_for_each_ref_in_array(): new function
322
- - refs: manage current_ref within do_one_ref()
323
- - refs.c: reorder definitions more logically
268
+ (merged to 'next' on 2012-04-20 at 94e9384)
269
+ + do_for_each_ref(): only iterate over the subtree that was requested
270
+ + refs: store references hierarchically
271
+ + sort_ref_dir(): simplify logic
272
+ + refs.c: rename ref_array -> ref_dir
273
+ + struct ref_entry: nest the value part in a union
274
+ + check_refname_component(): return 0 for zero-length components
275
+ + free_ref_entry(): new function
276
+ + names_conflict(): simplify implementation
277
+ + repack_without_ref(): reimplement using do_for_each_ref_in_array()
278
+ + do_for_each_ref_in_arrays(): new function
279
+ + do_for_each_ref_in_array(): new function
280
+ + refs: manage current_ref within do_one_ref()
281
+ + refs.c: reorder definitions more logically
282
283
Allows walking only a sub-hierarchy in refs/*.
284
327
-Will merge to 'next'.
328
-
285
* jc/maint-blame-minimal (2012-04-11) 1 commit
330
- - blame: accept --need-minimal
286
+ (merged to 'next' on 2012-04-20 at 2213284)
287
+ + blame: accept --need-minimal
288
289
"git blame" started missing quite a few changes from the origin since we
290
stopped using the diff minimalization by default in v1.7.2 era.
291
335
-Will merge to 'next'.
336
-
292
* jk/repack-no-explode-objects-from-old-pack (2012-04-18) 4 commits
338
- - gc: use argv-array for sub-commands
339
- - argv-array: add a new "pushl" method
340
- - argv-array: refactor empty_argv initialization
293
+ (merged to 'next' on 2012-04-20 at 4eb2534)
294
+ + gc: use argv-array for sub-commands
295
+ + argv-array: add a new "pushl" method
296
+ + argv-array: refactor empty_argv initialization
297
(merged to 'next' on 2012-04-15 at 7586e50)
298
+ gc: do not explode objects which will be immediately pruned
299
@@ -350,33 +306,28 @@ Will merge to 'next'.
306
A review from Pete Wyckoff needs to be addressed.
307
Message-ID: <20120418113422.GB19994@padd.com>
308
353
-* lt/octopus-simplify (2012-04-17) 3 commits
354
- - git-merge: Reduce heads before trying to merge them
355
- - Make 'git merge' simplify parents earlier
356
- - merge tests: octopus with redundant parents
357
- (this branch is tangled with jc/merge-reduce-parents-early.)
358
-
359
-Octopus merge strategy did not reduce heads that are recorded in the final
360
-commit, but follow-up broke badly.
361
-
362
-* nh/empty-rebase (2012-04-18) 4 commits
309
+* nh/empty-rebase (2012-04-20) 7 commits
310
+ - fixup! git-rebase: add keep_empty flag
311
- git-rebase: add keep_empty flag
364
- - git-cherry-pick: add test to validate new options
365
- - git-cherry-pick: add "--keep-redundant-commits" option
312
+ - fixup! git-cherry-pick: Add test to validate new options
313
+ - git-cherry-pick: Add test to validate new options
314
+ - fixup! git-cherry-pick: Add keep-redundant-commits option
315
+ - git-cherry-pick: Add keep-redundant-commits option
316
- git-cherry-pick: add allow-empty option
317
318
* sl/test-wc-l-line-count (2012-04-11) 1 commit
319
(merged to 'next' on 2012-04-15 at 40797d9)
320
+ tests: modernise style: more uses of test_line_count
321
372
-* zj/upstream-error-message (2012-04-15) 5 commits
373
- - i18n: mark @{upstream} error messages for translation
374
- - Be more specific if upstream branch is not tracked
375
- - Provide better message for barnhc_wiht_tpyo@{u}
376
- - Provide branch name in error message when using @{u}
377
- - t1507: add tests to document @{upstream} behaviour
322
+Will merge to 'master'.
323
379
-Will merge to 'next'.
324
+* zj/upstream-error-message (2012-04-15) 5 commits
325
+ (merged to 'next' on 2012-04-20 at 1ed9682)
326
+ + i18n: mark @{upstream} error messages for translation
327
+ + Be more specific if upstream branch is not tracked
328
+ + Provide better message for barnhc_wiht_tpyo@{u}
329
+ + Provide branch name in error message when using @{u}
330
+ + t1507: add tests to document @{upstream} behaviour
331
332
* fc/completion-tests (2012-04-18) 7 commits
333
- tests: add tests for the __gitcomp() completion helper function
@@ -403,19 +354,12 @@ Will merge to 'next'.
354
355
Valgrind reports quite a lot of discarded memory inside apply.
356
406
-* nd/threaded-index-pack (2012-04-11) 3 commits
357
+* nd/threaded-index-pack (2012-04-19) 4 commits
358
+ - index-pack: disable threading if NO_PREAD is defined
359
- index-pack: support multithreaded delta resolving
360
- index-pack: split second pass obj handling into own function
361
- compat/win32/pthread.h: Add an pthread_key_delete() implementation
362
411
-J6t reports breakage on msysgit.
412
-
413
-* bw/submodule-sed-solaris (2012-04-09) 1 commit
414
- (merged to 'next' on 2012-04-12 at 3bf1d83)
415
- + Avoid bug in Solaris xpg4/sed as used in submodule
416
-
417
-Will merge to 'master'.
418
-
363
* cb/http-multi-curl-auth (2012-04-14) 4 commits
364
- http: use newer curl options for setting credentials
365
- http: clean up leak in init_curl_http_auth
@@ -434,6 +378,8 @@ Will merge to 'next'.
378
Giving "--continue" to a conflicted "rebase -i" session skipped a commit
379
that only results in changes to submodules.
380
381
+Will merge to 'master'.
382
+
383
* ms/remote-usage-string (2012-04-09) 1 commit
384
(merged to 'next' on 2012-04-15 at 704be8f)
385
+ remote: update builtin usage
@@ -441,10 +387,11 @@ that only results in changes to submodules.
387
As an independent follow-up, we may want to rethink how the overall usage
388
string and subcommand usage strings are maintained.
389
444
-* pw/fast-import-dataref-parsing (2012-04-10) 1 commit
445
- - fast-import: tighten parsing of datarefs
390
+Will merge to 'master'.
391
447
-Will merge to 'next'.
392
+* pw/fast-import-dataref-parsing (2012-04-10) 1 commit
393
+ (merged to 'next' on 2012-04-20 at c299a63)
394
+ + fast-import: tighten parsing of datarefs
395
396
* pw/git-p4 (2012-04-09) 3 commits
397
(merged to 'next' on 2012-04-15 at 81ea41a)
@@ -453,26 +400,31 @@ Will merge to 'next'.
400
+ git-p4: move to toplevel
401
(this branch is used by ld/git-p4-tags-and-labels.)
402
403
+Will merge to 'master'.
404
+
405
* rl/show-empty-prefix (2012-04-10) 1 commit
406
(merged to 'next' on 2012-04-15 at b2e5938)
407
+ rev-parse --show-prefix: add in trailing newline
408
409
+Will merge to 'master'.
410
+
411
* tr/xdiff-fast-hash (2012-04-09) 1 commit
412
- xdiff: load full words in the inner loop of xdl_hash_record
413
414
Will merge to 'next'.
415
416
* jc/index-v4 (2012-04-04) 10 commits
466
- - update-index: upgrade/downgrade on-disk index version
467
- - read-cache.c: write prefix-compressed names in the index
468
- - read-cache.c: read prefix-compressed names in index on-disk version v4
469
- - read-cache.c: move code to copy incore to ondisk cache to a helper function
470
- - read-cache.c: move code to copy ondisk to incore cache to a helper function
471
- - read-cache.c: report the header version we do not understand
472
- - read-cache.c: make create_from_disk() report number of bytes it consumed
473
- - read-cache.c: allow unaligned mapping of the index file
474
- - cache.h: hide on-disk index details
475
- - varint: make it available outside the context of pack
417
+ (merged to 'next' on 2012-04-19 at 5e4b029)
418
+ + update-index: upgrade/downgrade on-disk index version
419
+ + read-cache.c: write prefix-compressed names in the index
420
+ + read-cache.c: read prefix-compressed names in index on-disk version v4
421
+ + read-cache.c: move code to copy incore to ondisk cache to a helper function
422
+ + read-cache.c: move code to copy ondisk to incore cache to a helper function
423
+ + read-cache.c: report the header version we do not understand
424
+ + read-cache.c: make create_from_disk() report number of bytes it consumed
425
+ + read-cache.c: allow unaligned mapping of the index file
426
+ + cache.h: hide on-disk index details
427
+ + varint: make it available outside the context of pack
428
(this branch is tangled with jc/split-blob.)
429
430
Trivially shrinks the on-disk size of the index file to save both I/O and
@@ -481,44 +433,34 @@ eventually want to have, but the preparatory refactoring steps and the way
433
how backward compatibility is retained should give plenty to learn to GSoC
434
student-hopefuls.
435
484
-Will merge to 'next', if nobody objects.
485
-
486
-* jc/push-upstream-sanity (2012-04-05) 1 commit
487
- (merged to 'next' on 2012-04-12 at 288e1ad)
488
- + push: error out when the "upstream" semantics does not make sense
489
-
490
-Fix broken 'push to upstream' implementation. "git push $there" without
491
-refspec, when the current branch is set to push to a remote different from
492
-$there, used to push to $there using the upstream information to a remote
493
-unreleated to $there.
494
-
495
-Will merge to 'master'.
436
+The bottom one makes use of "varint" encoding from the stalled
437
+jc/split-blob topic.
438
439
* mk/gitweb-diff-hl (2012-04-11) 8 commits
498
- - gitweb: Refinement highlightning in combined diffs
499
- - gitweb: Highlight interesting parts of diff
500
- - gitweb: Push formatting diff lines to print_diff_chunk()
501
- - gitweb: Use print_diff_chunk() for both side-by-side and inline diffs
502
- - gitweb: Extract print_sidebyside_diff_lines()
503
- - gitweb: Pass esc_html_hl_regions() options to esc_html()
504
- - gitweb: esc_html_hl_regions(): Don't create empty <span> elements
505
- - gitweb: Use descriptive names in esc_html_hl_regions()
506
-
507
-Will merge to 'next'.
440
+ (merged to 'next' on 2012-04-20 at 54179a2)
441
+ + gitweb: Refinement highlightning in combined diffs
442
+ + gitweb: Highlight interesting parts of diff
443
+ + gitweb: Push formatting diff lines to print_diff_chunk()
444
+ + gitweb: Use print_diff_chunk() for both side-by-side and inline diffs
445
+ + gitweb: Extract print_sidebyside_diff_lines()
446
+ + gitweb: Pass esc_html_hl_regions() options to esc_html()
447
+ + gitweb: esc_html_hl_regions(): Don't create empty <span> elements
448
+ + gitweb: Use descriptive names in esc_html_hl_regions()
449
450
* it/fetch-pack-many-refs (2012-04-10) 4 commits
510
- - remote-curl: main test case for the OS command line overflow
511
- - fetch-pack: test cases for the new --stdin option
512
- - remote-curl: send the refs to fetch-pack on stdin
513
- - fetch-pack: new --stdin option to read refs from stdin
514
-
515
-Will merge to 'next'.
451
+ (merged to 'next' on 2012-04-20 at e2126d7)
452
+ + remote-curl: main test case for the OS command line overflow
453
+ + fetch-pack: test cases for the new --stdin option
454
+ + remote-curl: send the refs to fetch-pack on stdin
455
+ + fetch-pack: new --stdin option to read refs from stdin
456
457
* jn/debian-customizes-default-editor (2012-04-10) 2 commits
458
(merged to 'next' on 2012-04-15 at 0fc85c3)
459
+ var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings
460
+ var doc: default editor and pager are configurable at build time
461
462
+Will merge to 'master'.
463
+
464
* rs/commit-list-sort-in-batch (2012-04-17) 4 commits
465
(merged to 'next' on 2012-04-17 at 21208e9)
466
+ mergesort: rename it to llist_mergesort()
@@ -528,41 +470,10 @@ Will merge to 'next'.
470
+ add mergesort() for linked lists
471
472
* hv/submodule-recurse-push (2012-03-30) 3 commits
531
- - push: teach --recurse-submodules the on-demand option
532
- - Refactor submodule push check to use string list instead of integer
533
- - Teach revision walking machinery to walk multiple times sequencially
534
-
535
-Will merge to 'next'.
536
-
537
-* jk/run-command-eacces (2012-04-05) 2 commits
538
- (merged to 'next' on 2012-04-12 at ef3782e)
539
- + run-command: treat inaccessible directories as ENOENT
540
- + compat/mingw.[ch]: Change return type of exec functions to int
541
-
542
-When PATH contains an unreadable directory, alias expansion code did not
543
-kick in, and failed with an error that said "git-subcmd" was not found.
544
-
545
-Will merge to 'master'.
546
-
547
-* jb/am-include (2012-03-28) 1 commit
548
- (merged to 'next' on 2012-04-12 at ddbf96d)
549
- + am: support --include option
550
-
551
-"git am" learned the "--include" option, which is an opposite of existing
552
-the "--exclude" option.
553
-
554
-Will merge to 'master'.
555
-
556
-* jc/am-report-3way (2012-03-28) 1 commit
557
- (merged to 'next' on 2012-04-12 at cf5d599)
558
- + am -3: list the paths that needed 3-way fallback
559
-
560
-When "git am -3" needs to fall back to an application to a synthesized
561
-preimage followed by a 3-way merge, the paths that needed such treatment
562
-are now reported to the end user, so that the result in them can be
563
-eyeballed with extra care.
564
-
565
-Will merge to 'master'.
473
+ (merged to 'next' on 2012-04-20 at fe99e3d)
474
+ + push: teach --recurse-submodules the on-demand option
475
+ + Refactor submodule push check to use string list instead of integer
476
+ + Teach revision walking machinery to walk multiple times sequencially
477
478
* th/difftool-diffall (2012-04-14) 8 commits
479
- difftool: print list of valid tools with '--tool-help'
@@ -579,18 +490,6 @@ Rolls the two-directory-diff logic from diffall script (in contrib/) into
490
491
Still being reworked.
492
582
-* ct/advise-push-default (2012-04-12) 3 commits
583
- (merged to 'next' on 2012-04-12 at b0613cd)
584
- + Fix httpd tests that broke when non-ff push advice changed
585
- + clean up struct ref's nonfastforward field
586
- + push: Provide situational hints for non-fast-forward errors
587
-
588
-Breaks down the cases in which "git push" fails due to non-ff into three
589
-categories, and gives separate advise messages. This should be a good
590
-change regardless of mm/push-default-switch-warning topic.
591
-
592
-Will merge to 'master'.
593
-
493
* jc/run-hook-env-1 (2012-03-11) 1 commit
494
- run_hook(): enhance the interface to pass arbitrary environment
495
@@ -599,20 +498,40 @@ Not urgent.
498
Updates run_hook() API to be much less specific to "commit". It would
499
only be useful if people start doing more interesting things with hooks.
500
602
-* mm/push-default-switch-warning (2012-04-15) 2 commits
603
- - t5570: use explicit push refspec
501
+* mm/push-default-switch-warning (2012-04-20) 4 commits
502
- push: start warning upcoming default change for push.default
503
+ - t5570: use explicit push refspec
504
+ - push: introduce new push.default mode "simple"
505
+ - Documentation: explain push.default option a bit more
506
507
This resurrects an ancient patch I wrote during a discussion we had in the
508
1.6.3-1.6.4 era. This should probably come after ct/advise-push-default
509
topic and at that point the advise messages need to be rephrased, taking
510
the future default change into account.
511
611
-* jc/fmt-merge-msg-people (2012-03-13) 1 commit
612
- (merged to 'next' on 2012-04-12 at 4c2031c)
613
- + fmt-merge-msg: show those involved in a merged series
512
+--------------------------------------------------
513
+[Discarded]
514
615
-The "fmt-merge-msg" command learns to list the primary contributors
616
-involved in the side topic you are merging.
515
+* cn/apply-fix-ws-can-lengthen-lines (2012-03-11) 1 commit
516
+ . apply: reallocate the postimage buffer when needed
517
618
-Will merge to 'master'.
518
+Attempts to address an ancient bug that dates back to the addition
519
+of an oddball "tab-in-indent" whitespace breakage class that wants
520
+to have longer lines than the original when fixing things up; broken
521
+and results in double-frees.
522
+
523
+* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits
524
+ . fixup! 15eaaf4
525
+ . git-svn, perl/Git.pm: extend Git::prompt helper for querying users
526
+ . perl/Git.pm: "prompt" helper to honor GIT_ASKPASS and SSH_ASKPASS
527
+
528
+Has been stalled for too long.
529
+
530
+* lt/octopus-simplify (2012-04-17) 3 commits
531
+ . git-merge: Reduce heads before trying to merge them
532
+ . Make 'git merge' simplify parents earlier
533
+ - merge tests: octopus with redundant parents
534
+ (this branch is tangled with jc/merge-reduce-parents-early.)
535
+
536
+Octopus merge strategy did not reduce heads that are recorded in the final
537
+commit, but follow-up broke badly.