What's cooking (2012/04 #06)
Junio C Hamano committed
Apr 15, 2012 at 23:36 UTC
d58f31818c27a40a922986295624e7f93b8b88d8
1 file changed
+269
-248
whats-cooking.txt
+269
-248
@@ -1,16 +1,18 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2012, #05; Thu, 12)
3
-X-master-at: 36e6c803a1ef68b8acdc4138597db4fb087112be
4
-X-next-at: 3bf1d831cc29e917a2cd49a8a2df911e3b3ff26c
2
+Subject: What's cooking in git.git (Apr 2012, #06; Sun, 15)
3
+X-master-at: 146fe8ce2488fea8a8e35285d825bfbbe07b806d
4
+X-next-at: 8cccf57d9db48c1a2914739aeed661a9f33d74bc
5
6
-What's cooking in git.git (Apr 2012, #05; Thu, 12)
6
+What's cooking in git.git (Apr 2012, #06; Sun, 15)
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
-This issue describes the state of my tree in preparation for opening the
13
-post 1.7.10 cycle. The 'next' branch has been rewound.
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.
16
17
You can find the changes described here in the integration branches of the
18
repositories listed at
@@ -18,98 +20,154 @@ repositories listed at
20
http://git-blame.blogspot.com/p/git-public-repositories.html
21
22
--------------------------------------------------
21
-[New Topics]
23
+[Graduated to "master"]
24
23
-* mh/ref-api (2012-04-10) 13 commits
24
- - do_for_each_ref(): only iterate over the subtree that was requested
25
- - refs: store references hierarchically
26
- - sort_ref_dir(): simplify logic
27
- - refs.c: rename ref_array -> ref_dir
28
- - struct ref_entry: nest the value part in a union
29
- - check_refname_component(): return 0 for zero-length components
30
- - free_ref_entry(): new function
31
- - names_conflict(): simplify implementation
32
- - repack_without_ref(): reimplement using do_for_each_ref_in_array()
33
- - do_for_each_ref_in_arrays(): new function
34
- - do_for_each_ref_in_array(): new function
35
- - refs: manage current_ref within do_one_ref()
36
- - refs.c: reorder definitions more logically
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
28
38
-Allows walking only a sub-hierarchy in refs/*.
29
+Makes sure "difftool" options can be given in any order.
30
40
-Will merge to 'next'.
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.)
37
42
-* jc/maint-blame-minimal (2012-04-11) 1 commit
43
- - blame: accept --need-minimal
38
+Originally merged to 'next' on 2012-03-12
39
45
-"git blame" started missing quite a few changes from the origin since we
46
-stopped using the diff minimalization by default in v1.7.2 era.
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.
44
48
-Will merge to 'next'.
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
49
50
-* jk/repack-no-explode-objects-from-old-pack (2012-04-11) 1 commit
51
- - gc: do not explode objects which will be immediately pruned
50
+Originally merged to 'next' on 2012-03-15
51
53
-Will merge to 'next'.
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.
55
55
-* ld/git-p4-tags-and-labels (2012-04-11) 2 commits
56
- - git p4: import/export of labels to/from p4
57
- - git p4: Fixing script editor checks
58
- (this branch uses pw/git-p4.)
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.)
63
60
-* lt/octopus-simplify (2012-04-12) 1 commit
61
- - Make 'git merge' simplify parents earlier
64
+Originally merged to 'next' on 2012-03-20
65
63
-Octopus merge strategy did not reduce heads that are recorded in the final
64
-commit. This was done off-list.
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
66
-* mr/fetch-call-a-non-branch-a-ref (2012-04-11) 1 commit
67
- - fetch: Only call a new ref a "branch" if it's under refs/heads/.
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
80
69
-The change itself may be sensible, but it exposes a funny in the vicinity
70
-about recursive submodule fetching behaviour.
81
+Originally merged to 'next' on 2012-03-20
82
72
-* nh/empty-rebase (2012-04-11) 3 commits
73
- - git-cherry-pick: add test to validate new options
74
- - git-cherry-pick: add --keep-redundant-commits option
75
- - git-cherry-pick: add allow-empty option
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.
85
77
-Waiting for a reroll.
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
95
79
-* sl/test-wc-l-line-count (2012-04-11) 1 commit
80
- - tests: modernise style: more uses of test_line_count
96
+Originally merged to 'next' on 2012-03-07
97
82
-Will merge to 'next'.
98
+Use API to read blob data in smaller chunks in more places to
99
+reduce the memory footprint. In general, looked fairly good.
100
84
-* zj/upstream-error-message (2012-04-11) 5 commits
85
- - i18n: mark @{upstream} error messages for translation
86
- - Be more specific if upstream branch is not fetched
87
- - Provide better message for barnhc_wiht_tpyo@{u}
88
- - Provide branch name in error message when using @{u}
89
- - t1507: add additional tests for @{upstream}
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
106
91
-Waiting for a reroll.
107
+Originally merged to 'next' on 2012-03-20
108
93
-* fc/completion-tests (2012-04-12) 1 commit
94
- - tests: add initial bash completion tests
109
+The regexp configured with wordregex was incorrectly reused across
110
+files.
111
96
-Will merge to 'next'.
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
116
+
117
+Originally merged to 'next' on 2012-03-20
118
+
119
+Minor improvement to t0303.
120
121
--------------------------------------------------
99
-[Stalled]
122
+[New Topics]
123
101
-* nl/http-proxy-more (2012-04-12) 6 commits
102
- - fixup? 6e17b8c
103
- - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY
104
- - http: Avoid limit of retrying request only twice
105
- - http: handle proxy authentication failure (error 407)
106
- - http: handle proxy proactive authentication
107
- - http: try http_proxy env var when http.proxy config option is not set
124
+* cb/cherry-pick-rev-path-confusion (2012-04-15) 1 commit
125
+ - cherry-pick: do not expect file arguments
126
109
-The code to talk to http proxies learn to use the same credential
110
-API used to talk to the final http destinations.
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.
130
+
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().
134
+
135
+* cb/daemon-test-race-fix (2012-04-15) 1 commit
136
+ - git-daemon wrapper to wait until daemon is ready
137
+
138
+Fix race condition between starting and waiting for git-daemon in the
139
+test.
140
+
141
+* cb/maint-report-mount-point-correctly-in-setup (2012-04-15) 1 commit
142
+ - properly keep track of current working directory
143
+
144
+The filesystem boundary was not correctly reported when .git directory
145
+discovery stopped at a mount point.
146
+
147
+* jl/maint-submodule-recurse-fetch (2012-04-14) 1 commit
148
+ - submodules: recursive fetch also checks new tags for submodule commits
149
+
150
+Will merge to 'next'.
151
+
152
+* jn/fast-import-doc (2012-04-15) 1 commit
153
+ - fast-import doc: cat-blob and ls responses need to be consumed quickly
154
+
155
+Will merge to 'next'.
156
112
-Kicked back to 'pu', as it breaks the proxied codepath quite badly.
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
161
+
162
+Will merge to 'next'.
163
+
164
+* rl/maint-stash-i18n-save-error (2012-04-14) 1 commit
165
+ - stash: use eval_gettextln correctly
166
+
167
+Will merge to 'next'.
168
+
169
+--------------------------------------------------
170
+[Stalled]
171
172
* lp/maint-diff-three-dash-with-graph (2012-03-20) 3 commits
173
- t4202: add test for "log --graph --stat -p" separator lines
@@ -131,25 +189,6 @@ and results in double-frees.
189
190
Will discard shortly if nothing happens.
191
134
-* nd/columns (2012-03-13) 12 commits
135
- - column: support grouping entries
136
- - column: support "denser" mode
137
- - ls-files: support --column
138
- - tag: add --column
139
- - column: support piping stdout to external git-column process
140
- - status: add --column
141
- - branch: add --column
142
- - help: reuse print_columns() for help -a
143
- - column: add dense layout support
144
- - column: add columnar layout
145
- - Stop starting pager recursively
146
- - Add column layout skeleton and git-column
147
-
148
-Modulo minor nits, looked nicer than the previous round and getting closer
149
-to completion but nothing has happened recently.
150
-
151
-Will discard shortly if nothing happens.
152
-
192
* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits
193
- fixup! 15eaaf4
194
- git-svn, perl/Git.pm: extend Git::prompt helper for querying users
@@ -197,21 +236,119 @@ not working :-(.
236
--------------------------------------------------
237
[Cooking]
238
200
-* jh/apply-free-patch (2012-04-11) 9 commits
201
- - apply: document buffer ownership rules across functions
202
- - apply: tighten constness of line buffer
203
- - apply: drop unused macro
204
- - apply: free unused fragments for submodule patch
205
- - apply: free patch->result
206
- - apply: release memory for fn_table
207
- - apply: free patch->{def,old,new}_name fields
208
- - apply: rename free_patch() to free_patch_list()
209
- - apply: do not leak patches and fragments
239
+* nd/columns (2012-04-15) 9 commits
240
+ - tag: add --column
241
+ - column: support piping stdout to external git-column process
242
+ - status: add --column
243
+ - branch: add --column
244
+ - help: reuse print_columns() for help -a
245
+ - column: add dense layout support
246
+ - column: add columnar layout
247
+ - Stop starting pager recursively
248
+ - Add column layout skeleton and git-column
249
211
-Valgrind reports quite a lot of discarded memory inside apply.
250
+Rerolled.
251
+
252
+* nl/http-proxy-more (2012-04-14) 6 commits
253
+ - http: fix proxy authentication
254
+ - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY
255
+ - http: Avoid limit of retrying request only twice
256
+ - http: handle proxy authentication failure (error 407)
257
+ - http: handle proxy proactive authentication
258
+ - http: try http_proxy env var when http.proxy config option is not set
259
+
260
+The code to talk to http proxies learn to use the same credential
261
+API used to talk to the final http destinations. This still needs
262
+to peek into $ENV{HTTPS_PROXY}.
263
+
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/.
266
+
267
+* mh/ref-api (2012-04-10) 13 commits
268
+ - do_for_each_ref(): only iterate over the subtree that was requested
269
+ - refs: store references hierarchically
270
+ - sort_ref_dir(): simplify logic
271
+ - refs.c: rename ref_array -> ref_dir
272
+ - struct ref_entry: nest the value part in a union
273
+ - check_refname_component(): return 0 for zero-length components
274
+ - free_ref_entry(): new function
275
+ - names_conflict(): simplify implementation
276
+ - repack_without_ref(): reimplement using do_for_each_ref_in_array()
277
+ - do_for_each_ref_in_arrays(): new function
278
+ - do_for_each_ref_in_array(): new function
279
+ - refs: manage current_ref within do_one_ref()
280
+ - refs.c: reorder definitions more logically
281
+
282
+Allows walking only a sub-hierarchy in refs/*.
283
284
Will merge to 'next'.
285
286
+* jc/maint-blame-minimal (2012-04-11) 1 commit
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
+
292
+Will merge to 'next'.
293
+
294
+* jk/repack-no-explode-objects-from-old-pack (2012-04-11) 1 commit
295
+ (merged to 'next' on 2012-04-15 at 7586e50)
296
+ + gc: do not explode objects which will be immediately pruned
297
+
298
+* ld/git-p4-tags-and-labels (2012-04-11) 2 commits
299
+ (merged to 'next' on 2012-04-15 at 1b1e9a1)
300
+ + git p4: import/export of labels to/from p4
301
+ + git p4: Fixing script editor checks
302
+ (this branch uses pw/git-p4.)
303
+
304
+* lt/octopus-simplify (2012-04-12) 1 commit
305
+ - Make 'git merge' simplify parents earlier
306
+
307
+Octopus merge strategy did not reduce heads that are recorded in the final
308
+commit. This was done off-list.
309
+
310
+* nh/empty-rebase (2012-04-11) 3 commits
311
+ - git-cherry-pick: add test to validate new options
312
+ - git-cherry-pick: add --keep-redundant-commits option
313
+ - git-cherry-pick: add allow-empty option
314
+
315
+Waiting for a reroll.
316
+
317
+* sl/test-wc-l-line-count (2012-04-11) 1 commit
318
+ (merged to 'next' on 2012-04-15 at 40797d9)
319
+ + tests: modernise style: more uses of test_line_count
320
+
321
+* zj/upstream-error-message (2012-04-15) 5 commits
322
+ - i18n: mark @{upstream} error messages for translation
323
+ - Be more specific if upstream branch is not tracked
324
+ - Provide better message for barnhc_wiht_tpyo@{u}
325
+ - Provide branch name in error message when using @{u}
326
+ - t1507: add tests to document @{upstream} behaviour
327
+
328
+Rerolled.
329
+
330
+* fc/completion-tests (2012-04-15) 6 commits
331
+ - completion: fix completion after 'git --option <TAB>'
332
+ - completion: avoid trailing space for --exec-path
333
+ - completion: add missing general options
334
+ - completion: simplify by using $prev
335
+ - completion: simplify __gitcomp_1
336
+ - tests: add initial bash completion tests
337
+
338
+* jh/apply-free-patch (2012-04-11) 9 commits
339
+ (merged to 'next' on 2012-04-15 at 8cccf57)
340
+ + apply: document buffer ownership rules across functions
341
+ + apply: tighten constness of line buffer
342
+ + apply: drop unused macro
343
+ + apply: free unused fragments for submodule patch
344
+ + apply: free patch->result
345
+ + apply: release memory for fn_table
346
+ + apply: free patch->{def,old,new}_name fields
347
+ + apply: rename free_patch() to free_patch_list()
348
+ + apply: do not leak patches and fragments
349
+
350
+Valgrind reports quite a lot of discarded memory inside apply.
351
+
352
* nd/threaded-index-pack (2012-04-11) 3 commits
353
- index-pack: support multithreaded delta resolving
354
- index-pack: split second pass obj handling into own function
@@ -221,49 +358,46 @@ Will merge to 'next'.
358
(merged to 'next' on 2012-04-12 at 3bf1d83)
359
+ Avoid bug in Solaris xpg4/sed as used in submodule
360
224
-* cb/http-multi-curl-auth (2012-04-10) 2 commits
361
+* cb/http-multi-curl-auth (2012-04-14) 4 commits
362
+ - http: use newer curl options for setting credentials
363
+ - http: clean up leak in init_curl_http_auth
364
- fix http auth with multiple curl handles
365
- http auth fails with multiple curl handles
366
367
Fixes http authentication breakage when we keep multiple HTTP requests in
368
flight using curl-multi.
369
231
-I haven't looked at Peff's follow-up deeply yet. Perhaps a reroll is
232
-coming?
370
+Will merge to 'next'.
371
372
* jk/rebase-i-submodule-conflict-only (2012-04-09) 1 commit
235
- - rebase -i continue: don't skip commits that only change submodules
373
+ (merged to 'next' on 2012-04-15 at 94367a8)
374
+ + rebase -i continue: don't skip commits that only change submodules
375
376
Giving "--continue" to a conflicted "rebase -i" session skipped a commit
377
that only results in changes to submodules.
378
240
-Will merge to 'next'.
241
-
379
* ms/remote-usage-string (2012-04-09) 1 commit
243
- - remote: update builtin usage
380
+ (merged to 'next' on 2012-04-15 at 704be8f)
381
+ + remote: update builtin usage
382
383
As an independent follow-up, we may want to rethink how the overall usage
384
string and subcommand usage strings are maintained.
385
248
-Will merge to 'next'.
249
-
386
* pw/fast-import-dataref-parsing (2012-04-10) 1 commit
387
- fast-import: tighten parsing of datarefs
388
389
Will merge to 'next'.
390
391
* pw/git-p4 (2012-04-09) 3 commits
256
- - git p4: use "git p4" directly in tests
257
- - git p4: update name in script
258
- - git-p4: move to toplevel
392
+ (merged to 'next' on 2012-04-15 at 81ea41a)
393
+ + git p4: use "git p4" directly in tests
394
+ + git p4: update name in script
395
+ + git-p4: move to toplevel
396
(this branch is used by ld/git-p4-tags-and-labels.)
397
261
-Will merge to 'next'.
262
-
398
* rl/show-empty-prefix (2012-04-10) 1 commit
264
- - rev-parse --show-prefix: add in trailing newline
265
-
266
-Will merge to 'next'.
399
+ (merged to 'next' on 2012-04-15 at b2e5938)
400
+ + rev-parse --show-prefix: add in trailing newline
401
402
* tr/xdiff-fast-hash (2012-04-09) 1 commit
403
- xdiff: load full words in the inner loop of xdl_hash_record
@@ -354,17 +488,15 @@ Will merge to 'next'.
488
Will merge to 'next'.
489
490
* jn/debian-customizes-default-editor (2012-04-10) 2 commits
357
- - var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings
358
- - var doc: default editor and pager are configurable at build time
359
-
360
-Will merge to 'next'.
491
+ (merged to 'next' on 2012-04-15 at 0fc85c3)
492
+ + var doc: advertise current DEFAULT_PAGER and DEFAULT_EDITOR settings
493
+ + var doc: default editor and pager are configurable at build time
494
495
* rs/commit-list-sort-in-batch (2012-04-11) 3 commits
363
- - revision: insert unsorted, then sort in prepare_revision_walk()
364
- - commit: use mergesort() in commit_list_sort_by_date()
365
- - add mergesort() for linked lists
366
-
367
-Will merge to 'next'.
496
+ (merged to 'next' on 2012-04-15 at 39fe527)
497
+ + revision: insert unsorted, then sort in prepare_revision_walk()
498
+ + commit: use mergesort() in commit_list_sort_by_date()
499
+ + add mergesort() for linked lists
500
501
* hv/submodule-recurse-push (2012-03-30) 3 commits
502
- push: teach --recurse-submodules the on-demand option
@@ -431,7 +563,7 @@ based on the commit date.
563
Forbids rename detection logic from matching two empty files as renames
564
during merge-recursive to prevent mismerges.
565
434
-* th/difftool-diffall (2012-04-04) 8 commits
566
+* th/difftool-diffall (2012-04-14) 8 commits
567
- difftool: print list of valid tools with '--tool-help'
568
- difftool: teach difftool to handle directory diffs
569
- difftool: eliminate setup_environment function
@@ -446,11 +578,9 @@ Rolls the two-directory-diff logic from diffall script (in contrib/) into
578
579
Still being reworked.
580
449
-* jc/maint-clean-nested-worktree-in-subdir (2012-03-15) 2 commits
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
452
- + remove_dir_recursively(): Add flag for skipping removal of toplevel dir
453
- (this branch is tangled with jh/notes-merge-in-git-dir-worktree.)
584
585
Originally merged to 'next' on 2012-03-20
586
@@ -459,6 +589,8 @@ 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
+
594
* ct/advise-push-default (2012-04-12) 3 commits
595
(merged to 'next' on 2012-04-12 at b0613cd)
596
+ Fix httpd tests that broke when non-ff push advice changed
@@ -475,111 +607,16 @@ change regardless of mm/push-default-switch-warning topic.
607
608
Originally merged to 'next' on 2012-03-20
609
478
-* da/difftool-test (2012-03-19) 1 commit
479
- (merged to 'next' on 2012-04-11 at f245c01)
480
- + t7800: Test difftool passing arguments to diff
481
-
482
-Makes sure "difftool" options can be given in any order.
483
-
484
-Will merge to 'master'.
485
-
486
-* jh/notes-merge-in-git-dir-worktree (2012-03-15) 4 commits
487
- (merged to 'next' on 2012-04-11 at 6042ef5)
488
- + notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd
489
- + notes-merge: use opendir/readdir instead of using read_directory()
490
- + t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/
491
- + remove_dir_recursively(): Add flag for skipping removal of toplevel dir
492
- (this branch is tangled with jc/maint-clean-nested-worktree-in-subdir.)
493
-
494
-Originally merged to 'next' on 2012-03-20
495
-
496
-Running "notes merge --commit" failed to perform correctly when run
497
-from any directory inside $GIT_DIR/. When "notes merge" stops with
498
-conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits
499
-to resolve it.
500
-
610
Will merge to 'master'.
611
503
-* jn/diffstat-tests (2012-03-13) 7 commits
504
- (merged to 'next' on 2012-04-11 at 7365e41)
505
- + diffstat summary line varies by locale: miscellany
506
- + test: use numstat instead of diffstat in binary-diff test
507
- + test: use --numstat instead of --stat in "git stash show" tests
508
- + test: test cherry-pick functionality and output separately
509
- + test: modernize funny-names test style
510
- + test: use numstat instead of diffstat in funny-names test
511
- + test: use test_i18ncmp when checking --stat output
512
-
513
-Originally merged to 'next' on 2012-03-20
514
-
515
-Some tests checked the "diff --stat" output when they do not have to,
516
-which unnecessarily made things harder to verify under GETTEXT_POISON.
517
-
518
-Will merge to 'master'.
519
-
520
-* tr/maint-word-diff-regex-sticky (2012-03-14) 3 commits
521
- (merged to 'next' on 2012-04-11 at 24d14de)
522
- + diff: tweak a _copy_ of diff_options with word-diff
523
- + diff: refactor the word-diff setup from builtin_diff_cmd
524
- + t4034: diff.*.wordregex should not be "sticky" in --word-diff
525
-
526
-Originally merged to 'next' on 2012-03-20
527
-
528
-The regexp configured with wordregex was incorrectly reused across
529
-files.
530
-
531
-Will merge to 'master'.
532
-
533
-* zj/test-cred-helper-nicer-prove (2012-03-15) 2 commits
534
- (merged to 'next' on 2012-04-11 at 9169614)
535
- + t0303: resurrect commit message as test documentation
536
- + t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER
537
-
538
-Originally merged to 'next' on 2012-03-20
539
-
540
-Minor improvement to t0303.
541
-Will merge to 'master'.
542
-
543
-* jc/commit-hook-authorship (2012-03-11) 3 commits
544
- (merged to 'next' on 2012-04-11 at 15ec4d4)
545
- + commit: pass author/committer info to hooks
546
- + t7503: does pre-commit-hook learn authorship?
547
- + ident.c: add split_ident_line() to parse formatted ident line
548
- (this branch is tangled with jc/run-hook-env-1.)
549
-
550
-Originally merged to 'next' on 2012-03-12
551
-
552
-"git commit --author=$name" did not tell the name that was being
553
-recorded in the resulting commit to hooks, even though it does do so
554
-when the end user overrode the authorship via the "GIT_AUTHOR_NAME"
555
-environment variable.
556
-
557
-Will merge to 'master'.
558
-
559
-* jc/run-hook-env-1 (2012-03-11) 3 commits
612
+* jc/run-hook-env-1 (2012-03-11) 1 commit
613
- run_hook(): enhance the interface to pass arbitrary environment
561
- + t7503: does pre-commit-hook learn authorship?
562
- + ident.c: add split_ident_line() to parse formatted ident line
563
- (this branch is tangled with jc/commit-hook-authorship.)
614
615
Not urgent.
616
617
Updates run_hook() API to be much less specific to "commit". It would
618
only be useful if people start doing more interesting things with hooks.
619
570
-* jc/diff-algo-cleanup (2012-02-19) 2 commits
571
- (merged to 'next' on 2012-04-11 at f2c6b9a)
572
- + xdiff: PATIENCE/HISTOGRAM are not independent option bits
573
- + xdiff: remove XDL_PATCH_* macros
574
-
575
-Originally merged to 'next' on 2012-03-15
576
-
577
-Resurrects the preparatory clean-up patches from another topic that was
578
-discarded, as this would give a saner foundation to build on diff.algo
579
-configuration option series.
580
-
581
-Will merge to 'master'.
582
-
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
@@ -587,7 +624,10 @@ Will merge to 'master'.
624
625
Originally merged to 'next' on 2012-03-07
626
590
-* mm/push-default-switch-warning (2012-03-09) 1 commit
627
+Will merge to 'master'.
628
+
629
+* mm/push-default-switch-warning (2012-04-15) 2 commits
630
+ - t5570: use explicit push refspec
631
- push: start warning upcoming default change for push.default
632
633
This resurrects an ancient patch I wrote during a discussion we had in the
@@ -595,28 +635,9 @@ This resurrects an ancient patch I wrote during a discussion we had in the
635
topic and at that point the advise messages need to be rephrased, taking
636
the future default change into account.
637
598
-Will kick back to 'pu'.
599
-
638
* jc/fmt-merge-msg-people (2012-03-13) 1 commit
639
(merged to 'next' on 2012-04-12 at 4c2031c)
640
+ fmt-merge-msg: show those involved in a merged series
641
642
The "fmt-merge-msg" command learns to list the primary contributors
643
involved in the side topic you are merging.
606
-
607
-* nd/stream-more (2012-03-07) 7 commits
608
- (merged to 'next' on 2012-04-11 at b17684d)
609
- + update-server-info: respect core.bigfilethreshold
610
- + fsck: use streaming API for writing lost-found blobs
611
- + show: use streaming API for showing blobs
612
- + parse_object: avoid putting whole blob in core
613
- + cat-file: use streaming API to print blobs
614
- + Add more large blob test cases
615
- + streaming: make streaming-write-entry to be more reusable
616
-
617
-Originally merged to 'next' on 2012-03-07
618
-
619
-Use API to read blob data in smaller chunks in more places to
620
-reduce the memory footprint. In general, looked fairly good.
621
-
622
-Will merge to 'master'.