What's cooking (2010/06 #04)
Junio C Hamano committed
Jun 23, 2010 at 15:04 UTC
25a81be842c0650be223f2c55519970f056b9348
1 file changed
+267
-316
whats-cooking.txt
+267
-316
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2010, #03; Fri, 18)
3
-X-master-at: 049e98c875682de2f5638b83e91bfbef5cfbf521
4
-X-next-at: f1fb28a5583a14ae7a9982b12c7cc04f952ac1c0
2
+Subject: What's cooking in git.git (Jun 2010, #04; Wed, 23)
3
+X-master-at: ba4d01bd74edae1e4adb540a03ba17961f8dd4b2
4
+X-next-at: eb6f21611e553cb1cc86c116fbd2ee4cb9dd3acb
5
6
-What's cooking in git.git (Jun 2010, #03; Fri, 18)
6
+What's cooking in git.git (Jun 2010, #04; Wed, 23)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,112 +11,209 @@ 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
+I think I should start making noises about feature freeze for 1.7.2 by
15
+now. 'next' is getting quite thin (and most of them look good ones),
16
+while topics in 'pu' are mostly the kind nobody gets hurt if we waited for
17
+a cycle or two.
18
+
19
--------------------------------------------------
15
-[Graduated to "master"]
20
+[New Topics]
21
17
-* ab/maint-perl-use-instlibdir (2010-05-30) 1 commit
18
- (merged to 'next' on 2010-06-07 at 83cf3b8)
19
- + Makefile: remove redundant munging of @@INSTLIBDIR@@
20
-
21
-* by/diff-graph (2010-05-29) 6 commits
22
- (merged to 'next' on 2010-06-07 at 8771aae)
23
- + Make --color-words work well with --graph
24
- + graph.c: register a callback for graph output
25
- + Emit a whole line in one go
26
- + diff.c: Output the text graph padding before each diff line
27
- + Output the graph columns at the end of the commit message
28
- + Add a prefix output callback to diff output
29
-
30
-* cb/ls-files-cdup (2010-06-03) 2 commits
31
- (merged to 'next' on 2010-06-07 at 89277b8)
32
- + ls-files: allow relative pathspec
33
- + quote.c: separate quoting and relative path generation
34
-
35
-* cc/maint-diff-CC-binary (2010-05-26) 1 commit
36
- (merged to 'next' on 2010-06-07 at 1a8bbbb)
37
- + diff: fix "git show -C -C" output when renaming a binary file
38
-
39
-* ec/diff-noprefix-config (2010-05-02) 1 commit
40
- (merged to 'next' on 2010-06-03 at 75fefba)
41
- + diff: add configuration option for disabling diff prefixes.
42
-
43
-* hg/id-munging (2010-04-06) 2 commits
44
- (merged to 'next' on 2010-06-03 at b045725)
45
- + convert: Keep foreign $Id$ on checkout.
46
- + convert: Safer handling of $Id$ contraction.
47
-
48
-* jc/t9129-any-utf8 (2010-06-02) 1 commit
49
- (merged to 'next' on 2010-06-07 at 6f53da4)
50
- + t9129: fix UTF-8 locale detection
51
- (this branch is used by ab/tap.)
52
-
53
-* jh/diff-index-line-abbrev (2010-05-30) 1 commit
54
- (merged to 'next' on 2010-06-07 at 194e9a9)
55
- + diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s
56
-
57
-* jk/am-skip-hint (2010-05-30) 1 commit
58
- (merged to 'next' on 2010-06-07 at f49577f)
59
- + git-am: suggest what to do with superfluous patches
60
-
61
-* jk/url-decode (2010-05-23) 2 commits
62
- (merged to 'next' on 2010-06-03 at 0d8a51e)
63
- + decode file:// and ssh:// URLs
64
- + make url-related functions reusable
65
-
66
-* jn/gitweb-plackup (2010-05-28) 3 commits
67
- (merged to 'next' on 2010-06-03 at c54f1bf)
68
- + git-instaweb: Add support for running gitweb via 'plackup'
69
- + git-instaweb: Wait for server to start before running web browser
70
- + git-instaweb: Remove pidfile after stopping web server
71
- (this branch uses ps/gitweb-soc.)
72
-
73
-* jn/rebase-cmdline-fix (2010-05-31) 1 commit
74
- (merged to 'next' on 2010-06-07 at 5e6cffe)
75
- + rebase: improve error message when upstream argument is missing
76
-
77
-* jn/remote-set-branches (2010-05-19) 1 commit
78
- (merged to 'next' on 2010-06-03 at 54a1755)
79
- + Add git remote set-branches
80
-
81
-* mg/status-b (2010-05-25) 2 commits
82
- (merged to 'next' on 2010-06-07 at d1e3f9e)
83
- + Documentation+t5708: document and test status -s -b
84
- + Show branch information in short output of git status
85
-
86
-* ph/clone-message-reword (2010-05-09) 1 commit
87
- (merged to 'next' on 2010-05-21 at 1785bd0)
88
- + clone: reword messages to match the end-user perception
89
-
90
-* ps/gitweb--browse-chrome (2010-05-30) 1 commit
91
- (merged to 'next' on 2010-06-07 at a0fef35)
92
- + git-web--browse: Add support for google chrome and chromium
93
-
94
-* rc/ls-remote-default (2010-05-12) 1 commit
95
- (merged to 'next' on 2010-06-03 at 8d505fb)
96
- + ls-remote: print URL when no repo is specified
97
-
98
-* rr/am-help (2010-06-02) 3 commits
99
- (merged to 'next' on 2010-06-07 at 12383bc)
100
- + git am: Remove stray error message from sed
101
- + git am: Display some help text when patch is empty
102
- + git am: Set cmdline globally
103
-
104
-* tc/merge-m-log (2010-05-11) 8 commits
105
- (merged to 'next' on 2010-05-21 at e889876)
106
- + merge: --log appends shortlog to message if specified
107
- + fmt-merge-msg: add function to append shortlog only
108
- + fmt-merge-msg: refactor merge title formatting
109
- + fmt-merge-msg: minor refactor of fmt_merge_msg()
110
- + merge: rename variable
111
- + merge: update comment
112
- + t7604-merge-custom-message: show that --log doesn't append to -m
113
- + t7604-merge-custom-message: shift expected output creation
22
+* ar/decorate-color (2010-06-23) 4 commits
23
+ - Allow customizable commit decorations colors
24
+ - log --decorate: Colorize commit decorations
25
+ - log-tree.c: Use struct name_decoration's type for classifying decoration
26
+ - commit.h: add 'type' to struct name_decoration
27
+
28
+* tc/checkout-B (2010-06-22) 3 commits
29
+ - builtin/checkout: learn -B
30
+ - builtin/checkout: change -b from an OPTION_STRING to a OPTION_SET_INT
31
+ - add tests for checkout -b
32
33
--------------------------------------------------
116
-[New Topics]
34
+[Graduated to "master"]
35
118
-* as/maint-completion-set-u-fix (2010-06-17) 1 commit
119
- - bash-completion: Fix __git_ps1 to work with "set -u"
36
+* bc/portable (2010-06-09) 7 commits
37
+ (merged to 'next' on 2010-06-13 at a423055)
38
+ + Remove python 2.5'isms
39
+ + Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS
40
+ (merged to 'next' on 2010-06-07 at 27a57c9)
41
+ + t/aggregate-results: accomodate systems with small max argument list length
42
+ + t/t7006: ignore return status of shell's unset builtin
43
+ + t/t5150: remove space from sed script
44
+ + git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh
45
+ + t/t5800: skip if python version is older than 2.5
46
+
47
+* bd/maint-unpack-trees-parawalk-fix (2010-06-10) 1 commit
48
+ (merged to 'next' on 2010-06-18 at 183c13e)
49
+ + unpack-trees: Make index lookahead less pessimal
50
+
51
+* cc/cherry-pick-series (2010-06-02) 8 commits
52
+ (merged to 'next' on 2010-06-18 at 26c504f)
53
+ + Documentation/revert: describe passing more than one commit
54
+ + Documentation/cherry-pick: describe passing more than one commit
55
+ + revert: add tests to check cherry-picking many commits
56
+ + revert: allow cherry-picking more than one commit
57
+ + revert: change help_msg() to take no argument
58
+ + revert: refactor code into a do_pick_commit() function
59
+ + revert: use run_command_v_opt() instead of execv_git_cmd()
60
+ + revert: cleanup code for -x option
61
+ (this branch is used by cc/cherry-pick-stdin.)
62
+
63
+* cc/maint-commit-reflog-msg (2010-06-12) 1 commit
64
+ (merged to 'next' on 2010-06-17 at 863be4d)
65
+ + commit: use value of GIT_REFLOG_ACTION env variable as reflog message
66
+
67
+* eb/core-eol (2010-06-04) 4 commits
68
+ (merged to 'next' on 2010-06-17 at 66b0c9f)
69
+ + Add "core.eol" config variable
70
+ + Rename the "crlf" attribute "text"
71
+ + Add per-repository eol normalization
72
+ + Add tests for per-repository eol normalization
73
+ (this branch uses fg/autocrlf.)
74
+
75
+* em/checkout-orphan (2010-06-10) 6 commits
76
+ (merged to 'next' on 2010-06-12 at 2f531d5)
77
+ + log_ref_setup: don't return stack-allocated array
78
+ (merged to 'next' on 2010-06-07 at 23b4607)
79
+ + bash completion: add --orphan to 'git checkout'
80
+ + t3200: test -l with core.logAllRefUpdates options
81
+ + checkout --orphan: respect -l option always
82
+ + refs: split log_ref_write logic into log_ref_setup
83
+ + Documentation: alter checkout --orphan description
84
+
85
+* fg/autocrlf (2010-05-12) 1 commit
86
+ (merged to 'next' on 2010-05-21 at 5f43b66)
87
+ + autocrlf: Make it work also for un-normalized repositories
88
+ (this branch is used by eb/core-eol.)
89
+
90
+* gs/usage-to-stdout (2010-06-12) 2 commits
91
+ (merged to 'next' on 2010-06-13 at e83c00f)
92
+ + parseopt: wrap rev-parse --parseopt usage for eval consumption
93
+ (merged to 'next' on 2010-06-03 at c81c783)
94
+ + print the usage string on stdout instead of stderr
95
+
96
+* gv/portable (2010-06-11) 20 commits
97
+ (merged to 'next' on 2010-06-13 at 1add99c)
98
+ + test-lib: use DIFF definition from GIT-BUILD-OPTIONS
99
+ (merged to 'next' on 2010-06-07 at 1796035)
100
+ + build: propagate $DIFF to scripts
101
+ (merged to 'next' on 2010-06-03 at 41ae9cb)
102
+ + Makefile: Tru64 portability fix
103
+ + Makefile: HP-UX 10.20 portability fixes
104
+ + Makefile: HPUX11 portability fixes
105
+ + Makefile: SunOS 5.6 portability fix
106
+ + inline declaration does not work on AIX
107
+ + Allow disabling "inline"
108
+ + Some platforms lack socklen_t type
109
+ + Make NO_{INET_NTOP,INET_PTON} configured independently
110
+ + Makefile: some platforms do not have hstrerror anywhere
111
+ + git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
112
+ + test_cmp: do not use "diff -u" on platforms that lack one
113
+ + fixup: do not unconditionally disable "diff -u"
114
+ + tests: use "test_cmp", not "diff", when verifying the result
115
+ + Do not use "diff" found on PATH while building and installing
116
+ + enums: omit trailing comma for portability
117
+ + Makefile: -lpthread may still be necessary when libc has only pthread stubs
118
+ + Rewrite dynamic structure initializations to runtime assignment
119
+ + Makefile: pass CPPFLAGS through to fllow customization
120
+
121
+* ic/maint-rebase-i-abort (2010-06-08) 1 commit
122
+ (merged to 'next' on 2010-06-17 at 7f5f430)
123
+ + rebase -i: Abort cleanly if new base cannot be checked out
124
+
125
+* jc/maint-simpler-common-prefix (2010-06-16) 1 commit
126
+ (merged to 'next' on 2010-06-18 at 24fa283)
127
+ + common_prefix: simplify and fix scanning for prefixes
128
+
129
+* jc/rev-list-ancestry-path (2010-06-04) 5 commits
130
+ (merged to 'next' on 2010-06-17 at b35488a)
131
+ + revision: Turn off history simplification in --ancestry-path mode
132
+ + revision: Fix typo in --ancestry-path error message
133
+ + Documentation/rev-list-options.txt: Explain --ancestry-path
134
+ + Documentation/rev-list-options.txt: Fix missing line in example history graph
135
+ + revision: --ancestry-path
136
+
137
+* jk/maint-advice-empty-amend (2010-06-06) 1 commit
138
+ (merged to 'next' on 2010-06-17 at 12ff4cd)
139
+ + commit: give advice on empty amend
140
+
141
+* jn/checkout-doc (2010-06-01) 2 commits
142
+ (merged to 'next' on 2010-06-13 at d01c620)
143
+ + Documentation/checkout: clarify description
144
+ (merged to 'next' on 2010-06-07 at 93cc6a9)
145
+ + Documentation/checkout: clarify description
146
+
147
+* jn/document-rebase-i-p-limitation (2010-05-31) 1 commit
148
+ (merged to 'next' on 2010-06-17 at a653a72)
149
+ + rebase -i -p: document shortcomings
150
+
151
+* jn/gitweb-fastcgi (2010-06-05) 3 commits
152
+ (merged to 'next' on 2010-06-13 at 6d1fdd6)
153
+ + gitweb: Run in FastCGI mode if gitweb script has .fcgi extension
154
+ (merged to 'next' on 2010-05-21 at cb1724f)
155
+ + gitweb: Add support for FastCGI, using CGI::Fast
156
+ + gitweb: Put all per-connection code in run() subroutine
157
+
158
+* jn/gitweb-return-or-exit-cleanup (2010-06-13) 1 commit
159
+ (merged to 'next' on 2010-06-18 at 44299d4)
160
+ + gitweb: Return or exit after done serving request
161
+
162
+* js/async-thread (2010-06-11) 8 commits
163
+ (merged to 'next' on 2010-06-13 at bf7457c)
164
+ + fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)
165
+ (merged to 'next' on 2010-05-21 at 9d31940)
166
+ + Enable threaded async procedures whenever pthreads is available
167
+ (merged to 'next' on 2010-05-04 at 2644e74)
168
+ + Dying in an async procedure should only exit the thread, not the process.
169
+ + Reimplement async procedures using pthreads
170
+ + Windows: more pthreads functions
171
+ + Fix signature of fcntl() compatibility dummy
172
+ + Make report() from usage.c public as vreportf() and use it.
173
+ + Modernize t5530-upload-pack-error.
174
+
175
+* js/maint-receive-pack-symref-alias (2010-06-16) 1 commit
176
+ (merged to 'next' on 2010-06-17 at ecb7fa5)
177
+ + Merge branch 'tr/receive-pack-aliased-update-fix' into js/maint-receive-pack-symref-alias
178
+ (this branch uses tr/receive-pack-aliased-update-fix.)
179
+
180
+* lt/extended-sha1-match-commit-with-regexp (2010-04-23) 1 commit
181
+ (merged to 'next' on 2010-06-17 at 9ba2ec9)
182
+ + Make :/ accept a regex rather than a fixed pattern
183
+
184
+* mg/pretty-magic-space (2010-06-14) 1 commit
185
+ (merged to 'next' on 2010-06-18 at dd5a896)
186
+ + pretty: Introduce ' ' modifier to add space if non-empty
187
+
188
+* rr/parse-date-refactor (2010-06-03) 1 commit
189
+ (merged to 'next' on 2010-06-17 at c55f72b)
190
+ + Refactor parse_date for approxidate functions
191
+
192
+* sb/format-patch-signature (2010-06-15) 2 commits
193
+ (merged to 'next' on 2010-06-18 at 4aee846)
194
+ + completion: Add --signature and format.signature
195
+ + format-patch: Add a signature option (--signature)
196
+
197
+* sm/branch-broken-ref (2010-06-04) 2 commits
198
+ (merged to 'next' on 2010-06-17 at cb81c35)
199
+ + branch: don't fail listing branches if one of the commits wasn't found
200
+ + branch: exit status now reflects if branch listing finds an error
201
+
202
+* tc/commit-abbrev-fix (2010-06-12) 3 commits
203
+ (merged to 'next' on 2010-06-16 at b2df7f8)
204
+ + commit::print_summary(): don't use format_commit_message()
205
+ + t7502-commit: add summary output tests for empty and merge commits
206
+ + t7502-commit: add tests for summary output
207
+
208
+* tc/maint-checkout-f-b (2010-06-21) 3 commits
209
+ - builtin/checkout: Fix -f used with -b
210
+ - t2018-checkout-branch.sh: "checkout -f -b" broken
211
+ - add tests for checkout -b
212
+
213
+* tr/receive-pack-aliased-update-fix (2010-06-10) 1 commit
214
+ (merged to 'next' on 2010-06-14 at d3a3097)
215
+ + check_aliased_update: strcpy() instead of strcat() to copy
216
+ (this branch is used by js/maint-receive-pack-symref-alias.)
217
218
--------------------------------------------------
219
[Stalled -- would discard unless there are some movements soon]
@@ -127,22 +224,38 @@ still holding onto them.
224
I retract my objection against the idea of -x; needs polishing before
225
moving forward.
226
130
---------------------------------------------------
131
-[Cooking]
132
-
227
* ab/i18n (2010-06-15) 3 commits
228
. Add initial C, Shell and Perl gettext translations
229
. fixup! Add infrastructure
230
. Add infrastructure for translating Git with gettext
231
138
-I haven't got around to fix conflicts merging this with various other
139
-topics yet.
232
+The parts that touch other topics in flight probably need to be split into
233
+separate patches; otherwise it is unmanageable.
234
+
235
+* ab/tap (2010-06-15) 5 commits
236
+ . TAP: Make sure there's a newline before "ok" under harness
237
+ . TAP: Say "pass" rather than "ok" on an empty line
238
+ . We use TAP so the Perl test can run without scaffolding
239
+ . Skip tests in a way that makes sense under TAP
240
+ . Make test-lib.sh emit valid TAP format
241
+
242
+Updated with a newer round but it seems to break "make -j8 test" when
243
+merged to 'pu', hence ejected. I was not sure why TAP is worth the
244
+trouble, and I still am not sure.
245
+
246
+--------------------------------------------------
247
+[Cooking]
248
+
249
+* as/maint-completion-set-u-fix (2010-06-17) 1 commit
250
+ - bash-completion: Fix __git_ps1 to work with "set -u"
251
+
252
+Will merge to 'next'; seemed sane.
253
254
* zl/mailinfo-recode-patch (2010-06-14) 2 commits
255
- add --recode-patch option to git-am
256
- add --recode-patch option to git-mailinfo
257
145
-Discussion?
258
+Perhaps another round is coming?
259
260
* rr/svn-export (2010-06-10) 7 commits
261
- Add LICENSE
@@ -159,257 +272,95 @@ I recall there was another round of re-roll planned for this one.
272
- bash completion: Support "divergence from upstream" messages in __git_ps1
273
- rev-list: introduce --count option
274
275
+I'd like an Ack/Nack on the tip one from people involved in the completion
276
+scripts.
277
+
278
* tr/send-email-8bit (2010-06-17) 1 commit
163
- - send-email: ask about and declare 8bit mails
279
+ (merged to 'next' on 2010-06-23 at be75199)
280
+ + send-email: ask about and declare 8bit mails
281
282
* jl/maint-diff-ignore-submodules (2010-06-08) 2 commits
166
- - Add optional parameters to the diff option "--ignore-submodules"
167
- - git diff: rename test that had a conflicting name
168
-
169
-Is everybody happy with the naming of --ignore-submodules=<when> and the
170
-semantics? Need to ping the list.
283
+ (merged to 'next' on 2010-06-23 at 057acb7)
284
+ + Add optional parameters to the diff option "--ignore-submodules"
285
+ + git diff: rename test that had a conflicting name
286
287
* cp/textconv-cat-file (2010-06-09) 4 commits
288
- [DONTMERGE] git gui: use textconv filter for diff and blame
174
- - t/t8007: test textconv support for cat-file
175
- - textconv: support for cat_file
176
- - sha1_name: add get_sha1_with_context()
289
+ (merged to 'next' on 2010-06-23 at eb6f216)
290
+ + t/t8007: test textconv support for cat-file
291
+ + textconv: support for cat_file
292
+ + sha1_name: add get_sha1_with_context()
293
(this branch uses ab/blame-textconv.)
294
295
+I'd need to prod Shawn to take a look at the tip one, as I shouldn't be
296
+applying it to my tree myself.
297
+
298
* ab/blame-textconv (2010-06-07) 3 commits
180
- - t/t8006: test textconv support for blame
181
- - textconv: support for blame
182
- - textconv: make the API public
299
+ (merged to 'next' on 2010-06-23 at a7da5af)
300
+ + t/t8006: test textconv support for blame
301
+ + textconv: support for blame
302
+ + textconv: make the API public
303
(this branch is used by cp/textconv-cat-file.)
304
185
-* ab/tap (2010-06-09) 4 commits
186
- - We use TAP so the Perl test can run without scaffolding
187
- - Skip tests in a way that makes sense under TAP
188
- - Merge branch 'jc/t9129-any-utf8' into ab/tap
189
- - Make test-lib.sh emit valid TAP format
190
-
191
-I was not sure why TAP is worth the trouble, and I still am not sure.
192
-
193
-* bd/maint-unpack-trees-parawalk-fix (2010-06-10) 1 commit
194
- (merged to 'next' on 2010-06-18 at 183c13e)
195
- + unpack-trees: Make index lookahead less pessimal
196
-
197
-* ic/maint-rebase-i-abort (2010-06-08) 1 commit
198
- (merged to 'next' on 2010-06-17 at 7f5f430)
199
- + rebase -i: Abort cleanly if new base cannot be checked out
200
-
201
-* jk/maint-advice-empty-amend (2010-06-06) 1 commit
202
- (merged to 'next' on 2010-06-17 at 12ff4cd)
203
- + commit: give advice on empty amend
204
-
205
-* jn/document-rebase-i-p-limitation (2010-05-31) 1 commit
206
- (merged to 'next' on 2010-06-17 at a653a72)
207
- + rebase -i -p: document shortcomings
208
-
209
-* jn/grep-open (2010-06-12) 4 commits
305
+* jn/grep-open (2010-06-21) 7 commits
306
+ (merged to 'next' on 2010-06-22 at 8edca58)
307
+ + t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script
308
+ + t/t7811-grep-open.sh: ensure fake "less" is made executable
309
+ + t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression
310
(merged to 'next' on 2010-06-18 at cf96ea8)
311
+ grep -O: allow optional argument specifying the pager (or editor)
312
+ grep: Add the option '--open-files-in-pager'
313
+ Unify code paths of threaded greps
314
+ grep: refactor grep_objects loop into its own function
315
216
-* rr/parse-date-refactor (2010-06-03) 1 commit
217
- (merged to 'next' on 2010-06-17 at c55f72b)
218
- + Refactor parse_date for approxidate functions
219
-
220
-* sm/branch-broken-ref (2010-06-04) 2 commits
221
- (merged to 'next' on 2010-06-17 at cb81c35)
222
- + branch: don't fail listing branches if one of the commits wasn't found
223
- + branch: exit status now reflects if branch listing finds an error
224
-
225
-* tr/receive-pack-aliased-update-fix (2010-06-10) 1 commit
226
- (merged to 'next' on 2010-06-14 at d3a3097)
227
- + check_aliased_update: strcpy() instead of strcat() to copy
228
- (this branch is used by js/maint-receive-pack-symref-alias.)
229
-
230
-* cc/maint-commit-reflog-msg (2010-06-12) 1 commit
231
- (merged to 'next' on 2010-06-17 at 863be4d)
232
- + commit: use value of GIT_REFLOG_ACTION env variable as reflog message
233
-
234
-* jn/gitweb-return-or-exit-cleanup (2010-06-13) 1 commit
235
- (merged to 'next' on 2010-06-18 at 44299d4)
236
- + gitweb: Return or exit after done serving request
237
-
316
* pb/maint-perl-errmsg-no-dir (2010-06-18) 1 commit
239
- - Git.pm: better error message
317
+ (merged to 'next' on 2010-06-23 at 990ea67)
318
+ + Git.pm: better error message
319
320
* eb/double-convert-before-merge (2010-06-16) 1 commit
321
- ll-merge: Normalize files before merging
322
244
-* jc/maint-simpler-common-prefix (2010-06-16) 1 commit
245
- (merged to 'next' on 2010-06-18 at 24fa283)
246
- + common_prefix: simplify and fix scanning for prefixes
323
+If running git-to-worktree and then worktree-to-git _fixes_ something, it
324
+means that these are not roundtrip operations; there is something that is
325
+fundamentally wrong. The commit log message doesn't help explaining it,
326
+either.
327
328
* js/maint-am-rebase-invalid-author (2010-06-16) 1 commit
249
- - am: use get_author_ident_from_commit instead of mailinfo when rebasing
250
-
251
-* js/maint-receive-pack-symref-alias (2010-06-16) 1 commit
252
- (merged to 'next' on 2010-06-17 at ecb7fa5)
253
- + Merge branch 'tr/receive-pack-aliased-update-fix' into js/maint-receive-pack-symref-alias
254
- (this branch uses tr/receive-pack-aliased-update-fix.)
255
-
256
-* lt/extended-sha1-match-commit-with-regexp (2010-04-23) 1 commit
257
- (merged to 'next' on 2010-06-17 at 9ba2ec9)
258
- + Make :/ accept a regex rather than a fixed pattern
259
-
260
-* mg/pretty-magic-space (2010-06-14) 1 commit
261
- (merged to 'next' on 2010-06-18 at dd5a896)
262
- + pretty: Introduce ' ' modifier to add space if non-empty
263
-
264
-* sb/format-patch-signature (2010-06-15) 2 commits
265
- (merged to 'next' on 2010-06-18 at 4aee846)
266
- + completion: Add --signature and format.signature
267
- + format-patch: Add a signature option (--signature)
268
-
269
-* jc/rev-list-ancestry-path (2010-06-04) 5 commits
270
- (merged to 'next' on 2010-06-17 at b35488a)
271
- + revision: Turn off history simplification in --ancestry-path mode
272
- + revision: Fix typo in --ancestry-path error message
273
- + Documentation/rev-list-options.txt: Explain --ancestry-path
274
- + Documentation/rev-list-options.txt: Fix missing line in example history graph
275
- + revision: --ancestry-path
329
+ (merged to 'next' on 2010-06-23 at b345ad5)
330
+ + am: use get_author_ident_from_commit instead of mailinfo when rebasing
331
332
* ps/gitweb-soc (2010-06-02) 2 commits
333
(merged to 'next' on 2010-06-13 at 92245ae)
334
+ git-instaweb: Add option to reuse previous config file
335
+ Makefile: Use $(sharedir)/gitweb for target 'install-gitweb'
336
282
-* tc/commit-abbrev-fix (2010-06-12) 3 commits
283
- (merged to 'next' on 2010-06-16 at b2df7f8)
284
- + commit::print_summary(): don't use format_commit_message()
285
- + t7502-commit: add summary output tests for empty and merge commits
286
- + t7502-commit: add tests for summary output
337
+If we are going to have a configuration variable to control this, I
338
+strongly suspect that --reuse-config should be renamed so that the
339
+variable can be named more sanely and in line with whatever option
340
+that replaces it.
341
342
* cc/cherry-pick-stdin (2010-06-14) 3 commits
343
- revert: do not rebuild argv on heap
344
- revert: accept arbitrary rev-list options
345
- t3508 (cherry-pick): futureproof against unmerged files
292
- (this branch uses cc/cherry-pick-series.)
346
294
-* cc/cherry-pick-series (2010-06-02) 8 commits
295
- (merged to 'next' on 2010-06-18 at 26c504f)
296
- + Documentation/revert: describe passing more than one commit
297
- + Documentation/cherry-pick: describe passing more than one commit
298
- + revert: add tests to check cherry-picking many commits
299
- + revert: allow cherry-picking more than one commit
300
- + revert: change help_msg() to take no argument
301
- + revert: refactor code into a do_pick_commit() function
302
- + revert: use run_command_v_opt() instead of execv_git_cmd()
303
- + revert: cleanup code for -x option
304
- (this branch is used by cc/cherry-pick-stdin.)
305
-
306
-* gs/usage-to-stdout (2010-06-12) 2 commits
307
- (merged to 'next' on 2010-06-13 at e83c00f)
308
- + parseopt: wrap rev-parse --parseopt usage for eval consumption
309
- (merged to 'next' on 2010-06-03 at c81c783)
310
- + print the usage string on stdout instead of stderr
311
-
312
-* gv/portable (2010-06-11) 20 commits
313
- (merged to 'next' on 2010-06-13 at 1add99c)
314
- + test-lib: use DIFF definition from GIT-BUILD-OPTIONS
315
- (merged to 'next' on 2010-06-07 at 1796035)
316
- + build: propagate $DIFF to scripts
317
- (merged to 'next' on 2010-06-03 at 41ae9cb)
318
- + Makefile: Tru64 portability fix
319
- + Makefile: HP-UX 10.20 portability fixes
320
- + Makefile: HPUX11 portability fixes
321
- + Makefile: SunOS 5.6 portability fix
322
- + inline declaration does not work on AIX
323
- + Allow disabling "inline"
324
- + Some platforms lack socklen_t type
325
- + Make NO_{INET_NTOP,INET_PTON} configured independently
326
- + Makefile: some platforms do not have hstrerror anywhere
327
- + git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
328
- + test_cmp: do not use "diff -u" on platforms that lack one
329
- + fixup: do not unconditionally disable "diff -u"
330
- + tests: use "test_cmp", not "diff", when verifying the result
331
- + Do not use "diff" found on PATH while building and installing
332
- + enums: omit trailing comma for portability
333
- + Makefile: -lpthread may still be necessary when libc has only pthread stubs
334
- + Rewrite dynamic structure initializations to runtime assignment
335
- + Makefile: pass CPPFLAGS through to fllow customization
336
-
337
-* jn/checkout-doc (2010-06-01) 2 commits
338
- (merged to 'next' on 2010-06-13 at d01c620)
339
- + Documentation/checkout: clarify description
340
- (merged to 'next' on 2010-06-07 at 93cc6a9)
341
- + Documentation/checkout: clarify description
342
-
343
-* bc/portable (2010-06-09) 7 commits
344
- (merged to 'next' on 2010-06-13 at a423055)
345
- + Remove python 2.5'isms
346
- + Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS
347
- (merged to 'next' on 2010-06-07 at 27a57c9)
348
- + t/aggregate-results: accomodate systems with small max argument list length
349
- + t/t7006: ignore return status of shell's unset builtin
350
- + t/t5150: remove space from sed script
351
- + git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh
352
- + t/t5800: skip if python version is older than 2.5
347
+What's the doneness of this one?
348
349
* jn/show-num-walks (2010-06-01) 1 commit
355
- - DWIM 'git show -5' to 'git show --do-walk -5'
356
-
357
-* em/checkout-orphan (2010-06-10) 6 commits
358
- (merged to 'next' on 2010-06-12 at 2f531d5)
359
- + log_ref_setup: don't return stack-allocated array
360
- (merged to 'next' on 2010-06-07 at 23b4607)
361
- + bash completion: add --orphan to 'git checkout'
362
- + t3200: test -l with core.logAllRefUpdates options
363
- + checkout --orphan: respect -l option always
364
- + refs: split log_ref_write logic into log_ref_setup
365
- + Documentation: alter checkout --orphan description
366
-
367
-In <4BFE2461.5080501@drmicha.warpmail.net>, Michael J Gruber raised a
368
-valid request for a better explanation of superfluous files left behind
369
-and then are cleaned. Other than that I think this is a sane thing to
370
-do.
350
+ (merged to 'next' on 2010-06-23 at e61649c)
351
+ + DWIM 'git show -5' to 'git show --do-walk -5'
352
353
* mg/rev-parse-lrbranches-locals (2010-05-14) 1 commit
354
- revlist: Introduce --lrbranches and --locals revision specifiers
355
(this branch uses mg/rev-parse-option-sifter-deprecation.)
356
357
+I am reluctant to merge a patch that introduces an unpronounceable
358
+option.
359
+
360
* mg/rev-parse-option-sifter-deprecation (2010-05-14) 3 commits
361
- t6018: make sure all tested symbolic names are different revs
362
- t6018: add tests for rev-list's --branches and --tags
363
- rev-parse: deprecate use as an option sifter
364
(this branch is used by mg/rev-parse-lrbranches-locals.)
365
382
-* eb/core-eol (2010-06-04) 4 commits
383
- (merged to 'next' on 2010-06-17 at 66b0c9f)
384
- + Add "core.eol" config variable
385
- + Rename the "crlf" attribute "text"
386
- + Add per-repository eol normalization
387
- + Add tests for per-repository eol normalization
388
- (this branch uses fg/autocrlf.)
389
-
390
-* fg/autocrlf (2010-05-12) 1 commit
391
- (merged to 'next' on 2010-05-21 at 5f43b66)
392
- + autocrlf: Make it work also for un-normalized repositories
393
- (this branch is used by eb/core-eol.)
394
-
395
-Will merge to 'master' when 'eb/core-eol' proves stable.
396
-
397
-* jn/gitweb-fastcgi (2010-06-05) 3 commits
398
- (merged to 'next' on 2010-06-13 at 6d1fdd6)
399
- + gitweb: Run in FastCGI mode if gitweb script has .fcgi extension
400
- (merged to 'next' on 2010-05-21 at cb1724f)
401
- + gitweb: Add support for FastCGI, using CGI::Fast
402
- + gitweb: Put all per-connection code in run() subroutine
403
-
404
-* js/async-thread (2010-06-11) 8 commits
405
- (merged to 'next' on 2010-06-13 at bf7457c)
406
- + fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)
407
- (merged to 'next' on 2010-05-21 at 9d31940)
408
- + Enable threaded async procedures whenever pthreads is available
409
- (merged to 'next' on 2010-05-04 at 2644e74)
410
- + Dying in an async procedure should only exit the thread, not the process.
411
- + Reimplement async procedures using pthreads
412
- + Windows: more pthreads functions
413
- + Fix signature of fcntl() compatibility dummy
414
- + Make report() from usage.c public as vreportf() and use it.
415
- + Modernize t5530-upload-pack-error.
366
+I don't think these patches help anything. Opinions?