What's cooking (2010/09 #03)
Junio C Hamano committed
Sep 10, 2010 at 12:03 UTC
875fc311541f6361964239ced9c4d22534558044
1 file changed
+211
-292
whats-cooking.txt
+211
-292
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Sep 2010, #02; Mon, 6)
3
-X-master-at: 4682693e9ccc04252d0fad6f5627fc056abcdbba
4
-X-next-at: dbf0d4b6cc543fc5bf9b1b20149324fff6736c38
2
+Subject: What's cooking in git.git (Sep 2010, #03; Fri, 10)
3
+X-master-at: 3b3a8ed4beadf5d9437597108355b23c7143bc81
4
+X-next-at: 6997c032819c723ef892e89b21b9bf245420086d
5
6
-What's cooking in git.git (Sep 2010, #02; Mon, 6)
6
+What's cooking in git.git (Sep 2010, #03; Fri, 10)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,229 +11,104 @@ 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
-There are a few leftover bits in 'next' that need to be merged to 'master'
15
-before we declare a real -rc cycle, so tonight's pushout is -rc0.
14
+We have in 'master' is more-or-less the final 1.7.3; it is tagged as rc1.
15
+
16
+Please give it a good beating to find regressions.
17
18
--------------------------------------------------
18
-[Graduated to "master"]
19
+[New Topics]
20
+
21
+* jl/fix-test (2010-09-07) 7 commits
22
+ (merged to 'next' on 2010-09-10 at 849b1bb)
23
+ + t1020: Get rid of 'cd "$HERE"' at the start of each test
24
+ + t2016 (checkout -p): add missing &&
25
+ + t1302 (core.repositoryversion): style tweaks
26
+ + t2105 (gitfile): add missing &&
27
+ + t1450 (fsck): remove dangling objects
28
+ + tests: subshell indentation stylefix
29
+ + Merge branch 'jl/maint-fix-test'
30
+ (this branch uses jl/maint-fix-test.)
31
+
32
+* jl/maint-fix-test (2010-09-06) 1 commit
33
+ + Several tests: cd inside subshell instead of around
34
+ (this branch is used by jl/fix-test.)
35
+
36
+* nd/index-doc (2010-09-06) 1 commit
37
+ (merged to 'next' on 2010-09-10 at 2ab8572)
38
+ + doc: technical details about the index file format
39
+
40
+Half-written but it is a good start.
41
+
42
+* tr/send-email-refuse-sending-unedited-cover-letter (2009-06-08) 1 commit
43
+ - send-email: Refuse to send cover-letter template subject
44
+
45
+* bc/describe-not-dirty-for-untracked-paths-in-submodule (2010-09-09) 1 commit
46
+ - builtin/describe.c: ignore untracked changes in submodules
47
+
48
+* bc/fortran-userdiff (2010-09-10) 1 commit
49
+ (merged to 'next' on 2010-09-10 at b76b831)
50
+ + userdiff.c: add builtin fortran regex patterns
51
+
52
+* en/rename-d-f (2010-09-08) 2 commits
53
+ - merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
54
+ - t3509: Add rename + D/F conflict testcase that recursive strategy fails
55
+
56
+* jk/read-tree-empty (2010-09-10) 1 commit
57
+ (merged to 'next' on 2010-09-10 at 2f3a995)
58
+ + read-tree: deprecate syntax without tree-ish args
59
20
-* ab/compat-regex (2010-08-26) 9 commits
21
- (merged to 'next' on 2010-08-26 at c5cc9d2)
22
- + Fix compat/regex ANSIfication on MinGW
23
- (merged to 'next' on 2010-08-22 at 40bce7c)
24
- + autoconf: regex library detection typofix
25
- (merged to 'next' on 2010-08-21 at 632d60f)
26
- + autoconf: don't use platform regex if it lacks REG_STARTEND
27
- + t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND
28
- + compat/regex: get rid of old-style definition
29
- + compat/regex: define out variables only used under RE_ENABLE_I18N
30
- + Change regerror() declaration from K&R style to ANSI C (C89)
31
- + compat/regex: get the gawk regex engine to compile within git
32
- + compat/regex: use the regex engine from gawk for compat
33
-
34
-This may need a yet another fix-up for MinGW.
35
-
36
-* ab/test-2 (2010-08-30) 51 commits
37
- (merged to 'next' on 2010-08-31 at 9d56f47)
38
- + tests: factor HOME=$(pwd) in test-lib.sh
39
- + test-lib: use subshell instead of cd $new && .. && cd $old
40
- + tests: simplify "missing PREREQ" message
41
- + t/t0000-basic.sh: Run the passing TODO test inside its own test-lib
42
- + test-lib: Allow overriding of TEST_DIRECTORY
43
- + test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../
44
- + test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../
45
- + test: Introduce $GIT_BUILD_DIR
46
- (merged to 'next' on 2010-08-18 at f88bdb1)
47
- + cvs tests: do not touch test CVS repositories shipped with source
48
- + t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite
49
- + t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite
50
- + t/t7105-reset-patch.sh: Add a PERL prerequisite
51
- + t/t9001-send-email.sh: convert setup code to tests
52
- + t/t9001-send-email.sh: change from skip_all=* to prereq skip
53
- + t/t9001-send-email.sh: Remove needless PROG=* assignment
54
- + t/t9600-cvsimport.sh: change from skip_all=* to prereq skip
55
- + lib-patch-mode tests: change from skip_all=* to prereq skip
56
- + t/t3701-add-interactive.sh: change from skip_all=* to prereq skip
57
- + tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh
58
- + t/Makefile: Create test-results dir for smoke target
59
- + git-notes: Run partial expensive test everywhere
60
- + t/t3300-funny-names: change from skip_all=* to prereq skip
61
- + t/t3902-quoted: change from skip_all=* to prereq skip
62
- + t/t4016-diff-quote: change from skip_all=* to prereq skip
63
- + t/t5503-tagfollow: change from skip_all=* to prereq skip
64
- + t/t7005-editor: change from skip_all=* to prereq skip
65
- + t/t5705-clone-2gb: change from skip_all=* to prereq skip
66
- + t/t1304-default-acl: change from skip_all=* to prereq skip
67
- + t/README: Update "Skipping tests" to align with best practices
68
- + t/t7800-difftool.sh: Skip with prereq on no PERL
69
- + t/t5800-remote-helpers.sh: Skip with prereq on python <2.4
70
- + t/t4004-diff-rename-symlink.sh: use three-arg <prereq>
71
- + tests: implicitly skip SYMLINKS tests using <prereq>
72
- + Makefile: make gcov invocation configurable
73
- + t/README: Add a note about the dangers of coverage chasing
74
- + t/README: A new section about test coverage
75
- + Makefile: Add cover_db_html target
76
- + Makefile: Add cover_db target
77
- + Makefile: Split out the untested functions target
78
- + Makefile: Include subdirectories in "make cover" reports
79
- + gitignore: Ignore files generated by "make coverage"
80
- + t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target
81
- + t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh
82
- + t/README: Document the Smoke testing
83
- + tests: Infrastructure for Git smoke testing
84
- + test-lib: Multi-prereq support only checked the last prereq
85
- + tests: A SANITY test prereq for testing if we're root
86
- + t/README: Document the predefined test prerequisites
87
- + test-lib: Print missing prerequisites in test output
88
- + test-lib: Add support for multiple test prerequisites
89
- + test-lib: Don't write test-results when HARNESS_ACTIVE
90
-
91
-* cb/maint-mergetool-no-tty (2010-08-20) 1 commit
92
- (merged to 'next' on 2010-08-26 at b14989a)
93
- + mergetool: Remove explicit references to /dev/tty
94
-
95
-* eb/double-convert-before-merge (2010-07-02) 3 commits
96
- + Don't expand CRLFs when normalizing text during merge
97
- + Try normalizing files to avoid delete/modify conflicts when merging
98
- + Avoid conflicts when merging branches with mixed normalization
99
- (this branch is used by jf/merge-ignore-ws and jn/merge-renormalize.)
100
-
101
-* jc/maint-doc-em-dash (2010-08-23) 1 commit
102
- (merged to 'next' on 2010-08-24 at 2e4d30b)
103
- + Work around em-dash handling in newer AsciiDoc
104
-
105
-* jl/submodule-ignore-diff (2010-08-28) 3 commits
106
- (merged to 'next' on 2010-08-31 at 4f21f92)
107
- + checkout: Use submodule.*.ignore settings from .git/config and .gitmodules
108
- + checkout: Add test for diff.ignoreSubmodules
109
- (merged to 'next' on 2010-08-26 at af1c819)
110
- + checkout: respect diff.ignoreSubmodules setting
111
-
112
-* jn/apply-filename-with-sp (2010-08-18) 3 commits
113
- (merged to 'next' on 2010-08-26 at 4f60840)
114
- + apply: handle traditional patches with space in filename
115
- + tests: exercise "git apply" with weird filenames
116
- + apply: split quoted filename handling into new function
117
-
118
-* jn/doc-backslash (2010-08-20) 17 commits
119
- (merged to 'next' on 2010-08-23 at 8c364b2)
120
- + Documentation: remove stray backslash in show-branch discussion
121
- + Documentation: remove stray backslashes from "Fighting regressions" article
122
- + Documentation: do not convert ... operator to ellipses
123
- + Documentation: avoid stray backslash in user manual
124
- + Documentation: avoid stray backslashes in core tutorial
125
- + Documentation: remove stray backslashes in rev-parse manual
126
- + Documentation: remove backslash before ~ in fast-import manual
127
- + Documentation: remove stray backslash from "git bundle" manual
128
- + Documentation/technical: avoid stray backslash in parse-options API docs
129
- + Documentation: remove backslashes in manpage synopses
130
- + Documentation: clarify quoting in gitignore docs
131
- + Documentation: clarify quoting in "git rm" example
132
- + Documentation: add missing quotes to "git grep" examples
133
- + Documentation: clarify quoting in "git add" example
134
- + Documentation: unbreak regex in show-ref manual
135
- + Documentation: quoting trouble in "git rm" discussion
136
- + Documentation: tweak description of log.date
137
-
138
-* jn/maint-doc-user-manual-html-doctype (2010-08-21) 2 commits
139
- (merged to 'next' on 2010-08-26 at e9084af)
140
- + docs: fix Makefile dependency for user manual
141
- + Documentation: set a !DOCTYPE for user manual
142
-
143
-* jn/merge-custom-no-trivial (2010-08-23) 3 commits
144
- (merged to 'next' on 2010-08-24 at d9e5b2d)
145
- + t7606: Avoid using head as a file name
146
- (merged to 'next' on 2010-08-21 at 674498b)
147
- + merge: let custom strategies intervene in trivial merges
148
- + t7606 (merge-theirs): modernize style
149
-
150
-* jn/merge-renormalize (2010-08-05) 12 commits
151
- (merged to 'next' on 2010-08-18 at d9aa77b)
152
- + merge-recursive --renormalize
153
- + rerere: never renormalize
154
- + rerere: migrate to parse-options API
155
- + t4200 (rerere): modernize style
156
- + ll-merge: let caller decide whether to renormalize
157
- + ll-merge: make flag easier to populate
158
- + Documentation/technical: document ll_merge
159
- + merge-trees: let caller decide whether to renormalize
160
- + merge-trees: push choice to renormalize away from low level
161
- + t6038 (merge.renormalize): check that it can be turned off
162
- + t6038 (merge.renormalize): try checkout -m and cherry-pick
163
- + t6038 (merge.renormalize): style nitpicks
164
- (this branch is used by jf/merge-ignore-ws and jf/merge-ignore-ws; uses eb/double-convert-before-merge.)
165
-
166
-* jn/update-contrib-example-merge (2010-08-17) 24 commits
167
- (merged to 'next' on 2010-08-21 at 41b5c4d)
168
- + merge script: learn --[no-]rerere-autoupdate
169
- + merge script: notice @{-1} shorthand
170
- + merge script: handle --no-ff --no-commit correctly
171
- + merge script: --ff-only to disallow true merge
172
- + merge script: handle many-way octopus
173
- + merge script: handle -m --log correctly
174
- + merge script: forbid merge -s index
175
- + merge script: allow custom strategies
176
- + merge script: merge -X<option>
177
- + merge script: improve log message subject
178
- + merge script: refuse to merge during merge
179
- + merge script: tweak unmerged files message to match builtin
180
- + merge script: --squash, --ff from unborn branch are errors
181
- + fmt-merge-msg -m to override merge title
182
- + merge-base --independent to print reduced parent list in a merge
183
- + merge-base --octopus to mimic show-branch --merge-base
184
- + Documentation: add a SEE ALSO section for merge-base
185
- + t6200 (fmt-merge-msg): style nitpicks
186
- + t6010 (merge-base): modernize style
187
- + t7600 (merge): test merge from branch yet to be born
188
- + t7600 (merge): check reflog entry
189
- + t7600 (merge): do not launch gitk for --debug
190
- + t7600 (merge): modernize style
191
- + merge: do not mistake (ancestor of) tag for branch
192
- (this branch is used by rr/fmt-merge-msg.)
193
-
194
-* js/detached-stash (2010-09-01) 10 commits
195
- (merged to 'next' on 2010-08-31 at 7d20c13)
196
- + t3903: fix broken test_must_fail calls
197
- (merged to 'next' on 2010-08-26 at 7180a87)
198
- + detached-stash: update Documentation
199
- + detached-stash: tests of git stash with stash-like arguments
200
- + detached-stash: simplify git stash show
201
- + detached-stash: simplify git stash branch
202
- + detached-stash: refactor git stash pop implementation
203
- + detached-stash: simplify stash_drop
204
- + detached-stash: simplify stash_apply
205
- + detached-stash: work around git rev-parse failure to detect bad log refs
206
- + detached-stash: introduce parse_flags_and_revs function
207
-
208
-* js/maint-reflog-beyond-horizon (2010-09-01) 4 commits
209
- (merged to 'next' on 2010-08-31 at d700755)
210
- + t1503: fix broken test_must_fail calls
211
- (merged to 'next' on 2010-08-26 at 4281562)
212
- + rev-parse: tests git rev-parse --verify master@{n}, for various n
213
- + sha1_name.c: use warning in preference to fprintf(stderr
214
- + rev-parse: exit with non-zero status if ref@{n} is not valid.
215
-
216
-* mg/doc-bundle (2010-08-23) 3 commits
217
- (merged to 'next' on 2010-08-23 at 2251a51)
218
- + git-bundle.txt: Clarify rev-list-args restrictions
219
- + git-bundle.txt: whitespace cleanup
220
- + git-bundle.txt: Cleanup
221
-
222
-* nd/clone-depth-zero (2010-08-23) 1 commit
223
- (merged to 'next' on 2010-08-26 at b4491c3)
224
- + clone: warn users --depth is ignored in local clones
60
+* kf/post-receive-sample-hook (2010-09-10) 1 commit
61
+ (merged to 'next' on 2010-09-10 at 53ebeba)
62
+ + post-receive-email: ensure sent messages are not empty
63
+
64
+* ml/completion-zsh (2010-09-06) 1 commit
65
+ (merged to 'next' on 2010-09-10 at b509ebc)
66
+ + completion: make compatible with zsh
67
+
68
+* os/fix-rebase-diff-no-prefix (2010-09-09) 1 commit
69
+ (merged to 'next' on 2010-09-10 at f1acd10)
70
+ + Add --src/dst-prefix to git-formt-patch in git-rebase.sh
71
72
--------------------------------------------------
227
-[New Topics]
73
+[Graduated to "master"]
74
229
-* ks/recursive-rename-add-identical (2010-09-01) 1 commit
230
- (merged to 'next' on 2010-09-03 at 1a5082f)
231
- + RE: [PATCH] Avoid rename/add conflict when contents are identical
75
+* bc/maint-fetch-url-only (2010-08-25) 2 commits
76
+ (merged to 'next' on 2010-09-04 at 710af12)
77
+ + builtin/fetch.c: ignore merge config when not fetching from branch's remote
78
+ + t/t5510: demonstrate failure to fetch when current branch has merge ref
79
+
80
+* jh/error-removing-missing-note (2010-08-31) 1 commit
81
+ (merged to 'next' on 2010-09-04 at 428b078)
82
+ + notes: Don't create (empty) commit when removing non-existing notes
83
+
84
+* jk/maint-pass-c-config-in-env (2010-08-24) 2 commits
85
+ (merged to 'next' on 2010-09-04 at f4ed3ac)
86
+ + do not pass "git -c foo=bar" params to transport helpers
87
+ + pass "git -c foo=bar" params through environment
88
+
89
+* jk/test-must-fail-missing (2010-08-31) 4 commits
90
+ (merged to 'next' on 2010-09-04 at cc5c1c4)
91
+ + tests: make test_might_fail fail on missing commands
92
+ + tests: make test_might_fail more verbose
93
+ + tests: make test_must_fail fail on missing commands
94
+ + tests: make test_must_fail more verbose
95
+
96
+* kf/askpass-config (2010-08-30) 3 commits
97
+ (merged to 'next' on 2010-09-04 at c49783f)
98
+ + Extend documentation of core.askpass and GIT_ASKPASS.
99
+ + Allow core.askpass to override SSH_ASKPASS.
100
+ + Add a new option 'core.askpass'.
101
233
-* po/sendemail (2010-09-05) 3 commits
234
- - send-email: add --smtpserveroption
235
- - send-email: remove unused @smtp_host_parts variable
236
- - send-email: Minor indentation fix
102
+* np/relnotes-in-subdir (2010-09-09) 2 commits
103
+ + install-webdoc: keep installed RelNotes-*.txt
104
+ + Documentation: move RelNotes into a directory of their own
105
+
106
+Needed to devise a way to grandfather URLs that point at release notes of
107
+older versions, but other than that, this is a good thing to do.
108
+
109
+* tf/cleanup-builtin-help-headers (2010-08-31) 1 commit
110
+ (merged to 'next' on 2010-09-06 at dbf0d4b)
111
+ + builtin.h: Move two functions definitions to help.h.
112
113
--------------------------------------------------
114
[Stalled]
@@ -305,78 +180,60 @@ current usage context.
180
--------------------------------------------------
181
[Cooking]
182
183
+* ks/recursive-rename-add-identical (2010-09-01) 1 commit
184
+ (merged to 'next' on 2010-09-03 at 1a5082f)
185
+ + RE: [PATCH] Avoid rename/add conflict when contents are identical
186
+
187
+* po/sendemail (2010-09-06) 3 commits
188
+ (merged to 'next' on 2010-09-10 at d39274d)
189
+ + New send-email option smtpserveroption.
190
+ + Remove @smtp_host_parts variable as not used.
191
+ + Minor indentation fix.
192
+
193
* ch/filter-branch-deprecate-remap-to-ancestor (2010-08-27) 1 commit
309
- - filter-branch: retire --remap-to-ancestor
194
+ (merged to 'next' on 2010-09-10 at f91d974)
195
+ + filter-branch: retire --remap-to-ancestor
196
197
* ch/maint-cannot-create-bundle-error (2010-08-27) 1 commit
312
- - bundle: detect if bundle file cannot be created
198
+ (merged to 'next' on 2010-09-10 at ba139f1)
199
+ + bundle: detect if bundle file cannot be created
200
201
* rr/format-patch-count-without-merges (2010-08-28) 2 commits
315
- - format-patch: Don't go over merge commits
316
- - t4014-format-patch: Call test_tick before committing
202
+ (merged to 'next' on 2010-09-10 at c23bd48)
203
+ + format-patch: Don't go over merge commits
204
+ + t4014-format-patch: Call test_tick before committing
205
206
* as/daemon-multi-listen (2010-08-29) 2 commits
319
- - daemon: allow more than one host address given via --listen
320
- - daemon: add helper function setup_named_sock()
207
+ (merged to 'next' on 2010-09-10 at 69e4b23)
208
+ + daemon: allow more than one host address given via --listen
209
+ + daemon: add helper function setup_named_sock()
210
211
I think the idea is sound. It came a bit late in the cycle for the next
212
release and probably needs a bit more polish.
213
214
* jc/pickaxe-grep (2010-08-31) 4 commits
326
- - diff/log -G<pattern>: tests
327
- - git log/diff: add -G<regexp> that greps in the patch text
328
- - diff: pass the entire diff-options to diffcore_pickaxe()
329
- - gitdiffcore doc: update pickaxe description
215
+ (merged to 'next' on 2010-09-10 at 3604fc3)
216
+ + diff/log -G<pattern>: tests
217
+ + git log/diff: add -G<regexp> that greps in the patch text
218
+ + diff: pass the entire diff-options to diffcore_pickaxe()
219
+ + gitdiffcore doc: update pickaxe description
220
221
This is a re-roll of "grepping inside the log -p output" which is a
222
feature that is often asked for when people hear about -S option.
223
334
-* jh/error-removing-missing-note (2010-08-31) 1 commit
335
- (merged to 'next' on 2010-09-04 at 428b078)
336
- + notes: Don't create (empty) commit when removing non-existing notes
337
-
338
-Will merge to 'master' shortly.
339
-
340
-* jk/test-must-fail-missing (2010-08-31) 4 commits
341
- (merged to 'next' on 2010-09-04 at cc5c1c4)
342
- + tests: make test_might_fail fail on missing commands
343
- + tests: make test_might_fail more verbose
344
- + tests: make test_must_fail fail on missing commands
345
- + tests: make test_must_fail more verbose
346
-
347
-Will merge to 'master' shortly.
348
-
224
* jl/fetch-submodule-recursive (2010-08-30) 2 commits
350
- - Submodules: Add the new "fetch" config option for fetch and pull
351
- - fetch/pull: Recursively fetch populated submodules
225
+ (merged to 'next' on 2010-09-10 at 67a5138)
226
+ + Submodules: Add the new "fetch" config option for fetch and pull
227
+ + fetch/pull: Recursively fetch populated submodules
228
229
I think the idea is sound and hopefully the end result will help the heavy
230
users of subprojects. It came a bit late in the cycle for the next
231
release, though.
232
357
-* kf/askpass-config (2010-08-30) 3 commits
358
- (merged to 'next' on 2010-09-04 at c49783f)
359
- + Extend documentation of core.askpass and GIT_ASKPASS.
360
- + Allow core.askpass to override SSH_ASKPASS.
361
- + Add a new option 'core.askpass'.
362
-
363
-Will merge to 'master' shortly.
364
-
365
-* tf/cleanup-builtin-help-headers (2010-08-31) 1 commit
366
- (merged to 'next' on 2010-09-06 at dbf0d4b)
367
- + builtin.h: Move two functions definitions to help.h.
368
-
233
* en/object-list-with-pathspec (2010-08-26) 2 commits
234
- Make rev-list --objects work together with pathspecs
235
- Add testcases showing how pathspecs are ignored with rev-list --objects
236
373
-* bc/maint-fetch-url-only (2010-08-25) 2 commits
374
- (merged to 'next' on 2010-09-04 at 710af12)
375
- + builtin/fetch.c: ignore merge config when not fetching from branch's remote
376
- + t/t5510: demonstrate failure to fetch when current branch has merge ref
377
-
378
-Will merge to 'master' shortly.
379
-
237
* jf/merge-ignore-ws (2010-08-26) 4 commits
238
- merge-recursive: options to ignore whitespace changes
239
- merge-recursive --patience
@@ -386,31 +243,23 @@ Will merge to 'master' shortly.
243
I think the idea is sound. It came a bit late in the cycle for the next
244
release, though.
245
389
-* jk/maint-pass-c-config-in-env (2010-08-24) 2 commits
390
- (merged to 'next' on 2010-09-04 at f4ed3ac)
391
- + do not pass "git -c foo=bar" params to transport helpers
392
- + pass "git -c foo=bar" params through environment
393
-
394
-Will merge to 'master' shortly.
395
-
396
-* rr/fmt-merge-msg (2010-08-27) 5 commits
397
- - t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
398
- - t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length
399
- - merge: Make 'merge.log' an integer or boolean option
400
- - merge: Make '--log' an integer option for number of shortlog entries
401
- - fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
402
-
403
-I think the idea is sound. It came a bit late in the cycle for the next
404
-release, though.
246
+* rr/fmt-merge-msg (2010-09-08) 5 commits
247
+ (merged to 'next' on 2010-09-10 at 40fe79e)
248
+ + t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
249
+ + t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length
250
+ + merge: Make 'merge.log' an integer or boolean option
251
+ + merge: Make '--log' an integer option for number of shortlog entries
252
+ + fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
253
254
* tr/merge-unborn-clobber (2010-08-22) 1 commit
255
- Exhibit merge bug that clobbers index&WT
256
257
* en/tree-walk-optim (2010-08-26) 4 commits
410
- - diff_tree(): Skip skip_uninteresting() when all remaining paths interesting
411
- - tree_entry_interesting(): Make return value more specific
412
- - tree-walk: Correct bitrotted comment about tree_entry()
413
- - Document pre-condition for tree_entry_interesting
258
+ (merged to 'next' on 2010-09-10 at 65a9cde)
259
+ + diff_tree(): Skip skip_uninteresting() when all remaining paths interesting
260
+ + tree_entry_interesting(): Make return value more specific
261
+ + tree-walk: Correct bitrotted comment about tree_entry()
262
+ + Document pre-condition for tree_entry_interesting
263
264
I think the idea is sound. For a patch that touches fairly core part of
265
the system, it came a bit late in the cycle, though.
@@ -433,7 +282,8 @@ long established semantics, it came a bit late in the cycle, so it will
282
have to wait until the next release.
283
284
* po/etc-gitattributes (2010-09-01) 1 commit
436
- - Add global and system-wide gitattributes
285
+ (merged to 'next' on 2010-09-10 at c503fd5)
286
+ + Add global and system-wide gitattributes
287
288
I think the idea is sound. For a patch that touches fairly core part of
289
the system, it came a bit late in the cycle, though.
@@ -452,7 +302,78 @@ I am not very happy about adding these backdoors to git-shell, which is
302
primarily a security mechanism, and obviously security and backdoor do not
303
mix well.
304
455
-* ab/i18n (2010-08-30) 21 commits
305
+* ab/i18n (2010-09-09) 94 commits
306
+ - po/hi.po: add Hindi Translation
307
+ - gettextize: git-am printf(1) message to eval_gettext
308
+ - gettextize: git-am core say messages
309
+ - gettextize: git-am "Apply?" message
310
+ - gettextize: git-am clean_abort messages
311
+ - gettextize: git-am cannot_fallback messages
312
+ - gettextize: git-am die messages
313
+ - gettextize: git-am eval_gettext messages
314
+ - gettextize: git-am multi-line getttext $msg; echo
315
+ - gettextize: git-am one-line gettext $msg; echo
316
+ - gettextize: git-am add git-sh-i18n
317
+ - gettext: add GETTEXT_POISON tests for shell scripts
318
+ - gettext: add GETTEXT_POISON support for shell scripts
319
+ - Makefile: MSGFMT="msgfmt --check" under GNU_GETTEXT
320
+ - Makefile: add GNU_GETTEXT, set when we expect GNU gettext
321
+ - po/de.po: make the German translation msgfmt --check clean
322
+ - gettextize: git-shortlog basic messages
323
+ - gettextize: git-revert split up "could not revert/apply" message
324
+ - gettextize: git-revert literal "me" messages
325
+ - gettextize: git-revert "Your local changes" message
326
+ - gettextize: git-revert basic messages
327
+ - gettextize: git-notes "Refusing to %s notes in %s" message
328
+ - gettextize: git-notes GIT_NOTES_REWRITE_MODE error message
329
+ - gettextize: git-notes basic commands
330
+ - gettextize: git-gc "Auto packing the repository" message
331
+ - gettextize: git-gc basic messages
332
+ - gettextize: git-describe basic messages
333
+ - gettextize: git-clean clean.requireForce messages
334
+ - gettextize: git-clean basic messages
335
+ - gettextize: git-bundle basic messages
336
+ - gettextize: git-archive basic messages
337
+ - po/en_GB.po: add British English Translation
338
+ - po/de.po: add German translation
339
+ - gettextize: git-status shortstatus messages
340
+ - gettextize: git-status basic messages
341
+ - gettextize: git-push basic messages
342
+ - gettextize: git-tag tag_template message
343
+ - gettextize: git-tag basic messages
344
+ - gettextize: git-reset reset_type_names messages
345
+ - gettextize: git-reset basic messages
346
+ - gettextize: git-rm basic messages
347
+ - gettextize: git-mv "bad" messages
348
+ - gettextize: git-mv basic messages
349
+ - gettextize: git-merge basic messages
350
+ - gettextize: git-log basic messages
351
+ - gettextize: git-grep basic messages
352
+ - gettextize: git-fetch split up "(non-fast-forward)" message
353
+ - gettextize: git-fetch update_local_ref messages
354
+ - gettextize: git-fetch formatting messages
355
+ - gettextize: git-fetch basic messages
356
+ - gettextize: git-diff basic messages
357
+ - gettextize: git-commit advice messages
358
+ - gettextize: git-commit formatting messages
359
+ - gettextize: git-commit basic messages
360
+ - gettextize: git-checkout "Switched to a .. branch" message
361
+ - gettextize: git-checkout describe_detached_head messages
362
+ - gettextize: git-checkout basic messages
363
+ - gettextize: git-checkout: our/their version message
364
+ - gettextize: git-branch "(no branch)" message
365
+ - gettextize: git-branch "git branch -v" messages
366
+ - gettextize: git-branch "remote branch '%s' not found" message
367
+ - gettextize: git-branch basic messages
368
+ - gettextize: git-add refresh_index message
369
+ - gettextize: git-add basic messages
370
+ - gettextize: git-clone "Cloning into" message
371
+ - gettextize: git-clone basic messages
372
+ - gettext tests: skip breaking tests under GETTEXT_POISON
373
+ - gettext tests: skip lib-gettext.sh tests under GETTEXT_POISON
374
+ - gettext tests: add GETTEXT_POISON=YesPlease Makefile parameter
375
+ - gettext docs: add po/README file documenting Git's gettext
376
+ - gettext tests: remove old sanity test under NO_GETTEXT
377
- gettext tests: test message re-encoding under C
378
- po/pl.po: add Polish translation
379
- po/is.po: add Icelandic translation
@@ -473,8 +394,6 @@ mix well.
394
- Makefile: A variable for options used by xgettext(1) calls
395
- tests: locate i18n lib&data correctly under --valgrind
396
- gettext: setlocale(LC_CTYPE, "") breaks Git's C function assumptions
397
+ - tests: rename test to work around GNU gettext bug
398
- Add infrastructure for translating Git with gettext
477
-
478
-Kicked back to 'pu' to give it a bit more time to experiment with a
479
-Porcelain command or a two, and an opportunity for a fresh restart if
480
-necessary in the next cycle.
399
+ - builtin: use builtin.h for all builtin commands