What's cooking (2010/09 #02)
Junio C Hamano committed
Sep 6, 2010 at 00:32 UTC
ae619fc723ae063ec7e79785fcba9d4d63a310e2
1 file changed
+221
-418
whats-cooking.txt
+221
-418
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Sep 2010, #01; Wed, 1)
3
-X-master-at: 7e42332e476a6f47ccc5a62cc8b93bcb4d758f7c
4
-X-next-at: a0aa1d989c889829c2f1571f9c7760a8b2fda6b9
2
+Subject: What's cooking in git.git (Sep 2010, #02; Mon, 6)
3
+X-master-at: 4682693e9ccc04252d0fad6f5627fc056abcdbba
4
+X-next-at: dbf0d4b6cc543fc5bf9b1b20149324fff6736c38
5
6
-What's cooking in git.git (Sep 2010, #01; Wed, 1)
6
+What's cooking in git.git (Sep 2010, #02; Mon, 6)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,162 +11,27 @@ 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.
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.
16
17
--------------------------------------------------
18
[Graduated to "master"]
19
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
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
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
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)
@@ -222,77 +87,153 @@ interface).
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
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.
90
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.
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
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
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
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.
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
246
-* jh/error-removing-missing-note (2010-08-31) 1 commit
247
- - notes: Don't create (empty) commit when removing non-existing notes
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
249
-Should be Ok to merge to 'next'; then will merge to 'master' shortly.
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
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
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
257
-Should be Ok to merge to 'next'; then will merge to 'master' shortly.
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
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
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
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.
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
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'.
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
272
-Should be Ok to merge to 'next'; then will merge to 'master' shortly.
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
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.
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
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.
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
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.
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
225
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.
226
+--------------------------------------------------
227
+[New Topics]
228
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
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
232
294
-* jc/tag-contains (2010-09-01) 1 commit
295
- . tag --contains: refactoring WIP
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
237
238
--------------------------------------------------
239
[Stalled]
@@ -306,7 +247,8 @@ in the command list generation code in "git help"), as nobody from pre
247
+ Case insensitivity support for .gitignore via core.ignorecase
248
+ Add string comparison functions that respect the ignore_case variable.
249
309
-Depends on GNU FNM_CASEFOLD.
250
+Depends on GNU FNM_CASEFOLD. Presumably a bit of tweak in Makefile for
251
+non-windows but non-GNU platforms is all it takes?
252
253
* by/line-log (2010-08-11) 17 commits
254
(merged to 'next' on 2010-08-26 at a160ff1)
@@ -343,12 +285,6 @@ into it.
285
Needs a bit of usage illustration (this does not seem to come with any
286
documentation nor tests).
287
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
-
288
* zl/mailinfo-recode-patch (2010-06-14) 2 commits
289
- add --recode-patch option to git-am
290
- add --recode-patch option to git-mailinfo
@@ -369,23 +305,75 @@ current usage context.
305
--------------------------------------------------
306
[Cooking]
307
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
308
+* ch/filter-branch-deprecate-remap-to-ancestor (2010-08-27) 1 commit
309
+ - filter-branch: retire --remap-to-ancestor
310
+
311
+* ch/maint-cannot-create-bundle-error (2010-08-27) 1 commit
312
+ - bundle: detect if bundle file cannot be created
313
+
314
+* 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
317
+
318
+* 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()
321
+
322
+I think the idea is sound. It came a bit late in the cycle for the next
323
+release and probably needs a bit more polish.
324
+
325
+* 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
330
+
331
+This is a re-roll of "grepping inside the log -p output" which is a
332
+feature that is often asked for when people hear about -S option.
333
+
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
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
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
384
-Should be Ok to merge to 'next'; then will merge to 'master' shortly.
347
+Will merge to 'master' shortly.
348
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
349
+* 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
352
+
353
+I think the idea is sound and hopefully the end result will help the heavy
354
+users of subprojects. It came a bit late in the cycle for the next
355
+release, though.
356
+
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
+
369
+* en/object-list-with-pathspec (2010-08-26) 2 commits
370
+ - Make rev-list --objects work together with pathspecs
371
+ - Add testcases showing how pathspecs are ignored with rev-list --objects
372
+
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
@@ -394,34 +382,16 @@ Will merge to 'master' shortly.
382
- merge-recursive --patience
383
- ll-merge: replace flag argument with options struct
384
- merge-recursive: expose merge options for builtin merge
397
- (this branch uses eb/double-convert-before-merge, jn/merge-renormalize and jn/merge-renormalize.)
385
386
I think the idea is sound. It came a bit late in the cycle for the next
387
release, though.
388
389
* 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
-
406
-Should be Ok to merge to 'next'; then will merge to 'master' shortly.
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
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
-
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.
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
@@ -429,7 +399,6 @@ release, though.
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
432
- (this branch uses jn/update-contrib-example-merge.)
402
403
I think the idea is sound. It came a bit late in the cycle for the next
404
release, though.
@@ -446,47 +415,6 @@ release, though.
415
I think the idea is sound. For a patch that touches fairly core part of
416
the system, it came a bit late in the cycle, though.
417
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
465
- + Documentation: remove stray backslashes from "Fighting regressions" article
466
- + Documentation: do not convert ... operator to ellipses
467
- + Documentation: avoid stray backslash in user manual
468
- + Documentation: avoid stray backslashes in core tutorial
469
- + Documentation: remove stray backslashes in rev-parse manual
470
- + Documentation: remove backslash before ~ in fast-import manual
471
- + Documentation: remove stray backslash from "git bundle" manual
472
- + Documentation/technical: avoid stray backslash in parse-options API docs
473
- + Documentation: remove backslashes in manpage synopses
474
- + Documentation: clarify quoting in gitignore docs
475
- + Documentation: clarify quoting in "git rm" example
476
- + Documentation: add missing quotes to "git grep" examples
477
- + Documentation: clarify quoting in "git add" example
478
- + Documentation: unbreak regex in show-ref manual
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
-
418
* cb/ignored-paths-are-precious (2010-08-21) 1 commit
419
- checkout/merge: optionally fail operation when ignored files need to be overwritten
420
@@ -504,115 +432,12 @@ ones with subdirectories that come and go. For a patch that changes a
432
long established semantics, it came a bit late in the cycle, so it will
433
have to wait until the next release.
434
507
-* jn/apply-filename-with-sp (2010-08-18) 3 commits
508
- (merged to 'next' on 2010-08-26 at 4f60840)
509
- + apply: handle traditional patches with space in filename
510
- + tests: exercise "git apply" with weird filenames
511
- + apply: split quoted filename handling into new function
512
-
513
-Will merge to 'master' shortly.
514
-
515
-* jn/merge-custom-no-trivial (2010-08-23) 3 commits
516
- (merged to 'next' on 2010-08-24 at d9e5b2d)
517
- + t7606: Avoid using head as a file name
518
- (merged to 'next' on 2010-08-21 at 674498b)
519
- + merge: let custom strategies intervene in trivial merges
520
- + t7606 (merge-theirs): modernize style
521
-
522
-Will merge to 'master' shortly.
523
-
435
* po/etc-gitattributes (2010-09-01) 1 commit
436
- Add global and system-wide gitattributes
437
438
I think the idea is sound. For a patch that touches fairly core part of
439
the system, it came a bit late in the cycle, though.
440
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
533
- (merged to 'next' on 2010-08-22 at 40bce7c)
534
- + autoconf: regex library detection typofix
535
- (merged to 'next' on 2010-08-21 at 632d60f)
536
- + autoconf: don't use platform regex if it lacks REG_STARTEND
537
- + t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND
538
- + compat/regex: get rid of old-style definition
539
- + compat/regex: define out variables only used under RE_ENABLE_I18N
540
- + Change regerror() declaration from K&R style to ANSI C (C89)
541
- + compat/regex: get the gawk regex engine to compile within git
542
- + compat/regex: use the regex engine from gawk for compat
543
-
544
-Will merge to 'master' shortly.
545
-
546
-* jn/update-contrib-example-merge (2010-08-17) 24 commits
547
- (merged to 'next' on 2010-08-21 at 41b5c4d)
548
- + merge script: learn --[no-]rerere-autoupdate
549
- + merge script: notice @{-1} shorthand
550
- + merge script: handle --no-ff --no-commit correctly
551
- + merge script: --ff-only to disallow true merge
552
- + merge script: handle many-way octopus
553
- + merge script: handle -m --log correctly
554
- + merge script: forbid merge -s index
555
- + merge script: allow custom strategies
556
- + merge script: merge -X<option>
557
- + merge script: improve log message subject
558
- + merge script: refuse to merge during merge
559
- + merge script: tweak unmerged files message to match builtin
560
- + merge script: --squash, --ff from unborn branch are errors
561
- + fmt-merge-msg -m to override merge title
562
- + merge-base --independent to print reduced parent list in a merge
563
- + merge-base --octopus to mimic show-branch --merge-base
564
- + Documentation: add a SEE ALSO section for merge-base
565
- + t6200 (fmt-merge-msg): style nitpicks
566
- + t6010 (merge-base): modernize style
567
- + t7600 (merge): test merge from branch yet to be born
568
- + t7600 (merge): check reflog entry
569
- + t7600 (merge): do not launch gitk for --debug
570
- + t7600 (merge): modernize style
571
- + merge: do not mistake (ancestor of) tag for branch
572
- (this branch is used by rr/fmt-merge-msg.)
573
-
574
-Will merge to 'master' shortly.
575
-
576
-* jn/merge-renormalize (2010-08-05) 12 commits
577
- (merged to 'next' on 2010-08-18 at d9aa77b)
578
- + merge-recursive --renormalize
579
- + rerere: never renormalize
580
- + rerere: migrate to parse-options API
581
- + t4200 (rerere): modernize style
582
- + ll-merge: let caller decide whether to renormalize
583
- + ll-merge: make flag easier to populate
584
- + Documentation/technical: document ll_merge
585
- + merge-trees: let caller decide whether to renormalize
586
- + merge-trees: push choice to renormalize away from low level
587
- + t6038 (merge.renormalize): check that it can be turned off
588
- + t6038 (merge.renormalize): try checkout -m and cherry-pick
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
-
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
606
- + detached-stash: simplify git stash show
607
- + detached-stash: simplify git stash branch
608
- + detached-stash: refactor git stash pop implementation
609
- + detached-stash: simplify stash_drop
610
- + detached-stash: simplify stash_apply
611
- + detached-stash: work around git rev-parse failure to detect bad log refs
612
- + detached-stash: introduce parse_flags_and_revs function
613
-
614
-Will merge to 'master' shortly.
615
-
441
* gb/shell-ext (2010-08-27) 6 commits
442
(merged to 'next' on 2010-08-27 at e1ef3c1)
443
+ shell: Display errors from improperly-formatted command lines
@@ -627,8 +452,7 @@ I am not very happy about adding these backdoors to git-shell, which is
452
primarily a security mechanism, and obviously security and backdoor do not
453
mix well.
454
630
-* ab/i18n (2010-08-31) 23 commits
631
- - gettext: Make NO_GETTEXT=YesPlease the default in releases
455
+* ab/i18n (2010-08-30) 21 commits
456
- gettext tests: test message re-encoding under C
457
- po/pl.po: add Polish translation
458
- po/is.po: add Icelandic translation
@@ -649,29 +473,8 @@ mix well.
473
- Makefile: A variable for options used by xgettext(1) calls
474
- tests: locate i18n lib&data correctly under --valgrind
475
- gettext: setlocale(LC_CTYPE, "") breaks Git's C function assumptions
652
- - tests: rename test to work around GNU gettext bug
476
- Add infrastructure for translating Git with gettext
654
- (this branch is used by ab/test.)
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.
659
-
660
---------------------------------------------------
661
-[Ejected]
662
-
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'.