What's cooking (2012/04 #07)
Junio C Hamano committed
Apr 18, 2012 at 16:36 UTC
199448518c66eae5f523ddc746fffadb4a6eb049
1 file changed
+213
-238
whats-cooking.txt
+213
-238
@@ -1,18 +1,15 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2012, #06; Sun, 15)
3
-X-master-at: 146fe8ce2488fea8a8e35285d825bfbbe07b806d
4
-X-next-at: 8cccf57d9db48c1a2914739aeed661a9f33d74bc
2
+Subject: What's cooking in git.git (Apr 2012, #07; Wed, 18)
3
+X-master-at: 0bb2ee1b7d30bbab593453a4d4a6013b8b0ffc5d
4
+X-next-at: 21208e94ab61472bb7b9aa83bac2afff6f3009c7
5
6
-What's cooking in git.git (Apr 2012, #06; Sun, 15)
6
+What's cooking in git.git (Apr 2012, #07; Wed, 18)
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 first batch of topics in this cycle is now in 'master'. Tentatively,
13
-the Release Notes for the next release calls itself 1.7.11, but we may end
14
-up calling it 1.8.0 if we come up with a reasonable implementation of the
15
-"simple" mode of default push semantics.
12
+The second 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
@@ -20,165 +17,154 @@ repositories listed at
17
http://git-blame.blogspot.com/p/git-public-repositories.html
18
19
--------------------------------------------------
23
-[Graduated to "master"]
20
+[New Topics]
21
25
-* da/difftool-test (2012-03-19) 1 commit
26
- (merged to 'next' on 2012-04-11 at f245c01)
27
- + t7800: Test difftool passing arguments to diff
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
29
-Makes sure "difftool" options can be given in any order.
25
+Mops up an unfortunate fallout from bw/spawn-via-shell-path topic.
26
+Will fast-track to 'master'.
27
31
-* jc/commit-hook-authorship (2012-03-11) 3 commits
32
- (merged to 'next' on 2012-04-11 at 15ec4d4)
33
- + commit: pass author/committer info to hooks
34
- + t7503: does pre-commit-hook learn authorship?
35
- + ident.c: add split_ident_line() to parse formatted ident line
36
- (this branch is tangled with jc/run-hook-env-1.)
28
+* jm/maint-strncpy-diff-no-index (2012-04-16) 1 commit
29
+ - diff: avoid stack-buffer-read-overrun for very long name
30
38
-Originally merged to 'next' on 2012-03-12
31
+Will merge to 'next'.
32
40
-"git commit --author=$name" did not tell the name that was being
41
-recorded in the resulting commit to hooks, even though it does do so
42
-when the end user overrode the authorship via the "GIT_AUTHOR_NAME"
43
-environment variable.
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
45
-* jc/diff-algo-cleanup (2012-02-19) 2 commits
46
- (merged to 'next' on 2012-04-11 at f2c6b9a)
47
- + xdiff: PATIENCE/HISTOGRAM are not independent option bits
48
- + xdiff: remove XDL_PATCH_* macros
41
+Looked reasonable.
42
+Will merge to 'next'.
43
50
-Originally merged to 'next' on 2012-03-15
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
52
-Resurrects the preparatory clean-up patches from another topic that was
53
-discarded, as this would give a saner foundation to build on diff.algo
54
-configuration option series.
51
+This deals with the same issue as lt/octopus-simplify, but in a bit more
52
+systematic way.
53
56
-* jh/notes-merge-in-git-dir-worktree (2012-03-15) 4 commits
57
- (merged to 'next' on 2012-04-11 at 6042ef5)
58
- + notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd
59
- + notes-merge: use opendir/readdir instead of using read_directory()
60
- + t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/
61
- + remove_dir_recursively(): Add flag for skipping removal of toplevel dir
62
- (this branch is tangled with jc/maint-clean-nested-worktree-in-subdir.)
54
+* rj/mingw-isguid (2012-04-18) 1 commit
55
+ - compat/mingw.h: Set S_ISUID to prevent a fast-import test failure
56
64
-Originally merged to 'next' on 2012-03-20
57
+* rj/sh-setup-mswin-pwd (2012-04-18) 1 commit
58
+ - git-sh-setup.sh: Add an pwd() function for MinGW
59
66
-Running "notes merge --commit" failed to perform correctly when run
67
-from any directory inside $GIT_DIR/. When "notes merge" stops with
68
-conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits
69
-to resolve it.
70
-
71
-* jn/diffstat-tests (2012-03-13) 7 commits
72
- (merged to 'next' on 2012-04-11 at 7365e41)
73
- + diffstat summary line varies by locale: miscellany
74
- + test: use numstat instead of diffstat in binary-diff test
75
- + test: use --numstat instead of --stat in "git stash show" tests
76
- + test: test cherry-pick functionality and output separately
77
- + test: modernize funny-names test style
78
- + test: use numstat instead of diffstat in funny-names test
79
- + test: use test_i18ncmp when checking --stat output
60
+* rj/submodule-mswin-path (2012-04-18) 1 commit
61
+ - git-submodule.sh: Don't use $path variable in eval_gettext string
62
81
-Originally merged to 'next' on 2012-03-20
63
+--------------------------------------------------
64
+[Graduated to "master"]
65
83
-Some tests checked the "diff --stat" output when they do not have to,
84
-which unnecessarily made things harder to verify under GETTEXT_POISON.
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
86
-* nd/stream-more (2012-03-07) 7 commits
87
- (merged to 'next' on 2012-04-11 at b17684d)
88
- + update-server-info: respect core.bigfilethreshold
89
- + fsck: use streaming API for writing lost-found blobs
90
- + show: use streaming API for showing blobs
91
- + parse_object: avoid putting whole blob in core
92
- + cat-file: use streaming API to print blobs
93
- + Add more large blob test cases
94
- + streaming: make streaming-write-entry to be more reusable
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
96
-Originally merged to 'next' on 2012-03-07
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
98
-Use API to read blob data in smaller chunks in more places to
99
-reduce the memory footprint. In general, looked fairly good.
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
101
-* tr/maint-word-diff-regex-sticky (2012-03-14) 3 commits
102
- (merged to 'next' on 2012-04-11 at 24d14de)
103
- + diff: tweak a _copy_ of diff_options with word-diff
104
- + diff: refactor the word-diff setup from builtin_diff_cmd
105
- + t4034: diff.*.wordregex should not be "sticky" in --word-diff
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
88
89
Originally merged to 'next' on 2012-03-20
90
109
-The regexp configured with wordregex was incorrectly reused across
110
-files.
111
-
112
-* zj/test-cred-helper-nicer-prove (2012-03-15) 2 commits
113
- (merged to 'next' on 2012-04-11 at 9169614)
114
- + t0303: resurrect commit message as test documentation
115
- + t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER
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.
95
117
-Originally merged to 'next' on 2012-03-20
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
99
119
-Minor improvement to t0303.
100
+Excludes conflicted paths from "add -p" processing, as it is not prepared
101
+to handle them.
102
121
---------------------------------------------------
122
-[New Topics]
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"
107
124
-* cb/cherry-pick-rev-path-confusion (2012-04-15) 1 commit
125
- - cherry-pick: do not expect file arguments
108
+Even with "-q"uiet option, "checkout" used to report setting up tracking.
109
+Also "branch" learns "-q"uiet option to squelch informational message.
110
127
-The command line parser choked "git cherry-pick $name" when $name can be
128
-both revision name and a pathname, even though $name can never be a path
129
-in the context of the command.
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
117
131
-The issue the patch addresses is real, but the way it is implemented felt
132
-unnecessarily invasive a bit. It may be cleaner for this caller to add
133
-the "--" to the end of the argv_array it passes to setup_revisions().
118
+Forbids rename detection logic from matching two empty files as renames
119
+during merge-recursive to prevent mismerges.
120
135
-* cb/daemon-test-race-fix (2012-04-15) 1 commit
136
- - git-daemon wrapper to wait until daemon is ready
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
124
138
-Fix race condition between starting and waiting for git-daemon in the
139
-test.
125
+The smart-http backend used to always override GIT_COMMITTER_* variables
126
+with REMOTE_USER and REMOTE_ADDR.
127
141
-* cb/maint-report-mount-point-correctly-in-setup (2012-04-15) 1 commit
142
- - properly keep track of current working directory
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
131
144
-The filesystem boundary was not correctly reported when .git directory
145
-discovery stopped at a mount point.
132
+Originally merged to 'next' on 2012-03-20
133
147
-* jl/maint-submodule-recurse-fetch (2012-04-14) 1 commit
148
- - submodules: recursive fetch also checks new tags for submodule commits
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
137
150
-Will merge to 'next'.
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).
140
152
-* jn/fast-import-doc (2012-04-15) 1 commit
153
- - fast-import doc: cat-blob and ls responses need to be consumed quickly
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
145
155
-Will merge to 'next'.
146
+Originally merged to 'next' on 2012-03-07
147
157
-* jn/more-i18ncmp (2012-04-14) 3 commits
158
- - test: am of empty patch should not succeed
159
- - test: use test_i18ncmp for "Patch format detection failed" message
160
- - test: do not rely on US English tracking-info messages
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
153
162
-Will merge to 'next'.
154
+Updates our configure.ac to follow a better "autoconf" style.
155
164
-* rl/maint-stash-i18n-save-error (2012-04-14) 1 commit
165
- - stash: use eval_gettextln correctly
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.
161
167
-Will merge to 'next'.
162
+Makes 'snapshot' request to "gitweb" honor If-Modified-Since: header,
163
+based on the commit date.
164
165
--------------------------------------------------
166
[Stalled]
167
172
-* lp/maint-diff-three-dash-with-graph (2012-03-20) 3 commits
173
- - t4202: add test for "log --graph --stat -p" separator lines
174
- - log --graph: fix break in graph lines
175
- - log --graph --stat: three-dash separator should come after graph lines
176
-
177
-With a review from Zbigniew, I have been expecting that this would be
178
-rerolled, but that didn't happen.
179
-
180
-Waiting for a reroll.
181
-
168
* cn/apply-fix-ws-can-lengthen-lines (2012-03-11) 1 commit
169
. apply: reallocate the postimage buffer when needed
170
@@ -236,6 +222,60 @@ not working :-(.
222
--------------------------------------------------
223
[Cooking]
224
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
229
+
230
+Will merge to 'next'.
231
+
232
+* cb/cherry-pick-rev-path-confusion (2012-04-15) 1 commit
233
+ - cherry-pick: do not expect file arguments
234
+
235
+The command line parser choked "git cherry-pick $name" when $name can be
236
+both revision name and a pathname, even though $name can never be a path
237
+in the context of the command.
238
+
239
+The issue the patch addresses is real, but the way it is implemented felt
240
+unnecessarily invasive a bit. It may be cleaner for this caller to add
241
+the "--" to the end of the argv_array it passes to setup_revisions().
242
+
243
+* cb/daemon-test-race-fix (2012-04-15) 1 commit
244
+ - git-daemon wrapper to wait until daemon is ready
245
+
246
+Fix race condition between starting and waiting for git-daemon in the
247
+test.
248
+
249
+* cb/maint-report-mount-point-correctly-in-setup (2012-04-15) 1 commit
250
+ - properly keep track of current working directory
251
+
252
+The filesystem boundary was not correctly reported when .git directory
253
+discovery stopped at a mount point.
254
+
255
+Will merge to 'next'.
256
+
257
+* 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'.
261
+
262
+* 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'.
266
+
267
+* 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'.
273
+
274
+* rl/maint-stash-i18n-save-error (2012-04-14) 1 commit
275
+ - stash: use eval_gettextln correctly
276
+
277
+Will merge to 'next'.
278
+
279
* nd/columns (2012-04-15) 9 commits
280
- tag: add --column
281
- column: support piping stdout to external git-column process
@@ -247,7 +287,7 @@ not working :-(.
287
- Stop starting pager recursively
288
- Add column layout skeleton and git-column
289
250
-Rerolled.
290
+Will merge to 'next'.
291
292
* nl/http-proxy-more (2012-04-14) 6 commits
293
- http: fix proxy authentication
@@ -261,8 +301,11 @@ The code to talk to http proxies learn to use the same credential
301
API used to talk to the final http destinations. This still needs
302
to peek into $ENV{HTTPS_PROXY}.
303
264
-* mb/fetch-call-a-non-branch-a-ref (2012-04-11) 1 commit
265
- - fetch: Only call a new ref a "branch" if it's under refs/heads/.
304
+* 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.
309
310
* mh/ref-api (2012-04-10) 13 commits
311
- do_for_each_ref(): only iterate over the subtree that was requested
@@ -291,7 +334,10 @@ stopped using the diff minimalization by default in v1.7.2 era.
334
335
Will merge to 'next'.
336
294
-* jk/repack-no-explode-objects-from-old-pack (2012-04-11) 1 commit
337
+* 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
341
(merged to 'next' on 2012-04-15 at 7586e50)
342
+ gc: do not explode objects which will be immediately pruned
343
@@ -301,19 +347,24 @@ Will merge to 'next'.
347
+ git p4: Fixing script editor checks
348
(this branch uses pw/git-p4.)
349
304
-* lt/octopus-simplify (2012-04-12) 1 commit
350
+A review from Pete Wyckoff needs to be addressed.
351
+Message-ID: <20120418113422.GB19994@padd.com>
352
+
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
308
-commit. This was done off-list.
360
+commit, but follow-up broke badly.
361
310
-* nh/empty-rebase (2012-04-11) 3 commits
362
+* nh/empty-rebase (2012-04-18) 4 commits
363
+ - git-rebase: add keep_empty flag
364
- git-cherry-pick: add test to validate new options
312
- - git-cherry-pick: add --keep-redundant-commits option
365
+ - git-cherry-pick: add "--keep-redundant-commits" option
366
- git-cherry-pick: add allow-empty option
367
315
-Waiting for a reroll.
316
-
368
* sl/test-wc-l-line-count (2012-04-11) 1 commit
369
(merged to 'next' on 2012-04-15 at 40797d9)
370
+ tests: modernise style: more uses of test_line_count
@@ -325,9 +376,10 @@ Waiting for a reroll.
376
- Provide branch name in error message when using @{u}
377
- t1507: add tests to document @{upstream} behaviour
378
328
-Rerolled.
379
+Will merge to 'next'.
380
330
-* fc/completion-tests (2012-04-15) 6 commits
381
+* fc/completion-tests (2012-04-18) 7 commits
382
+ - tests: add tests for the __gitcomp() completion helper function
383
- completion: fix completion after 'git --option <TAB>'
384
- completion: avoid trailing space for --exec-path
385
- completion: add missing general options
@@ -335,6 +387,8 @@ Rerolled.
387
- completion: simplify __gitcomp_1
388
- tests: add initial bash completion tests
389
390
+Will merge to 'next'.
391
+
392
* jh/apply-free-patch (2012-04-11) 9 commits
393
(merged to 'next' on 2012-04-15 at 8cccf57)
394
+ apply: document buffer ownership rules across functions
@@ -354,10 +408,14 @@ Valgrind reports quite a lot of discarded memory inside apply.
408
- index-pack: split second pass obj handling into own function
409
- compat/win32/pthread.h: Add an pthread_key_delete() implementation
410
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
+
419
* cb/http-multi-curl-auth (2012-04-14) 4 commits
420
- http: use newer curl options for setting credentials
421
- http: clean up leak in init_curl_http_auth
@@ -425,32 +483,6 @@ student-hopefuls.
483
484
Will merge to 'next', if nobody objects.
485
428
-* jk/add-p-skip-conflicts (2012-04-05) 1 commit
429
- (merged to 'next' on 2012-04-12 at e65ceb1)
430
- + add--interactive: ignore unmerged entries in patch mode
431
-
432
-Excludes conflicted paths from "add -p" processing, as it is not prepared
433
-to handle them.
434
-
435
-* bw/spawn-via-shell-path (2012-04-03) 1 commit
436
- (merged to 'next' on 2012-04-12 at 0ff833b)
437
- + Use SHELL_PATH from build system in run_command.c:prepare_shell_cmd
438
-
439
-"sh" on the user's PATH may be utterly broken on some systems;
440
-consistently use SHELL_PATH even from inside run-command API.
441
-
442
-* jc/commit-unedited-template (2012-04-03) 5 commits
443
- (merged to 'next' on 2012-04-12 at a2e153b)
444
- + Documentation/git-commit: rephrase the "initial-ness" of templates
445
- + git-commit.txt: clarify -t requires editing message
446
- + commit: rephrase the error when user did not touch templated log message
447
- + commit: do not trigger bogus "has templated message edited" check
448
- + t7501: test the right kind of breakage
449
-
450
-When "git commit --template F" errors out because the user did not touch
451
-the message, it claimed that it aborts due to "empty message", which was
452
-utterly wrong.
453
-
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
@@ -460,12 +492,7 @@ 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
463
-* jk/http-backend-keep-committer-ident-env (2012-03-30) 1 commit
464
- (merged to 'next' on 2012-04-12 at b2d0136)
465
- + http-backend: respect existing GIT_COMMITTER_* variables
466
-
467
-The smart-http backend used to always override GIT_COMMITTER_* variables
468
-with REMOTE_USER and REMOTE_ADDR.
495
+Will merge to 'master'.
496
497
* mk/gitweb-diff-hl (2012-04-11) 8 commits
498
- gitweb: Refinement highlightning in combined diffs
@@ -492,7 +519,9 @@ Will merge to 'next'.
519
+ var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings
520
+ var doc: default editor and pager are configurable at build time
521
495
-* rs/commit-list-sort-in-batch (2012-04-11) 3 commits
522
+* rs/commit-list-sort-in-batch (2012-04-17) 4 commits
523
+ (merged to 'next' on 2012-04-17 at 21208e9)
524
+ + mergesort: rename it to llist_mergesort()
525
(merged to 'next' on 2012-04-15 at 39fe527)
526
+ revision: insert unsorted, then sort in prepare_revision_walk()
527
+ commit: use mergesort() in commit_list_sort_by_date()
@@ -505,14 +534,6 @@ Will merge to 'next'.
534
535
Will merge to 'next'.
536
508
-* jk/branch-quiet (2012-03-26) 2 commits
509
- (merged to 'next' on 2012-04-12 at 7d0a438)
510
- + teach "git branch" a --quiet option
511
- + checkout: suppress tracking message with "-q"
512
-
513
-Even with "-q"uiet option, "checkout" used to report setting up tracking.
514
-Also "branch" learns "-q"uiet option to squelch informational message.
515
-
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
@@ -521,47 +542,27 @@ Also "branch" learns "-q"uiet option to squelch informational message.
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
532
-* rs/combine-diff-zero-context-at-the-beginning (2012-03-25) 1 commit
533
- (merged to 'next' on 2012-04-12 at b4d92e3)
534
- + combine-diff: fix loop index underflow
535
-
536
-Fixes an age old corner case bug in combine diff (only triggered with -U0
537
-and the hunk at the beginning of the file needs to be shown).
538
-
539
-* sl/autoconf (2012-03-26) 3 commits
540
- (merged to 'next' on 2012-04-12 at 68f346d)
541
- + configure: be more idiomatic
542
- + configure: avoid some code repetitions thanks to m4_{push,pop}def
543
- + configure: move definitions of private m4 macros before AC_INIT invocation
544
-
545
-Updates our configure.ac to follow a better "autoconf" style.
546
-
547
-* wk/gitweb-snapshot-use-if-modified-since (2012-03-30) 3 commits
548
- (merged to 'next' on 2012-04-12 at 611d318)
549
- + gitweb: add If-Modified-Since handling to git_snapshot().
550
- + gitweb: refactor If-Modified-Since handling
551
- + gitweb: add `status` headers to git_feed() responses.
552
-
553
-Makes 'snapshot' request to "gitweb" honor If-Modified-Since: header,
554
-based on the commit date.
555
-
556
-* jk/diff-no-rename-empty (2012-03-23) 4 commits
557
- (merged to 'next' on 2012-04-12 at d1d95c5)
558
- + merge-recursive: don't detect renames of empty files
559
- + teach diffcore-rename to optionally ignore empty content
560
- + make is_empty_blob_sha1 available everywhere
561
- + drop casts from users EMPTY_TREE_SHA1_BIN
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
563
-Forbids rename detection logic from matching two empty files as renames
564
-during merge-recursive to prevent mismerges.
565
+Will merge to 'master'.
566
567
* th/difftool-diffall (2012-04-14) 8 commits
568
- difftool: print list of valid tools with '--tool-help'
@@ -578,19 +579,6 @@ Rolls the two-directory-diff logic from diffall script (in contrib/) into
579
580
Still being reworked.
581
581
-* jc/maint-clean-nested-worktree-in-subdir (2012-03-15) 1 commit
582
- (merged to 'next' on 2012-04-12 at 280a6e5)
583
- + clean: preserve nested git worktree in subdirectories
584
-
585
-Originally merged to 'next' on 2012-03-20
586
-
587
-"git clean -d -f" (not "-d -f -f") is supposed to protect nested working
588
-trees of independent git repositories that exist in the current project
589
-working tree from getting removed, but the protection applied only to such
590
-working trees that are at the top-level of the current project by mistake.
591
-
592
-Will merge to 'master'.
593
-
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
@@ -601,12 +589,6 @@ 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
604
-* nl/rebase-i-cheat-sheet (2012-03-20) 1 commit
605
- (merged to 'next' on 2012-04-12 at cd76fcb)
606
- + rebase -i: remind that the lines are top-to-bottom
607
-
608
-Originally merged to 'next' on 2012-03-20
609
-
592
Will merge to 'master'.
593
594
* jc/run-hook-env-1 (2012-03-11) 1 commit
@@ -617,15 +599,6 @@ Not urgent.
599
Updates run_hook() API to be much less specific to "commit". It would
600
only be useful if people start doing more interesting things with hooks.
601
620
-* rs/unpack-trees-leakfix (2012-04-10) 2 commits
621
- (merged to 'next' on 2012-04-12 at 6958b54)
622
- + unpack-trees: plug minor memory leak
623
- + unpack-trees: don't perform any index operation if we're not merging
624
-
625
-Originally merged to 'next' on 2012-03-07
626
-
627
-Will merge to 'master'.
628
-
602
* mm/push-default-switch-warning (2012-04-15) 2 commits
603
- t5570: use explicit push refspec
604
- push: start warning upcoming default change for push.default
@@ -641,3 +614,5 @@ the future default change into account.
614
615
The "fmt-merge-msg" command learns to list the primary contributors
616
involved in the side topic you are merging.
617
+
618
+Will merge to 'master'.