What's cooking (2010/09 #07)
Junio C Hamano committed
Sep 29, 2010 at 17:14 UTC
9551e394549d4526054f8b8d3e05f9bf1cd818ce
1 file changed
+296
-231
whats-cooking.txt
+296
-231
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Sep 2010, #06; Sat, 18)
3
-X-master-at: 1125297ca1744be09f9e392aab0dd2c70d838583
4
-X-next-at: df51bf2791c619324c7c5f7ea2d42a200dab62f0
2
+Subject: What's cooking in git.git (Sep 2010, #07; Wed, 29)
3
+X-master-at: 9855b08d35edf8a8a441f24ff7b00e220a29f261
4
+X-next-at: 92b87a9bab1a84261d2381e813e58577967bdc79
5
6
-What's cooking in git.git (Sep 2010, #06; Sat, 18)
6
+What's cooking in git.git (Sep 2010, #07; Wed, 29)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,63 +11,260 @@ 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
+With fixes to a few brown paper bag regressions to "git stash", 1.7.3.1 is
15
+out. The first batch of topics that have been cooking have graduated on
16
+the 'master' front.
17
+
18
--------------------------------------------------
19
[Graduated to "master"]
20
17
-* bg/fix-t7003 (2010-09-10) 1 commit
18
- (merged to 'next' on 2010-09-13 at 9d7756e)
19
- + t7003: Use test_commit instead of custom function
21
+* ab/send-email-catfile (2010-09-14) 1 commit
22
+ (merged to 'next' on 2010-09-22 at 5c53513)
23
+ + send-email: use catfile() to concatenate files
24
+
25
+* bc/fortran-userdiff (2010-09-10) 1 commit
26
+ (merged to 'next' on 2010-09-22 at f0c8ddb)
27
+ + userdiff.c: add builtin fortran regex patterns
28
+
29
+* gb/shell-ext (2010-08-27) 6 commits
30
+ (merged to 'next' on 2010-09-22 at e529b2a)
31
+ + shell: Display errors from improperly-formatted command lines
32
+ + Merge branch 'gb/split-cmdline-errmsg' into gb/shell-ext
33
+ + shell: Rewrite documentation and improve error message
34
+ + Add sample commands for git-shell
35
+ + Add interactive mode to git-shell for user-friendliness
36
+ + Allow creation of arbitrary git-shell commands
37
+
38
+* jc/grep-header-all-match-fix (2010-09-12) 2 commits
39
+ (merged to 'next' on 2010-09-22 at c78a8aa)
40
+ + log --author: take union of multiple "author" requests
41
+ + grep: move logic to compile header pattern into a separate helper
42
+ (this branch is used by jc/grep-header-all-match-fix-debug.)
43
+
44
+We might want to give a more comprehensive revamp to the "filter by
45
+grepping the commit log message" feature some day, somehow allowing the
46
+full "git grep" boolean expression. But until then, this should suffice.
47
+
48
+* jc/no-branch-name-with-dash-at-front (2010-09-14) 1 commit
49
+ (merged to 'next' on 2010-09-22 at 5918d77)
50
+ + disallow branch names that start with a hyphen
51
+
52
+This came up at $WORK.
53
+
54
+* jc/pickaxe-grep (2010-08-31) 4 commits
55
+ (merged to 'next' on 2010-09-22 at 2a33735)
56
+ + diff/log -G<pattern>: tests
57
+ + git log/diff: add -G<regexp> that greps in the patch text
58
+ + diff: pass the entire diff-options to diffcore_pickaxe()
59
+ + gitdiffcore doc: update pickaxe description
60
+
61
+This is a re-roll of "grepping inside the log -p output" which is a
62
+feature that is often asked for when people hear about -S option.
63
+
64
+* jk/read-tree-empty (2010-09-10) 1 commit
65
+ (merged to 'next' on 2010-09-22 at a6a00bd)
66
+ + read-tree: deprecate syntax without tree-ish args
67
+
68
+* jn/gitweb-test-lib (2010-09-12) 2 commits
69
+ (merged to 'next' on 2010-09-22 at 8a471ba)
70
+ + t/gitweb-lib.sh: Use tabs for indent consistently
71
+ + t/gitweb-lib.sh: Use GIT_BUILD_DIR
72
+
73
+* po/etc-gitattributes (2010-09-01) 1 commit
74
+ (merged to 'next' on 2010-09-22 at dc64419)
75
+ + Add global and system-wide gitattributes
76
+
77
+* rr/fmt-merge-msg (2010-09-08) 5 commits
78
+ (merged to 'next' on 2010-09-22 at 958ca95)
79
+ + t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
80
+ + t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length
81
+ + merge: Make 'merge.log' an integer or boolean option
82
+ + merge: Make '--log' an integer option for number of shortlog entries
83
+ + fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
84
+
85
+* rr/format-patch-count-without-merges (2010-08-28) 2 commits
86
+ (merged to 'next' on 2010-09-22 at 4ae3edc)
87
+ + format-patch: Don't go over merge commits
88
+ + t4014-format-patch: Call test_tick before committing
89
+
90
+* tr/send-email-refuse-sending-unedited-cover-letter (2009-06-08) 1 commit
91
+ (merged to 'next' on 2010-09-22 at e306400)
92
+ + send-email: Refuse to send cover-letter template subject
93
+
94
+--------------------------------------------------
95
+[New Topics]
96
+
97
+* mg/reset-doc (2010-09-15) 6 commits
98
+ (merged to 'next' on 2010-09-22 at 2a10b71)
99
+ + git-reset.txt: make modes description more consistent
100
+ + git-reset.txt: point to git-checkout
101
+ + git-reset.txt: use "working tree" consistently
102
+ + git-reset.txt: reset --soft is not a no-op
103
+ + git-reset.txt: reset does not change files in target
104
+ + git-reset.txt: clarify branch vs. branch head
105
+
106
+Will merge to 'master' shortly.
107
+
108
+* ab/makefile-track-cc (2010-09-12) 1 commit
109
+ (merged to 'next' on 2010-09-27 at 51daee0)
110
+ + Makefile: add CC to TRACK_CFLAGS
111
+
112
+Will merge to 'master' shortly.
113
+
114
+* ab/require-perl-5.8 (2010-09-24) 2 commits
115
+ (merged to 'next' on 2010-09-27 at 1fcdd3c)
116
+ + perl: use "use warnings" instead of -w
117
+ + perl: bump the required Perl version to 5.8 from 5.6.[21]
118
+
119
+* bc/fix-cherry-pick-root (2010-09-27) 1 commit
120
+ (merged to 'next' on 2010-09-27 at e27f4c9)
121
+ + builtin/revert.c: don't dereference a NULL pointer
122
+
123
+Will merge to 'master' shortly.
124
+
125
+* cw/gitweb-hilite-config (2010-09-21) 1 commit
126
+ (merged to 'next' on 2010-09-27 at dd234ba)
127
+ + Enable highlight executable path as a configuration option
128
+
129
+Will merge to 'master' shortly.
130
+
131
+* en/and-cascade-tests (2010-09-26) 12 commits
132
+ - Add missing &&'s throughout the testsuite
133
+ - t7601 (merge-pull-config): add missing &&
134
+ - t7001 (mv): add missing &&
135
+ - t6016 (rev-list-graph-simplify-history): add missing &&
136
+ - t4026 (color): remove unneeded and unchained command
137
+ - t4019 (diff-wserror): add lots of missing &&
138
+ - t3600 (rm): add lots of missing &&
139
+ - t4202 (log): Replace '<git-command> || :' with test_might_fail
140
+ - t4002 (diff-basic): use test_might_fail for commands that might fail
141
+ - t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&
142
+ - t4017 (diff-retval): replace manual exit code check with test_expect_code
143
+ - t3020 (ls-files-error-unmatch): remove stray '1' from end of file
144
+
145
+I've rejected a few patches in the series; will merge this to 'next'
146
+perhaps after a reroll or two.
147
+
148
+* jk/no-textconv-symlink (2010-09-21) 1 commit
149
+ - diff: don't use pathname-based diff drivers for symlinks
150
+ (this branch is used by ks/no-textconv-symlink.)
151
+
152
+* ks/no-textconv-symlink (2010-09-29) 3 commits
153
+ - blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
154
+ - blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
155
+ - blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
156
+ (this branch uses jk/no-textconv-symlink.)
157
+
158
+* jk/repack-reuse-object (2010-09-27) 2 commits
159
+ (merged to 'next' on 2010-09-27 at 5719f72)
160
+ + Documentation: pack.compression: explain how to recompress
161
+ + repack: add -F flag to let user choose between --no-reuse-delta/object
162
+
163
+Will merge to 'master' shortly.
164
+
165
+* jp/send-email-to-cmd (2010-09-24) 1 commit
166
+ - git-send-email.perl: Add --to-cmd
167
+
168
+Should be Ok for 'next'.
169
+
170
+* kb/merge-recursive-rename-threshold (2010-09-27) 2 commits
171
+ - diff: add synonyms for -M, -C, -B
172
+ - merge-recursive: option to specify rename threshold
173
+ (this branch uses jf/merge-ignore-ws.)
174
+
175
+Should be Ok for 'next'.
176
+
177
+* mg/fix-build-remote-helpers (2010-09-17) 1 commit
178
+ - remote-helpers: build in platform independent directory
179
+
180
+Should be Ok for 'next'.
181
+
182
+* nd/struct-pathspec (2010-09-20) 5 commits
183
+ - ce_path_match: drop prefix matching in favor of match_pathspec
184
+ - Convert ce_path_match() to use struct pathspec
185
+ - tree_entry_interesting: turn to match_pathspec if wildcard is present
186
+ - pathspec: add tree_recursive_diff parameter
187
+ - pathspec: mark wildcard pathspecs from the beginning
188
+ (this branch uses en/object-list-with-pathspec.)
189
+
190
+* en/object-list-with-pathspec (2010-09-20) 8 commits
191
+ - Add testcases showing how pathspecs are handled with rev-list --objects
192
+ - Make rev-list --objects work together with pathspecs
193
+ - Move tree_entry_interesting() to tree-walk.c and export it
194
+ - tree_entry_interesting(): remove dependency on struct diff_options
195
+ - Convert struct diff_options to use struct pathspec
196
+ - pathspec: cache string length when initialize pathspec
197
+ - diff-no-index: use diff_tree_setup_paths()
198
+ - Add struct pathspec
199
+ (this branch is used by nd/struct-pathspec.)
200
+
201
+* sb/send-email-use-to-from-input (2010-09-29) 1 commit
202
+ - send-email: Use To: headers in patch files
203
+
204
+Should be Ok for 'next'.
205
+
206
+* tc/smart-http-post-redirect (2010-09-25) 1 commit
207
+ - smart-http: Don't change POST to GET when following redirect
208
+
209
+* uk/fix-author-ident-sed-script (2010-09-23) 1 commit
210
+ (merged to 'next' on 2010-09-27 at 5ad7d90)
211
+ + get_author_ident_from_commit(): remove useless quoting
212
+
213
+Will merge to 'master' shortly.
214
215
--------------------------------------------------
216
[Stalled]
217
218
+* nd/index-doc (2010-09-06) 1 commit
219
+ - doc: technical details about the index file format
220
+
221
+Half-written but it is a good start. I may need to give some help in
222
+describing more recent index extensions.
223
+
224
+* by/line-log (2010-09-11) 18 commits
225
+ . log -L: do not free parents lists we might need again
226
+ . Document line history browser
227
+ . Add tests for line history browser
228
+ . Add --full-line-diff option
229
+ . Add --graph prefix before line history output
230
+ . Add parent rewriting to line history browser
231
+ . Make graph_next_line external to other part of git
232
+ . Make rewrite_parents public to other part of git
233
+ . Hook line history into cmd_log, ensuring a topo-ordered walk
234
+ . Print the line log
235
+ . map/take range to the parent of commits
236
+ . Add range clone functions
237
+ . Export three functions from diff.c
238
+ . Parse the -L options
239
+ . Refactor parse_loc
240
+ . Add the basic data structure for line level history
241
+ . parse-options: add two helper functions
242
+ . parse-options: enhance STOP_AT_NON_OPTION
243
+
244
+Temporarily ejected to give room to nd/struct-pathspec topic as this
245
+conflicts with it.
246
+
247
* cb/ignored-paths-are-precious (2010-08-21) 1 commit
248
- checkout/merge: optionally fail operation when ignored files need to be overwritten
249
27
-I fixed up a trivial error in the configuration parser (which didn't
28
-return immediately after parsing), and while at it flipped the default
29
-value of the configuration and the command line option to false.
30
-
31
-This probably needs tests; also we know of longstanding bugs in related
32
-area that needs to be addressed---they do not have to be part of this
33
-series but their reproduction recipe would belong to the test script for
34
-this topic.
250
+This needs tests; also we know of longstanding bugs in related area that
251
+needs to be addressed---they do not have to be part of this series but
252
+their reproduction recipe would belong to the test script for this topic.
253
36
-It may hurt users to make the new feature on by default, especially the
37
-ones with subdirectories that come and go. For a patch that changes a
38
-long established semantics, it came a bit late in the cycle, so it will
39
-have to wait until the next release.
254
+It would hurt users to make the new feature on by default, especially the
255
+ones with subdirectories that come and go.
256
257
* jj/icase-directory (2010-08-16) 6 commits
42
- (merged to 'next' on 2010-08-26 at 9d8e1bc)
43
- + Support case folding in git fast-import when core.ignorecase=true
44
- + Support case folding for git add when core.ignorecase=true
45
- + Add case insensitivity support when using git ls-files
46
- + Add case insensitivity support for directories when using git status
47
- + Case insensitivity support for .gitignore via core.ignorecase
48
- + Add string comparison functions that respect the ignore_case variable.
258
+ - Support case folding in git fast-import when core.ignorecase=true
259
+ - Support case folding for git add when core.ignorecase=true
260
+ - Add case insensitivity support when using git ls-files
261
+ - Add case insensitivity support for directories when using git status
262
+ - Case insensitivity support for .gitignore via core.ignorecase
263
+ - Add string comparison functions that respect the ignore_case variable.
264
265
Depends on GNU FNM_CASEFOLD. Presumably a bit of tweak in Makefile for
266
non-windows but non-GNU platforms is all it takes?
267
53
-* il/rfc-remote-fd-ext (2010-08-26) 7 commits
54
- - remote-ext/fd style fixup
55
- - Fix build on Windows
56
- - Simplify send_git_request()
57
- - Rewrite bidirectional traffic loop
58
- - gitignore: Ignore the new /git-remote-{ext,fd} helpers
59
- - New remote helper: git-remote-ext
60
- - New remote helper git-remote-fd
61
-
62
-Needs a bit of usage illustration (this does not seem to come with any
63
-documentation nor tests).
64
-
65
-* zl/mailinfo-recode-patch (2010-06-14) 2 commits
66
- - add --recode-patch option to git-am
67
- - add --recode-patch option to git-mailinfo
68
-
69
-I recall there was another round of re-roll planned for this one.
70
-
268
* jk/tag-contains (2010-07-05) 4 commits
269
- Why is "git tag --contains" so slow?
270
- default core.clockskew variable to one day
@@ -79,122 +276,36 @@ flags needs to be rethought, or at least the helper needs to be moved to
276
builtin/tag.c to make it clear that it should not be used outside the
277
current usage context.
278
82
-* bc/describe-not-dirty-for-untracked-paths-in-submodule (2010-09-09) 1 commit
83
- - builtin/describe.c: ignore untracked changes in submodules
84
-
279
--------------------------------------------------
280
[Cooking]
281
88
-* ab/send-email-catfile (2010-09-14) 1 commit
89
- (merged to 'next' on 2010-09-18 at 1b2e2a3)
90
- + send-email: use catfile() to concatenate files
91
-
92
-Sane; should be safe to be among the first batch after 1.7.3 release.
93
-
94
-* jc/grep-header-all-match-fix (2010-09-12) 2 commits
95
- (merged to 'next' on 2010-09-18 at 380305c)
96
- + log --author: take union of multiple "author" requests
97
- + grep: move logic to compile header pattern into a separate helper
98
- (this branch is used by jc/grep-header-all-match-fix-debug.)
282
+* as/daemon-multi-listen (2010-08-30) 2 commits
283
+ - daemon: allow more than one host address given via --listen
284
+ - daemon: add helper function named_sock_setup
285
100
-We might want to give a more comprehensive revamp to the "filter by
101
-grepping the commit log message" feature some day, somehow allowing the
102
-full "git grep" boolean expression. But until then, this should suffice.
286
+Should be Ok for 'next'.
287
288
* jc/grep-header-all-match-fix-debug (2010-09-13) 1 commit
289
- grep debugging, just in case
106
- (this branch uses jc/grep-header-all-match-fix.)
290
108
-* jc/no-branch-name-with-dash-at-front (2010-09-14) 1 commit
109
- (merged to 'next' on 2010-09-18 at ac22cbc)
110
- + disallow branch names that start with a hyphen
111
-
112
-This came up at $WORK; should be safe to be among the first batch after
113
-1.7.3 release.
291
+Not necessary; will drop shortly.
292
115
-* dm/mergetool-vimdiff (2010-09-14) 2 commits
116
- (merged to 'next' on 2010-09-18 at df51bf2)
293
+* dm/mergetool-vimdiff (2010-09-27) 3 commits
294
+ (merged to 'next' on 2010-09-29 at c8e22ea)
295
+ + mergetool-lib: make the three-way diff the default for vim/gvim
296
+ (merged to 'next' on 2010-09-22 at 12f7559)
297
+ mergetool-lib: add a three-way diff view for vim/gvim
298
+ mergetool-lib: combine vimdiff and gvimdiff run blocks
299
120
-The bottom one should be without controversy. I don't use vimdiff, so
121
-cannot comment on the other one.
122
-
123
-* by/line-log (2010-09-11) 18 commits
124
- (merged to 'next' on 2010-09-12 at e29a029)
125
- + log -L: do not free parents lists we might need again
126
- (merged to 'next' on 2010-08-26 at a160ff1)
127
- + Document line history browser
128
- + Add tests for line history browser
129
- + Add --full-line-diff option
130
- + Add --graph prefix before line history output
131
- + Add parent rewriting to line history browser
132
- + Make graph_next_line external to other part of git
133
- + Make rewrite_parents public to other part of git
134
- + Hook line history into cmd_log, ensuring a topo-ordered walk
135
- + Print the line log
136
- + map/take range to the parent of commits
137
- + Add range clone functions
138
- + Export three functions from diff.c
139
- + Parse the -L options
140
- + Refactor parse_loc
141
- + Add the basic data structure for line level history
142
- + parse-options: add two helper functions
143
- + parse-options: enhance STOP_AT_NON_OPTION
144
-
145
-How would one trace history of lines 440,450 in t/t7300-clean.sh starting
146
-from the tip of 'pu'? "git log -p -L 440,450 pu -- t/t7300-clean.sh"
147
-would be the most natural but it does not work (it wants "pu" to be a
148
-path). "git log -p -L 440,450 t/t7300-clean.sh pu" doesn't work either.
149
-And "git log -p pu -L440,450 t/t7300-clean.sh" goes totally against our
150
-command line convention.
151
-
152
-The command line parser of this series needs to be rethought (didn't I say
153
-that many times? Perhaps I was ignored). Might want to kick this out of
154
-'next' and move to the stalled category after 1.7.3.
155
-
156
-* jn/gitweb-test-lib (2010-09-12) 2 commits
157
- (merged to 'next' on 2010-09-12 at 4621733)
158
- + t/gitweb-lib.sh: Use tabs for indent consistently
159
- + t/gitweb-lib.sh: Use GIT_BUILD_DIR
160
-
161
-Sane; should be safe to be among the first batch after 1.7.3 release.
162
-
163
-* nd/index-doc (2010-09-06) 1 commit
164
- (merged to 'next' on 2010-09-10 at 2ab8572)
165
- + doc: technical details about the index file format
166
-
167
-Half-written but it is a good start. I may need to give some help in
168
-describing more recent index extensions.
169
-
170
-* tr/send-email-refuse-sending-unedited-cover-letter (2009-06-08) 1 commit
171
- (merged to 'next' on 2010-09-18 at 0fedaef)
172
- + send-email: Refuse to send cover-letter template subject
173
-
174
-Sane; should be safe to be among the first batch after 1.7.3 release.
175
-
176
-* bc/fortran-userdiff (2010-09-10) 1 commit
177
- (merged to 'next' on 2010-09-10 at b76b831)
178
- + userdiff.c: add builtin fortran regex patterns
179
-
180
-Sane; should be safe to be among the first batch after 1.7.3 release.
181
-
300
* en/rename-d-f (2010-09-08) 2 commits
183
- (merged to 'next' on 2010-09-15 at d6a2e1e)
184
- + merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
185
- + t3509: Add rename + D/F conflict testcase that recursive strategy fails
301
+ - merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
302
+ - t3509: Add rename + D/F conflict testcase that recursive strategy fails
303
304
I am not entirely convinced this is a regression free band-aid; need to
305
look at this a few more times.
306
190
-* jk/read-tree-empty (2010-09-10) 1 commit
191
- (merged to 'next' on 2010-09-10 at 2f3a995)
192
- + read-tree: deprecate syntax without tree-ish args
193
-
194
-Sane; should be safe to be among the first batch after 1.7.3 release.
195
-
307
* kf/post-receive-sample-hook (2010-09-10) 1 commit
197
- (merged to 'next' on 2010-09-10 at 53ebeba)
308
+ (merged to 'next' on 2010-09-22 at db674a3)
309
+ post-receive-email: ensure sent messages are not empty
310
311
I notice that it uses "PAGER= generate_email" where generate_email is a
@@ -203,116 +314,52 @@ This is not a regression (the original also had the same issue), but
314
somebody who cares enough might want to look into it.
315
316
* ml/completion-zsh (2010-09-06) 1 commit
206
- (merged to 'next' on 2010-09-10 at b509ebc)
317
+ (merged to 'next' on 2010-09-22 at d62d10e)
318
+ completion: make compatible with zsh
319
320
Comments from bash users regarding regressions?
321
322
* po/sendemail (2010-09-06) 3 commits
212
- (merged to 'next' on 2010-09-10 at d39274d)
323
+ (merged to 'next' on 2010-09-22 at 1105f62)
324
+ New send-email option smtpserveroption.
325
+ Remove @smtp_host_parts variable as not used.
326
+ Minor indentation fix.
327
328
Comments from potential users?
329
219
-* rr/format-patch-count-without-merges (2010-08-28) 2 commits
220
- (merged to 'next' on 2010-09-10 at c23bd48)
221
- + format-patch: Don't go over merge commits
222
- + t4014-format-patch: Call test_tick before committing
223
-
224
-Should be safe to be among the first batch after 1.7.3 release.
225
-
226
-* as/daemon-multi-listen (2010-08-29) 2 commits
227
- (merged to 'next' on 2010-09-10 at 69e4b23)
228
- + daemon: allow more than one host address given via --listen
229
- + daemon: add helper function setup_named_sock()
230
-
231
-I think the idea is sound. It probably needs a bit more polish.
232
-
233
-If you give two --listen options and got some but not all sockets, the
234
-code does not say anything even when no socket was created for one of
235
-them, which is questionable. Might want to kick this out of 'next' and
236
-move to the stalled category after 1.7.3.
237
-
238
-* jc/pickaxe-grep (2010-08-31) 4 commits
239
- (merged to 'next' on 2010-09-10 at 3604fc3)
240
- + diff/log -G<pattern>: tests
241
- + git log/diff: add -G<regexp> that greps in the patch text
242
- + diff: pass the entire diff-options to diffcore_pickaxe()
243
- + gitdiffcore doc: update pickaxe description
244
-
245
-This is a re-roll of "grepping inside the log -p output" which is a
246
-feature that is often asked for when people hear about -S option.
247
-
248
-Should be safe to be among the first batch after 1.7.3 release.
249
-
250
-* jl/fetch-submodule-recursive (2010-08-30) 2 commits
251
- (merged to 'next' on 2010-09-10 at 67a5138)
252
- + Submodules: Add the new "fetch" config option for fetch and pull
253
- + fetch/pull: Recursively fetch populated submodules
330
+* jl/fetch-submodule-recursive (2010-09-19) 4 commits
331
+ - fetch: Get submodule paths from index and not from .gitmodules
332
+ - fetch: Fix a bug swallowing the output of recursive submodule fetching
333
+ - Submodules: Add the new "fetch" config option for fetch and pull
334
+ - fetch/pull: Recursively fetch populated submodules
335
336
Further work expected after 1.7.3 between Jens and Kevin.
337
257
-* en/object-list-with-pathspec (2010-08-26) 2 commits
258
- - Make rev-list --objects work together with pathspecs
259
- - Add testcases showing how pathspecs are ignored with rev-list --objects
260
-
261
-There is a reroll helped by Duy, which I expect to be rerolled after
262
-en/tree-walk-optim hits master.
263
-
338
* jf/merge-ignore-ws (2010-08-26) 4 commits
265
- (merged to 'next' on 2010-09-15 at bf93f83)
339
+ (merged to 'next' on 2010-09-22 at 5161fb8)
340
+ merge-recursive: options to ignore whitespace changes
341
+ merge-recursive --patience
342
+ ll-merge: replace flag argument with options struct
343
+ merge-recursive: expose merge options for builtin merge
344
+ (this branch is used by kb/merge-recursive-rename-threshold.)
345
346
Possibly one of the star features of the release after 1.7.3, whether it
347
is called 1.7.4 or 1.8.0.
348
274
-* rr/fmt-merge-msg (2010-09-08) 5 commits
275
- (merged to 'next' on 2010-09-10 at 40fe79e)
276
- + t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
277
- + t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length
278
- + merge: Make 'merge.log' an integer or boolean option
279
- + merge: Make '--log' an integer option for number of shortlog entries
280
- + fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
281
-
282
-Should be safe to be among the first batch after 1.7.3 release.
283
-
349
* tr/merge-unborn-clobber (2010-08-22) 1 commit
350
- Exhibit merge bug that clobbers index&WT
351
352
* en/tree-walk-optim (2010-08-26) 4 commits
288
- (merged to 'next' on 2010-09-10 at 65a9cde)
353
+ (merged to 'next' on 2010-09-22 at 0601f1b)
354
+ diff_tree(): Skip skip_uninteresting() when all remaining paths interesting
355
+ tree_entry_interesting(): Make return value more specific
356
+ tree-walk: Correct bitrotted comment about tree_entry()
357
+ Document pre-condition for tree_entry_interesting
358
294
-Need to look at this a few more times to convince myself that this is Ok;
295
-will happen after 1.7.3.
359
+Need to look at this a few more times to convince myself that this is Ok.
360
297
-* po/etc-gitattributes (2010-09-01) 1 commit
298
- (merged to 'next' on 2010-09-10 at c503fd5)
299
- + Add global and system-wide gitattributes
300
-
301
-Sane; should be safe to be among the first batch after 1.7.3 release.
302
-
303
-* gb/shell-ext (2010-08-27) 6 commits
304
- (merged to 'next' on 2010-08-27 at e1ef3c1)
305
- + shell: Display errors from improperly-formatted command lines
306
- + Merge branch 'gb/split-cmdline-errmsg' into gb/shell-ext
307
- (merged to 'next' on 2010-08-24 at 49ea7b8)
308
- + shell: Rewrite documentation and improve error message
309
- + Add sample commands for git-shell
310
- + Add interactive mode to git-shell for user-friendliness
311
- + Allow creation of arbitrary git-shell commands
312
-
313
-Should be safe to be among the first batch after 1.7.3 release.
314
-
315
-* ab/i18n (2010-09-14) 140 commits
361
+* ab/i18n (2010-09-12) 159 commits
362
+ - po/sv.po: add Swedish translation
363
- gettextize: git-bisect bisect_next_check "You need to" message
364
- gettextize: git-bisect [Y/n] messages
365
- gettextize: git-bisect bisect_replay + $1 messages
@@ -359,11 +406,10 @@ Should be safe to be among the first batch after 1.7.3 release.
406
- gettext docs: the gettext.h C interface
407
- gettext docs: add "Marking strings for translation" section in po/README
408
- gettext docs: add a "Testing your changes" section to po/README
362
- - po/hi.po: add Hindi Translation
409
- po/pl.po: add Polish translation
410
+ - po/hi.po: add Hindi Translation
411
- po/en_GB.po: add British English translation
412
- po/de.po: add German translation
366
- - po/is.po: add Icelandic translation
413
- Makefile: only add gettext tests on XGETTEXT_INCLUDE_TESTS=YesPlease
414
- gettext docs: add po/README file documenting Git's gettext
415
- gettextize: git-am printf(1) message to eval_gettext
@@ -376,8 +422,8 @@ Should be safe to be among the first batch after 1.7.3 release.
422
- gettextize: git-am multi-line getttext $msg; echo
423
- gettextize: git-am one-line gettext $msg; echo
424
- gettextize: git-am add git-sh-i18n
379
- - gettext: add GETTEXT_POISON tests for shell scripts
380
- - gettext: add GETTEXT_POISON support for shell scripts
425
+ - gettext tests: add GETTEXT_POISON tests for shell scripts
426
+ - gettext tests: add GETTEXT_POISON support for shell scripts
427
- Makefile: MSGFMT="msgfmt --check" under GNU_GETTEXT
428
- Makefile: add GNU_GETTEXT, set when we expect GNU gettext
429
- gettextize: git-shortlog basic messages
@@ -395,18 +441,29 @@ Should be safe to be among the first batch after 1.7.3 release.
441
- gettextize: git-clean basic messages
442
- gettextize: git-bundle basic messages
443
- gettextize: git-archive basic messages
444
+ - gettextize: git-status "renamed: " message
445
+ - gettextize: git-status "Initial commit" message
446
+ - gettextize: git-status "Changes to be committed" message
447
- gettextize: git-status shortstatus messages
448
+ - gettextize: git-status "nothing to commit" messages
449
- gettextize: git-status basic messages
450
+ - gettextize: git-push "prevent you from losing" message
451
- gettextize: git-push basic messages
452
- gettextize: git-tag tag_template message
453
- gettextize: git-tag basic messages
454
+ - gettextize: git-reset "Unstaged changes after reset" message
455
- gettextize: git-reset reset_type_names messages
456
- gettextize: git-reset basic messages
457
- gettextize: git-rm basic messages
458
- gettextize: git-mv "bad" messages
459
- gettextize: git-mv basic messages
460
+ - gettextize: git-merge "Wonderful" message
461
+ - gettextize: git-merge "You have not concluded your merge" messages
462
+ - gettextize: git-merge "Updating %s..%s" message
463
- gettextize: git-merge basic messages
464
+ - gettextize: git-log "--OPT does not make sense" messages
465
- gettextize: git-log basic messages
466
+ - gettextize: git-grep "--open-files-in-pager" message
467
- gettextize: git-grep basic messages
468
- gettextize: git-fetch split up "(non-fast-forward)" message
469
- gettextize: git-fetch update_local_ref messages
@@ -414,34 +471,41 @@ Should be safe to be among the first batch after 1.7.3 release.
471
- gettextize: git-fetch basic messages
472
- gettextize: git-diff basic messages
473
- gettextize: git-commit advice messages
474
+ - gettextize: git-commit "enter the commit message" message
475
+ - gettextize: git-commit print_summary messages
476
- gettextize: git-commit formatting messages
477
+ - gettextize: git-commit "middle of a merge" message
478
- gettextize: git-commit basic messages
479
- gettextize: git-checkout "Switched to a .. branch" message
480
+ - gettextize: git-checkout "HEAD is now at" message
481
- gettextize: git-checkout describe_detached_head messages
421
- - gettextize: git-checkout basic messages
482
- gettextize: git-checkout: our/their version message
483
+ - gettextize: git-checkout basic messages
484
- gettextize: git-branch "(no branch)" message
485
- gettextize: git-branch "git branch -v" messages
486
+ - gettextize: git-branch "Deleted branch [...]" message
487
- gettextize: git-branch "remote branch '%s' not found" message
488
- gettextize: git-branch basic messages
489
- gettextize: git-add refresh_index message
490
+ - gettextize: git-add "remove '%s'" message
491
+ - gettextize: git-add "pathspec [...] did not match" message
492
+ - gettextize: git-add "Use -f if you really want" message
493
+ - gettextize: git-add "no files added" message
494
- gettextize: git-add basic messages
495
- gettextize: git-clone "Cloning into" message
496
- gettextize: git-clone basic messages
431
- - gettext tests: skip breaking tests under GETTEXT_POISON
432
- - gettext tests: skip lib-gettext.sh tests under GETTEXT_POISON
433
- - gettext tests: add GETTEXT_POISON=YesPlease Makefile parameter
434
- - gettext tests: remove old sanity test under NO_GETTEXT
497
- gettext tests: test message re-encoding under C
498
+ - po/is.po: add Icelandic translation
499
- gettext tests: mark a test message as not needing translation
500
- gettext tests: test re-encoding with a UTF-8 msgid under Shell
501
- gettext tests: test message re-encoding under Shell
502
- gettext tests: add detection for is_IS.ISO-8859-1 locale
440
- - gettext tests: update test/is.po to match t/t0200/test.c
503
- gettext tests: test if $VERSION exists before using it
504
+ - gettextize: git-init "Initialized [...] repository" message
505
+ - gettextize: git-init basic messages
506
+ - gettext tests: skip lib-gettext.sh tests under GETTEXT_POISON
507
+ - gettext tests: add GETTEXT_POISON=YesPlease Makefile parameter
508
- gettext.c: work around us not using setlocale(LC_CTYPE, "")
443
- - gettext: localize the main git-init message
444
- - gettext: make the simple parts of git-init localizable
509
- builtin.h: Include gettext.h
510
- Makefile: use variables and shorter lines for xgettext
511
- Makefile: tell xgettext(1) that our source is in UTF-8
@@ -453,3 +517,4 @@ Should be safe to be among the first batch after 1.7.3 release.
517
- gettext: add infrastructure for translating Git with gettext
518
- builtin: use builtin.h for all builtin commands
519
- tests: use test_cmp instead of piping to diff(1)
520
+ - t7004-tag.sh: re-arrange git tag comment for clarity