What's cooking (2010/09 #01)
Junio C Hamano committed
Sep 1, 2010 at 12:49 UTC
4a7a62f37a68bcfd53bf3b259de417e635eab903
1 file changed
+462
-289
whats-cooking.txt
+462
-289
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2010, #06; Thu, 26)
3
-X-master-at: 515cc0101943b766fde7aa894827119e332ec033
4
-X-next-at: 7180a87c9a993afee64514d82f1e85dbacc8e120
2
+Subject: What's cooking in git.git (Sep 2010, #01; Wed, 1)
3
+X-master-at: 7e42332e476a6f47ccc5a62cc8b93bcb4d758f7c
4
+X-next-at: a0aa1d989c889829c2f1571f9c7760a8b2fda6b9
5
6
-What's cooking in git.git (Aug 2010, #06; Thu, 26)
6
+What's cooking in git.git (Sep 2010, #01; Wed, 1)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,27 +11,384 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones
11
marked with '.' do not appear in any of the integration branches, but I am
12
still holding onto them.
13
14
+As I didn't want to worry about the early parts of ab/i18n topic, which
15
+was accidentally merged to 'next' due to my lazyness (another topic,
16
+ab/test, seemed to be ready for the upcoming release, but a patch to that
17
+topic had interaction with ab/i18n, which made ab/test unmergeable to
18
+'master' without dragging 'ab/i18n'), I reverted ab/i18n topic from 'next'
19
+and merged a rebuilt ab/test topic to 'next'. The i18n topic is merged
20
+to 'pu'.
21
+
22
+I am hoping to tag -rc0 for the 1.7.3 release this weekend.
23
+
24
+--------------------------------------------------
25
+[Graduated to "master"]
26
+
27
+* ab/maint-reset-mixed-w-pathspec-advice (2010-08-15) 1 commit
28
+ (merged to 'next' on 2010-08-21 at b09ee46)
29
+ + reset: suggest what to do upon "git reset --mixed <paths>"
30
+
31
+* cb/binary-patch-id (2010-08-15) 1 commit
32
+ (merged to 'next' on 2010-08-21 at ff38c3e)
33
+ + hash binary sha1 into patch id
34
+
35
+* cc/revert (2010-07-21) 5 commits
36
+ (merged to 'next' on 2010-08-14 at a910d5a)
37
+ + t3508: add check_head_differs_from() helper function and use it
38
+ + revert: improve success message by adding abbreviated commit sha1
39
+ + revert: don't print "Finished one cherry-pick." if commit failed
40
+ + revert: refactor commit code into a new run_git_commit() function
41
+ + revert: report success when using option --strategy
42
+ (this branch is used by jn/cherry-revert-message-clean-up.)
43
+
44
+* da/fix-submodule-sync-superproject-config (2010-08-18) 1 commit
45
+ (merged to 'next' on 2010-08-21 at e96772a)
46
+ + submodule sync: Update "submodule.<name>.url"
47
+
48
+* dj/fetch-tagopt (2010-08-11) 1 commit
49
+ (merged to 'next' on 2010-08-21 at 737dfec)
50
+ + fetch: allow command line --tags to override config
51
+
52
+* en/d-f-conflict-fix (2010-08-20) 12 commits
53
+ (merged to 'next' on 2010-08-20 at af7f2b0)
54
+ + merge-recursive: Avoid excessive output for and reprocessing of renames
55
+ (merged to 'next' on 2010-08-18 at 6be0f13)
56
+ + merge-recursive: Fix multiple file rename across D/F conflict
57
+ + t6031: Add a testcase covering multiple renames across a D/F conflict
58
+ + merge-recursive: Fix typo
59
+ (merged to 'next' on 2010-08-14 at 1c9b0f5)
60
+ + Mark tests that use symlinks as needing SYMLINKS prerequisite
61
+ (merged to 'next' on 2010-08-03 at 7f78604)
62
+ + t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
63
+ + fast-import: Improve robustness when D->F changes provided in wrong order
64
+ + fast-export: Fix output order of D/F changes
65
+ + merge_recursive: Fix renames across paths below D/F conflicts
66
+ + merge-recursive: Fix D/F conflicts
67
+ + Add a rename + D/F conflict testcase
68
+ + Add additional testcases for D/F conflicts
69
+
70
+* en/fast-export-fix (2010-07-17) 2 commits
71
+ (merged to 'next' on 2010-08-18 at 9fdaf27)
72
+ + fast-export: Add a --full-tree option
73
+ + fast-export: Fix dropping of files with --import-marks and path limiting
74
+
75
+* hv/autosquash-config (2010-07-14) 1 commit
76
+ (merged to 'next' on 2010-08-18 at 03a8eec)
77
+ + add configuration variable for --autosquash option of interactive rebase
78
+
79
+* jn/cherry-revert-message-clean-up (2010-08-18) 5 commits
80
+ (merged to 'next' on 2010-08-21 at 09b123c)
81
+ + tests: fix syntax error in "Use advise() for hints" test
82
+ + cherry-pick/revert: Use advise() for hints
83
+ + cherry-pick/revert: Use error() for failure message
84
+ + Introduce advise() to print hints
85
+ + Eliminate “Finished cherry-pick/revert” message
86
+ (this branch uses cc/revert.)
87
+
88
+* jn/maint-setup-fix (2010-07-24) 11 commits
89
+ (merged to 'next' on 2010-08-18 at ded5f4d)
90
+ + setup: split off a function to handle ordinary .git directories
91
+ + Revert "rehabilitate 'git index-pack' inside the object store"
92
+ + setup: do not forget working dir from subdir of gitdir
93
+ + t4111 (apply): refresh index before applying patches to it
94
+ + setup: split off get_device_or_die helper
95
+ + setup: split off a function to handle hitting ceiling in repo search
96
+ + setup: split off code to handle stumbling upon a repository
97
+ + setup: split off a function to checks working dir for .git file
98
+ + setup: split off $GIT_DIR-set case from setup_git_directory_gently
99
+ + tests: try git apply from subdir of toplevel
100
+ + t1501 (rev-parse): clarify
101
+ (this branch is used by jn/paginate-fix.)
102
+
103
+* jn/paginate-fix (2010-08-16) 14 commits
104
+ (merged to 'next' on 2010-08-18 at bb04a13)
105
+ + t7006 (pager): add missing TTY prerequisites
106
+ + merge-file: run setup_git_directory_gently() sooner
107
+ + var: run setup_git_directory_gently() sooner
108
+ + ls-remote: run setup_git_directory_gently() sooner
109
+ + index-pack: run setup_git_directory_gently() sooner
110
+ + Merge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fix
111
+ + config: run setup_git_directory_gently() sooner
112
+ + bundle: run setup_git_directory_gently() sooner
113
+ + apply: run setup_git_directory_gently() sooner
114
+ + grep: run setup_git_directory_gently() sooner
115
+ + shortlog: run setup_git_directory_gently() sooner
116
+ + git wrapper: allow setup_git_directory_gently() be called earlier
117
+ + setup: remember whether repository was found
118
+ + git wrapper: introduce startup_info struct
119
+ (this branch uses jn/maint-setup-fix.)
120
+
121
+* jn/svn-fe (2010-08-19) 17 commits
122
+ (merged to 'next' on 2010-08-19 at b1a242a)
123
+ + t/t9010-svn-fe.sh: add an +x bit to this test
124
+ (merged to 'next' on 2010-08-18 at 24ab19e)
125
+ + t9010 (svn-fe): avoid symlinks in test
126
+ + t9010 (svn-fe): use Unix-style path in URI
127
+ + vcs-svn: Avoid %z in format string
128
+ + vcs-svn: Rename dirent pool to build on Windows
129
+ + compat: add strtok_r()
130
+ + treap: style fix
131
+ + vcs-svn: remove build artifacts on "make clean"
132
+ + svn-fe manual: Clarify warning about deltas in dump files
133
+ + Update svn-fe manual
134
+ + SVN dump parser
135
+ + Infrastructure to write revisions in fast-export format
136
+ + Add stream helper library
137
+ + Add string-specific memory pool
138
+ + Add treap implementation
139
+ + Add memory pool library
140
+ + Introduce vcs-svn lib
141
+
142
+* np/maint-huge-delta-generation (2010-08-21) 1 commit
143
+ (merged to 'next' on 2010-08-21 at 5af7003)
144
+ + fix >4GiB source delta assertion failure
145
+
146
+* sg/rerere-gc-old-still-used (2010-07-13) 2 commits
147
+ (merged to 'next' on 2010-08-18 at 8bc4635)
148
+ + rerere: fix overeager gc
149
+ + mingw_utime(): handle NULL times parameter
150
+
151
+* tr/maint-no-unquote-plus (2010-07-24) 1 commit
152
+ (merged to 'next' on 2010-08-18 at b811248)
153
+ + Do not unquote + into ' ' in URLs
154
+
155
+I think this one is safe in the context of git (namely smart-http
156
+interface).
157
+
158
--------------------------------------------------
159
[New Topics]
160
161
+* ch/filter-branch-deprecate-remap-to-ancestor (2010-08-27) 1 commit
162
+ - filter-branch: retire --remap-to-ancestor
163
+
164
+* ch/maint-cannot-create-bundle-error (2010-08-27) 1 commit
165
+ - bundle: detect if bundle file cannot be created
166
+
167
+* rr/format-patch-count-without-merges (2010-08-28) 2 commits
168
+ - format-patch: Don't go over merge commits
169
+ - t4014-format-patch: Call test_tick before committing
170
+
171
+* ab/test-2 (2010-08-30) 51 commits
172
+ (merged to 'next' on 2010-08-31 at 9d56f47)
173
+ + tests: factor HOME=$(pwd) in test-lib.sh
174
+ + test-lib: use subshell instead of cd $new && .. && cd $old
175
+ + tests: simplify "missing PREREQ" message
176
+ + t/t0000-basic.sh: Run the passing TODO test inside its own test-lib
177
+ + test-lib: Allow overriding of TEST_DIRECTORY
178
+ + test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../
179
+ + test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../
180
+ + test: Introduce $GIT_BUILD_DIR
181
+ (merged to 'next' on 2010-08-18 at f88bdb1)
182
+ + cvs tests: do not touch test CVS repositories shipped with source
183
+ + t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite
184
+ + t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite
185
+ + t/t7105-reset-patch.sh: Add a PERL prerequisite
186
+ + t/t9001-send-email.sh: convert setup code to tests
187
+ + t/t9001-send-email.sh: change from skip_all=* to prereq skip
188
+ + t/t9001-send-email.sh: Remove needless PROG=* assignment
189
+ + t/t9600-cvsimport.sh: change from skip_all=* to prereq skip
190
+ + lib-patch-mode tests: change from skip_all=* to prereq skip
191
+ + t/t3701-add-interactive.sh: change from skip_all=* to prereq skip
192
+ + tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh
193
+ + t/Makefile: Create test-results dir for smoke target
194
+ + git-notes: Run partial expensive test everywhere
195
+ + t/t3300-funny-names: change from skip_all=* to prereq skip
196
+ + t/t3902-quoted: change from skip_all=* to prereq skip
197
+ + t/t4016-diff-quote: change from skip_all=* to prereq skip
198
+ + t/t5503-tagfollow: change from skip_all=* to prereq skip
199
+ + t/t7005-editor: change from skip_all=* to prereq skip
200
+ + t/t5705-clone-2gb: change from skip_all=* to prereq skip
201
+ + t/t1304-default-acl: change from skip_all=* to prereq skip
202
+ + t/README: Update "Skipping tests" to align with best practices
203
+ + t/t7800-difftool.sh: Skip with prereq on no PERL
204
+ + t/t5800-remote-helpers.sh: Skip with prereq on python <2.4
205
+ + t/t4004-diff-rename-symlink.sh: use three-arg <prereq>
206
+ + tests: implicitly skip SYMLINKS tests using <prereq>
207
+ + Makefile: make gcov invocation configurable
208
+ + t/README: Add a note about the dangers of coverage chasing
209
+ + t/README: A new section about test coverage
210
+ + Makefile: Add cover_db_html target
211
+ + Makefile: Add cover_db target
212
+ + Makefile: Split out the untested functions target
213
+ + Makefile: Include subdirectories in "make cover" reports
214
+ + gitignore: Ignore files generated by "make coverage"
215
+ + t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target
216
+ + t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh
217
+ + t/README: Document the Smoke testing
218
+ + tests: Infrastructure for Git smoke testing
219
+ + test-lib: Multi-prereq support only checked the last prereq
220
+ + tests: A SANITY test prereq for testing if we're root
221
+ + t/README: Document the predefined test prerequisites
222
+ + test-lib: Print missing prerequisites in test output
223
+ + test-lib: Add support for multiple test prerequisites
224
+ + test-lib: Don't write test-results when HARNESS_ACTIVE
225
+ (this branch is used by ab/test.)
226
+
227
+As I'd like to have this in the upcoming release, the tip of old ab/test
228
+topic has been rebuilt without the merge from ab/i18n topic.
229
+
230
+* as/daemon-multi-listen (2010-08-29) 2 commits
231
+ - daemon: allow more than one host address given via --listen
232
+ - daemon: add helper function setup_named_sock()
233
+
234
+I think the idea is sound. It came a bit late in the cycle for the next
235
+release and probably needs a bit more polish.
236
+
237
+* jc/pickaxe-grep (2010-08-31) 4 commits
238
+ - diff/log -G<pattern>: tests
239
+ - git log/diff: add -G<regexp> that greps in the patch text
240
+ - diff: pass the entire diff-options to diffcore_pickaxe()
241
+ - gitdiffcore doc: update pickaxe description
242
+
243
+This is a re-roll of "grepping inside the log -p output" which is a
244
+feature that is often asked for when people hear about -S option.
245
+
246
+* jh/error-removing-missing-note (2010-08-31) 1 commit
247
+ - notes: Don't create (empty) commit when removing non-existing notes
248
+
249
+Should be Ok to merge to 'next'; then will merge to 'master' shortly.
250
+
251
+* jk/test-must-fail-missing (2010-08-31) 4 commits
252
+ - tests: make test_might_fail fail on missing commands
253
+ - tests: make test_might_fail more verbose
254
+ - tests: make test_must_fail fail on missing commands
255
+ - tests: make test_must_fail more verbose
256
+
257
+Should be Ok to merge to 'next'; then will merge to 'master' shortly.
258
+
259
+* jl/fetch-submodule-recursive (2010-08-30) 2 commits
260
+ - Submodules: Add the new "fetch" config option for fetch and pull
261
+ - fetch/pull: Recursively fetch populated submodules
262
+
263
+I think the idea is sound and hopefully the end result will help the heavy
264
+users of subprojects. It came a bit late in the cycle for the next
265
+release, though.
266
+
267
+* kf/askpass-config (2010-08-30) 3 commits
268
+ - Extend documentation of core.askpass and GIT_ASKPASS.
269
+ - Allow core.askpass to override SSH_ASKPASS.
270
+ - Add a new option 'core.askpass'.
271
+
272
+Should be Ok to merge to 'next'; then will merge to 'master' shortly.
273
+
274
+* tf/churn (2010-09-01) 2 commits
275
+ - help.c: Pull cmd_version out of this file.
276
+ - builtin.h: Move two functions definitions to help.h.
277
+
278
+I don't like churning-for-the-sake-of-churning like these patches that
279
+does not solve real problems and instead adds potential new ones.
280
+
281
+At this point, adding the dashed-form "git-version" to the filesystem is
282
+going backwards. These files are only to help people who have old scripts
283
+from pre 1.6.0 days with "PATH=$(git --exec-path):$PATH" with their
284
+environment.
285
+
286
+We should instead try to not adding them (which would probably need tweak
287
+in the command list generation code in "git help"), as nobody from pre
288
+1.6.0 era would have called "git-version" binary.
289
+
290
+* jc/builtin-binsearch (2010-08-05) 2 commits
291
+ . git.c: binary search in the built-in command list
292
+ . git.c: sort the list of built-in command names
293
+
294
+* jc/tag-contains (2010-09-01) 1 commit
295
+ . tag --contains: refactoring WIP
296
+
297
+--------------------------------------------------
298
+[Stalled]
299
+
300
+* jj/icase-directory (2010-08-16) 6 commits
301
+ (merged to 'next' on 2010-08-26 at 9d8e1bc)
302
+ + Support case folding in git fast-import when core.ignorecase=true
303
+ + Support case folding for git add when core.ignorecase=true
304
+ + Add case insensitivity support when using git ls-files
305
+ + Add case insensitivity support for directories when using git status
306
+ + Case insensitivity support for .gitignore via core.ignorecase
307
+ + Add string comparison functions that respect the ignore_case variable.
308
+
309
+Depends on GNU FNM_CASEFOLD.
310
+
311
+* by/line-log (2010-08-11) 17 commits
312
+ (merged to 'next' on 2010-08-26 at a160ff1)
313
+ + Document line history browser
314
+ + Add tests for line history browser
315
+ + Add --full-line-diff option
316
+ + Add --graph prefix before line history output
317
+ + Add parent rewriting to line history browser
318
+ + Make graph_next_line external to other part of git
319
+ + Make rewrite_parents public to other part of git
320
+ + Hook line history into cmd_log, ensuring a topo-ordered walk
321
+ + Print the line log
322
+ + map/take range to the parent of commits
323
+ + Add range clone functions
324
+ + Export three functions from diff.c
325
+ + Parse the -L options
326
+ + Refactor parse_loc
327
+ + Add the basic data structure for line level history
328
+ + parse-options: add two helper functions
329
+ + parse-options: enhance STOP_AT_NON_OPTION
330
+
331
+There is a reported crash with valgrind trace. Bo seems to be looking
332
+into it.
333
+
334
+* il/rfc-remote-fd-ext (2010-08-26) 7 commits
335
+ - remote-ext/fd style fixup
336
+ - Fix build on Windows
337
+ - Simplify send_git_request()
338
+ - Rewrite bidirectional traffic loop
339
+ - gitignore: Ignore the new /git-remote-{ext,fd} helpers
340
+ - New remote helper: git-remote-ext
341
+ - New remote helper git-remote-fd
342
+
343
+Needs a bit of usage illustration (this does not seem to come with any
344
+documentation nor tests).
345
+
346
+* en/object-list-with-pathspec (2010-08-26) 2 commits
347
+ - Make rev-list --objects work together with pathspecs
348
+ - Add testcases showing how pathspecs are ignored with rev-list --objects
349
+
350
+Heard that this is still broken?
351
+
352
+* zl/mailinfo-recode-patch (2010-06-14) 2 commits
353
+ - add --recode-patch option to git-am
354
+ - add --recode-patch option to git-mailinfo
355
+
356
+I recall there was another round of re-roll planned for this one.
357
+
358
+* jk/tag-contains (2010-07-05) 4 commits
359
+ - Why is "git tag --contains" so slow?
360
+ - default core.clockskew variable to one day
361
+ - limit "contains" traversals based on commit timestamp
362
+ - tag: speed up --contains calculation
363
+
364
+The idea of the bottom one is probably Ok, except that the use of object
365
+flags needs to be rethought, or at least the helper needs to be moved to
366
+builtin/tag.c to make it clear that it should not be used outside the
367
+current usage context.
368
+
369
+--------------------------------------------------
370
+[Cooking]
371
+
372
* mg/doc-bundle (2010-08-23) 3 commits
373
(merged to 'next' on 2010-08-23 at 2251a51)
374
+ git-bundle.txt: Clarify rev-list-args restrictions
375
+ git-bundle.txt: whitespace cleanup
376
+ git-bundle.txt: Cleanup
377
23
-* jc/builtin-binsearch (2010-08-05) 2 commits
24
- . git.c: binary search in the built-in command list
25
- . git.c: sort the list of built-in command names
378
+Will merge to 'master' shortly.
379
380
* bc/maint-fetch-url-only (2010-08-25) 2 commits
381
- builtin/fetch.c: ignore merge config when not fetching from branch's remote
382
- t/t5510: demonstrate failure to fetch when current branch has merge ref
383
384
+Should be Ok to merge to 'next'; then will merge to 'master' shortly.
385
+
386
* jc/maint-doc-em-dash (2010-08-23) 1 commit
387
(merged to 'next' on 2010-08-24 at 2e4d30b)
388
+ Work around em-dash handling in newer AsciiDoc
389
390
+Will merge to 'master' shortly.
391
+
392
* jf/merge-ignore-ws (2010-08-26) 4 commits
393
- merge-recursive: options to ignore whitespace changes
394
- merge-recursive --patience
@@ -39,71 +396,69 @@ still holding onto them.
396
- merge-recursive: expose merge options for builtin merge
397
(this branch uses eb/double-convert-before-merge, jn/merge-renormalize and jn/merge-renormalize.)
398
399
+I think the idea is sound. It came a bit late in the cycle for the next
400
+release, though.
401
+
402
* jk/maint-pass-c-config-in-env (2010-08-24) 2 commits
403
- do not pass "git -c foo=bar" params to transport helpers
404
- pass "git -c foo=bar" params through environment
405
46
-* jl/submodule-ignore-diff (2010-08-25) 1 commit
406
+Should be Ok to merge to 'next'; then will merge to 'master' shortly.
407
+
408
+* jl/submodule-ignore-diff (2010-08-28) 3 commits
409
+ (merged to 'next' on 2010-08-31 at 4f21f92)
410
+ + checkout: Use submodule.*.ignore settings from .git/config and .gitmodules
411
+ + checkout: Add test for diff.ignoreSubmodules
412
(merged to 'next' on 2010-08-26 at af1c819)
413
+ checkout: respect diff.ignoreSubmodules setting
414
50
-* js/maint-reflog-beyond-horizon (2010-08-24) 3 commits
415
+I think the idea is sound. It came a bit late in the cycle for the next
416
+release, though.
417
+
418
+* js/maint-reflog-beyond-horizon (2010-09-01) 4 commits
419
+ (merged to 'next' on 2010-08-31 at d700755)
420
+ + t1503: fix broken test_must_fail calls
421
(merged to 'next' on 2010-08-26 at 4281562)
422
+ rev-parse: tests git rev-parse --verify master@{n}, for various n
423
+ sha1_name.c: use warning in preference to fprintf(stderr
424
+ rev-parse: exit with non-zero status if ref@{n} is not valid.
425
56
-* rr/fmt-merge-msg (2010-08-25) 3 commits
426
+* rr/fmt-merge-msg (2010-08-27) 5 commits
427
+ - t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
428
+ - t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length
429
- merge: Make 'merge.log' an integer or boolean option
430
- merge: Make '--log' an integer option for number of shortlog entries
431
- fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
432
(this branch uses jn/update-contrib-example-merge.)
433
434
+I think the idea is sound. It came a bit late in the cycle for the next
435
+release, though.
436
+
437
* tr/merge-unborn-clobber (2010-08-22) 1 commit
438
- Exhibit merge bug that clobbers index&WT
439
65
-* en/object-list-with-pathspec (2010-08-26) 2 commits
66
- - Make rev-list --objects work together with pathspecs
67
- - Add testcases showing how pathspecs are ignored with rev-list --objects
68
-
440
* en/tree-walk-optim (2010-08-26) 4 commits
441
- diff_tree(): Skip skip_uninteresting() when all remaining paths interesting
442
- tree_entry_interesting(): Make return value more specific
443
- tree-walk: Correct bitrotted comment about tree_entry()
444
- Document pre-condition for tree_entry_interesting
445
75
---------------------------------------------------
76
-[Stalled]
77
-
78
-* jc/log-grep (2010-08-23) 1 commit
79
- - git log: add -G<regexp> that greps in the patch text
80
-
81
-This is broken, but haven't found any time to revisit it yet.
82
-
83
-* zl/mailinfo-recode-patch (2010-06-14) 2 commits
84
- - add --recode-patch option to git-am
85
- - add --recode-patch option to git-mailinfo
86
-
87
-I recall there was another round of re-roll planned for this one.
88
-
89
-* jk/tag-contains (2010-07-05) 4 commits
90
- - Why is "git tag --contains" so slow?
91
- - default core.clockskew variable to one day
92
- - limit "contains" traversals based on commit timestamp
93
- - tag: speed up --contains calculation
94
-
95
---------------------------------------------------
96
-[Cooking]
97
-
446
+I think the idea is sound. For a patch that touches fairly core part of
447
+the system, it came a bit late in the cycle, though.
448
+
449
* jn/maint-doc-user-manual-html-doctype (2010-08-21) 2 commits
450
(merged to 'next' on 2010-08-26 at e9084af)
451
+ docs: fix Makefile dependency for user manual
452
+ Documentation: set a !DOCTYPE for user manual
453
454
+Will merge to 'master' shortly.
455
+
456
* cb/maint-mergetool-no-tty (2010-08-20) 1 commit
457
(merged to 'next' on 2010-08-26 at b14989a)
458
+ mergetool: Remove explicit references to /dev/tty
459
460
+Will merge to 'master' shortly.
461
+
462
* jn/doc-backslash (2010-08-20) 17 commits
463
(merged to 'next' on 2010-08-23 at 8c364b2)
464
+ Documentation: remove stray backslash in show-branch discussion
@@ -124,10 +479,14 @@ I recall there was another round of re-roll planned for this one.
479
+ Documentation: quoting trouble in "git rm" discussion
480
+ Documentation: tweak description of log.date
481
482
+Will merge to 'master' shortly.
483
+
484
* nd/clone-depth-zero (2010-08-23) 1 commit
485
(merged to 'next' on 2010-08-26 at b4491c3)
486
+ clone: warn users --depth is ignored in local clones
487
488
+Will merge to 'master' shortly.
489
+
490
* cb/ignored-paths-are-precious (2010-08-21) 1 commit
491
- checkout/merge: optionally fail operation when ignored files need to be overwritten
492
@@ -140,11 +499,10 @@ area that needs to be addressed---they do not have to be part of this
499
series but their reproduction recipe would belong to the test script for
500
this topic.
501
143
-* np/maint-huge-delta-generation (2010-08-21) 1 commit
144
- (merged to 'next' on 2010-08-21 at 5af7003)
145
- + fix >4GiB source delta assertion failure
146
-
147
-Will merge to 'master' shortly.
502
+It may hurt users to make the new feature on by default, especially the
503
+ones with subdirectories that come and go. For a patch that changes a
504
+long established semantics, it came a bit late in the cycle, so it will
505
+have to wait until the next release.
506
507
* jn/apply-filename-with-sp (2010-08-18) 3 commits
508
(merged to 'next' on 2010-08-26 at 4f60840)
@@ -152,36 +510,6 @@ Will merge to 'master' shortly.
510
+ tests: exercise "git apply" with weird filenames
511
+ apply: split quoted filename handling into new function
512
155
-* ab/maint-reset-mixed-w-pathspec-advice (2010-08-15) 1 commit
156
- (merged to 'next' on 2010-08-21 at b09ee46)
157
- + reset: suggest what to do upon "git reset --mixed <paths>"
158
-
159
-Will merge to 'master' shortly.
160
-
161
-* cb/binary-patch-id (2010-08-15) 1 commit
162
- (merged to 'next' on 2010-08-21 at ff38c3e)
163
- + hash binary sha1 into patch id
164
-
165
-Will merge to 'master' shortly.
166
-
167
-* jj/icase-directory (2010-08-16) 6 commits
168
- (merged to 'next' on 2010-08-26 at 9d8e1bc)
169
- + Support case folding in git fast-import when core.ignorecase=true
170
- + Support case folding for git add when core.ignorecase=true
171
- + Add case insensitivity support when using git ls-files
172
- + Add case insensitivity support for directories when using git status
173
- + Case insensitivity support for .gitignore via core.ignorecase
174
- + Add string comparison functions that respect the ignore_case variable.
175
-
176
-* jn/cherry-revert-message-clean-up (2010-08-18) 5 commits
177
- (merged to 'next' on 2010-08-21 at 09b123c)
178
- + tests: fix syntax error in "Use advise() for hints" test
179
- + cherry-pick/revert: Use advise() for hints
180
- + cherry-pick/revert: Use error() for failure message
181
- + Introduce advise() to print hints
182
- + Eliminate “Finished cherry-pick/revert” message
183
- (this branch uses cc/revert.)
184
-
513
Will merge to 'master' shortly.
514
515
* jn/merge-custom-no-trivial (2010-08-23) 3 commits
@@ -191,9 +519,14 @@ Will merge to 'master' shortly.
519
+ merge: let custom strategies intervene in trivial merges
520
+ t7606 (merge-theirs): modernize style
521
194
-* po/etc-gitattributes (2010-08-16) 1 commit
522
+Will merge to 'master' shortly.
523
+
524
+* po/etc-gitattributes (2010-09-01) 1 commit
525
- Add global and system-wide gitattributes
526
527
+I think the idea is sound. For a patch that touches fairly core part of
528
+the system, it came a bit late in the cycle, though.
529
+
530
* ab/compat-regex (2010-08-26) 9 commits
531
(merged to 'next' on 2010-08-26 at c5cc9d2)
532
+ Fix compat/regex ANSIfication on MinGW
@@ -208,10 +541,6 @@ Will merge to 'master' shortly.
541
+ compat/regex: get the gawk regex engine to compile within git
542
+ compat/regex: use the regex engine from gawk for compat
543
211
-* da/fix-submodule-sync-superproject-config (2010-08-18) 1 commit
212
- (merged to 'next' on 2010-08-21 at e96772a)
213
- + submodule sync: Update "submodule.<name>.url"
214
-
544
Will merge to 'master' shortly.
545
546
* jn/update-contrib-example-merge (2010-08-17) 24 commits
@@ -242,84 +571,6 @@ Will merge to 'master' shortly.
571
+ merge: do not mistake (ancestor of) tag for branch
572
(this branch is used by rr/fmt-merge-msg.)
573
245
-* ab/test (2010-08-24) 49 commits
246
- (merged to 'next' on 2010-08-26 at fb6a7cf)
247
- + tests: simplify "missing PREREQ" message
248
- + t/t0000-basic.sh: Run the passing TODO test inside its own test-lib
249
- + test-lib: Allow overriding of TEST_DIRECTORY
250
- + test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../
251
- + test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../
252
- + Merge branch 'ab/i18n' into ab/test-1
253
- (merged to 'next' on 2010-08-18 at f88bdb1)
254
- + cvs tests: do not touch test CVS repositories shipped with source
255
- + t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite
256
- + t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite
257
- + t/t7105-reset-patch.sh: Add a PERL prerequisite
258
- + t/t9001-send-email.sh: convert setup code to tests
259
- + t/t9001-send-email.sh: change from skip_all=* to prereq skip
260
- + t/t9001-send-email.sh: Remove needless PROG=* assignment
261
- + t/t9600-cvsimport.sh: change from skip_all=* to prereq skip
262
- + lib-patch-mode tests: change from skip_all=* to prereq skip
263
- + t/t3701-add-interactive.sh: change from skip_all=* to prereq skip
264
- + tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh
265
- + t/Makefile: Create test-results dir for smoke target
266
- + git-notes: Run partial expensive test everywhere
267
- + t/t3300-funny-names: change from skip_all=* to prereq skip
268
- + t/t3902-quoted: change from skip_all=* to prereq skip
269
- + t/t4016-diff-quote: change from skip_all=* to prereq skip
270
- + t/t5503-tagfollow: change from skip_all=* to prereq skip
271
- + t/t7005-editor: change from skip_all=* to prereq skip
272
- + t/t5705-clone-2gb: change from skip_all=* to prereq skip
273
- + t/t1304-default-acl: change from skip_all=* to prereq skip
274
- + t/README: Update "Skipping tests" to align with best practices
275
- + t/t7800-difftool.sh: Skip with prereq on no PERL
276
- + t/t5800-remote-helpers.sh: Skip with prereq on python <2.4
277
- + t/t4004-diff-rename-symlink.sh: use three-arg <prereq>
278
- + tests: implicitly skip SYMLINKS tests using <prereq>
279
- + Makefile: make gcov invocation configurable
280
- + t/README: Add a note about the dangers of coverage chasing
281
- + t/README: A new section about test coverage
282
- + Makefile: Add cover_db_html target
283
- + Makefile: Add cover_db target
284
- + Makefile: Split out the untested functions target
285
- + Makefile: Include subdirectories in "make cover" reports
286
- + gitignore: Ignore files generated by "make coverage"
287
- + t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target
288
- + t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh
289
- + t/README: Document the Smoke testing
290
- + tests: Infrastructure for Git smoke testing
291
- + test-lib: Multi-prereq support only checked the last prereq
292
- + tests: A SANITY test prereq for testing if we're root
293
- + t/README: Document the predefined test prerequisites
294
- + test-lib: Print missing prerequisites in test output
295
- + test-lib: Add support for multiple test prerequisites
296
- + test-lib: Don't write test-results when HARNESS_ACTIVE
297
- (this branch uses ab/i18n.)
298
-
299
-* dj/fetch-tagopt (2010-08-11) 1 commit
300
- (merged to 'next' on 2010-08-21 at 737dfec)
301
- + fetch: allow command line --tags to override config
302
-
303
-Will merge to 'master' shortly.
304
-
305
-* jn/paginate-fix (2010-08-16) 14 commits
306
- (merged to 'next' on 2010-08-18 at bb04a13)
307
- + t7006 (pager): add missing TTY prerequisites
308
- + merge-file: run setup_git_directory_gently() sooner
309
- + var: run setup_git_directory_gently() sooner
310
- + ls-remote: run setup_git_directory_gently() sooner
311
- + index-pack: run setup_git_directory_gently() sooner
312
- + Merge branch 'jn/maint-setup-fix' (early part) into jn/paginate-fix
313
- + config: run setup_git_directory_gently() sooner
314
- + bundle: run setup_git_directory_gently() sooner
315
- + apply: run setup_git_directory_gently() sooner
316
- + grep: run setup_git_directory_gently() sooner
317
- + shortlog: run setup_git_directory_gently() sooner
318
- + git wrapper: allow setup_git_directory_gently() be called earlier
319
- + setup: remember whether repository was found
320
- + git wrapper: introduce startup_info struct
321
- (this branch uses jn/maint-setup-fix.)
322
-
574
Will merge to 'master' shortly.
575
576
* jn/merge-renormalize (2010-08-05) 12 commits
@@ -338,59 +589,17 @@ Will merge to 'master' shortly.
589
+ t6038 (merge.renormalize): style nitpicks
590
(this branch is used by jf/merge-ignore-ws and jf/merge-ignore-ws; uses eb/double-convert-before-merge.)
591
592
+Will merge to 'master' shortly.
593
+
594
* eb/double-convert-before-merge (2010-07-02) 3 commits
595
+ Don't expand CRLFs when normalizing text during merge
596
+ Try normalizing files to avoid delete/modify conflicts when merging
597
+ Avoid conflicts when merging branches with mixed normalization
598
(this branch is used by jf/merge-ignore-ws and jn/merge-renormalize.)
599
347
-* by/line-log (2010-08-11) 17 commits
348
- (merged to 'next' on 2010-08-26 at a160ff1)
349
- + Document line history browser
350
- + Add tests for line history browser
351
- + Add --full-line-diff option
352
- + Add --graph prefix before line history output
353
- + Add parent rewriting to line history browser
354
- + Make graph_next_line external to other part of git
355
- + Make rewrite_parents public to other part of git
356
- + Hook line history into cmd_log, ensuring a topo-ordered walk
357
- + Print the line log
358
- + map/take range to the parent of commits
359
- + Add range clone functions
360
- + Export three functions from diff.c
361
- + Parse the -L options
362
- + Refactor parse_loc
363
- + Add the basic data structure for line level history
364
- + parse-options: add two helper functions
365
- + parse-options: enhance STOP_AT_NON_OPTION
366
-
367
-Not entirely happy with the command line parser, but will merge to 'next'
368
-after giving the series another look.
369
-
370
-* jn/svn-fe (2010-08-19) 17 commits
371
- (merged to 'next' on 2010-08-19 at b1a242a)
372
- + t/t9010-svn-fe.sh: add an +x bit to this test
373
- (merged to 'next' on 2010-08-18 at 24ab19e)
374
- + t9010 (svn-fe): avoid symlinks in test
375
- + t9010 (svn-fe): use Unix-style path in URI
376
- + vcs-svn: Avoid %z in format string
377
- + vcs-svn: Rename dirent pool to build on Windows
378
- + compat: add strtok_r()
379
- + treap: style fix
380
- + vcs-svn: remove build artifacts on "make clean"
381
- + svn-fe manual: Clarify warning about deltas in dump files
382
- + Update svn-fe manual
383
- + SVN dump parser
384
- + Infrastructure to write revisions in fast-export format
385
- + Add stream helper library
386
- + Add string-specific memory pool
387
- + Add treap implementation
388
- + Add memory pool library
389
- + Introduce vcs-svn lib
390
-
391
-Will merge to 'master' shortly.
392
-
393
-* js/detached-stash (2010-08-21) 9 commits
600
+* js/detached-stash (2010-09-01) 10 commits
601
+ (merged to 'next' on 2010-08-31 at 7d20c13)
602
+ + t3903: fix broken test_must_fail calls
603
(merged to 'next' on 2010-08-26 at 7180a87)
604
+ detached-stash: update Documentation
605
+ detached-stash: tests of git stash with stash-like arguments
@@ -402,7 +611,12 @@ Will merge to 'master' shortly.
611
+ detached-stash: work around git rev-parse failure to detect bad log refs
612
+ detached-stash: introduce parse_flags_and_revs function
613
405
-* gb/shell-ext (2010-08-24) 4 commits
614
+Will merge to 'master' shortly.
615
+
616
+* gb/shell-ext (2010-08-27) 6 commits
617
+ (merged to 'next' on 2010-08-27 at e1ef3c1)
618
+ + shell: Display errors from improperly-formatted command lines
619
+ + Merge branch 'gb/split-cmdline-errmsg' into gb/shell-ext
620
(merged to 'next' on 2010-08-24 at 49ea7b8)
621
+ shell: Rewrite documentation and improve error message
622
+ Add sample commands for git-shell
@@ -413,92 +627,51 @@ I am not very happy about adding these backdoors to git-shell, which is
627
primarily a security mechanism, and obviously security and backdoor do not
628
mix well.
629
416
-* jn/maint-setup-fix (2010-07-24) 11 commits
417
- (merged to 'next' on 2010-08-18 at ded5f4d)
418
- + setup: split off a function to handle ordinary .git directories
419
- + Revert "rehabilitate 'git index-pack' inside the object store"
420
- + setup: do not forget working dir from subdir of gitdir
421
- + t4111 (apply): refresh index before applying patches to it
422
- + setup: split off get_device_or_die helper
423
- + setup: split off a function to handle hitting ceiling in repo search
424
- + setup: split off code to handle stumbling upon a repository
425
- + setup: split off a function to checks working dir for .git file
426
- + setup: split off $GIT_DIR-set case from setup_git_directory_gently
427
- + tests: try git apply from subdir of toplevel
428
- + t1501 (rev-parse): clarify
429
- (this branch is used by jn/paginate-fix.)
430
-
431
-Will merge to 'master' shortly.
432
-
433
-* tr/maint-no-unquote-plus (2010-07-24) 1 commit
434
- (merged to 'next' on 2010-08-18 at b811248)
435
- + Do not unquote + into ' ' in URLs
436
-
437
-I think this one is safe in the context of git (namely smart-http
438
-interface).
439
-
440
-Will merge to 'master' shortly.
441
-
442
-* cc/revert (2010-07-21) 5 commits
443
- (merged to 'next' on 2010-08-14 at a910d5a)
444
- + t3508: add check_head_differs_from() helper function and use it
445
- + revert: improve success message by adding abbreviated commit sha1
446
- + revert: don't print "Finished one cherry-pick." if commit failed
447
- + revert: refactor commit code into a new run_git_commit() function
448
- + revert: report success when using option --strategy
449
- (this branch is used by jn/cherry-revert-message-clean-up.)
450
-
451
-* en/fast-export-fix (2010-07-17) 2 commits
452
- (merged to 'next' on 2010-08-18 at 9fdaf27)
453
- + fast-export: Add a --full-tree option
454
- + fast-export: Fix dropping of files with --import-marks and path limiting
455
-
456
-Will merge to 'master' shortly.
457
-
458
-* hv/autosquash-config (2010-07-14) 1 commit
459
- (merged to 'next' on 2010-08-18 at 03a8eec)
460
- + add configuration variable for --autosquash option of interactive rebase
461
-
462
-Will merge to 'master' shortly.
463
-
464
-* il/rfc-remote-fd-ext (2010-08-14) 6 commits
465
- - Fix build on Windows
466
- - Simplify send_git_request()
467
- - Rewrite bidirectional traffic loop
468
- - gitignore: Ignore the new /git-remote-{ext,fd} helpers
469
- - New remote helper: git-remote-ext
470
- - New remote helper git-remote-fd
471
-
472
-* sg/rerere-gc-old-still-used (2010-07-13) 2 commits
473
- (merged to 'next' on 2010-08-18 at 8bc4635)
474
- + rerere: fix overeager gc
475
- + mingw_utime(): handle NULL times parameter
476
-
477
-Will merge to 'master' shortly.
630
+* ab/i18n (2010-08-31) 23 commits
631
+ - gettext: Make NO_GETTEXT=YesPlease the default in releases
632
+ - gettext tests: test message re-encoding under C
633
+ - po/pl.po: add Polish translation
634
+ - po/is.po: add Icelandic translation
635
+ - po/is.po: msgmerge and add Language: header
636
+ - gettext tests: mark a test message as not needing translation
637
+ - gettext tests: test re-encoding with a UTF-8 msgid under Shell
638
+ - gettext tests: test message re-encoding under Shell
639
+ - gettext tests: add detection for is_IS.ISO-8859-1 locale
640
+ - gettext tests: update test/is.po to match t/t0200/test.c
641
+ - gettext tests: test if $VERSION exists before using it
642
+ - gettext.c: work around us not using setlocale(LC_CTYPE, "")
643
+ - gettext: localize the main git-init message
644
+ - gettext: make the simple parts of git-init localizable
645
+ - builtin.h: Include gettext.h
646
+ - Makefile: use variables and shorter lines for xgettext
647
+ - Makefile: tell xgettext(1) that our source is in UTF-8
648
+ - Makefile: provide a --msgid-bugs-address to xgettext(1)
649
+ - Makefile: A variable for options used by xgettext(1) calls
650
+ - tests: locate i18n lib&data correctly under --valgrind
651
+ - gettext: setlocale(LC_CTYPE, "") breaks Git's C function assumptions
652
+ - tests: rename test to work around GNU gettext bug
653
+ - Add infrastructure for translating Git with gettext
654
+ (this branch is used by ab/test.)
655
479
-* en/d-f-conflict-fix (2010-08-20) 12 commits
480
- (merged to 'next' on 2010-08-20 at af7f2b0)
481
- + merge-recursive: Avoid excessive output for and reprocessing of renames
482
- (merged to 'next' on 2010-08-18 at 6be0f13)
483
- + merge-recursive: Fix multiple file rename across D/F conflict
484
- + t6031: Add a testcase covering multiple renames across a D/F conflict
485
- + merge-recursive: Fix typo
486
- (merged to 'next' on 2010-08-14 at 1c9b0f5)
487
- + Mark tests that use symlinks as needing SYMLINKS prerequisite
488
- (merged to 'next' on 2010-08-03 at 7f78604)
489
- + t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
490
- + fast-import: Improve robustness when D->F changes provided in wrong order
491
- + fast-export: Fix output order of D/F changes
492
- + merge_recursive: Fix renames across paths below D/F conflicts
493
- + merge-recursive: Fix D/F conflicts
494
- + Add a rename + D/F conflict testcase
495
- + Add additional testcases for D/F conflicts
656
+Kicked back to 'pu' to give it a bit more time to experiment with a
657
+Porcelain command or a two, and an opportunity for a fresh restart if
658
+necessary in the next cycle.
659
497
-Will merge to 'master' shortly.
660
+--------------------------------------------------
661
+[Ejected]
662
499
-* ab/i18n (2010-07-25) 4 commits
500
- + tests: locate i18n lib&data correctly under --valgrind
501
- + gettext: setlocale(LC_CTYPE, "") breaks Git's C function assumptions
502
- + tests: rename test to work around GNU gettext bug
503
- + Add infrastructure for translating Git with gettext
504
- (this branch is used by ab/test.)
663
+* jc/log-grep (2010-08-23) 1 commit
664
+ . git log: add -G<regexp> that greps in the patch text
665
+
666
+* ab/test (2010-08-30) 8 commits
667
+ . tests: factor HOME=$(pwd) in test-lib.sh
668
+ . test-lib: use subshell instead of cd $new && .. && cd $old
669
+ . tests: simplify "missing PREREQ" message
670
+ . t/t0000-basic.sh: Run the passing TODO test inside its own test-lib
671
+ . test-lib: Allow overriding of TEST_DIRECTORY
672
+ . test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../
673
+ . test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../
674
+ . Merge branch 'ab/i18n' into ab/test-1
675
+ (this branch uses ab/i18n and ab/test-2.)
676
+
677
+Rebuilt as 'ab/test-2'.