What's cooking (2010/06 #03)
Junio C Hamano committed
Jun 18, 2010 at 17:32 UTC
e71190b9553d4428bd3bcc8fbaf6a611a0242377
1 file changed
+226
-332
whats-cooking.txt
+226
-332
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2010, #02; Wed, 16)
3
-X-master-at: d0b8d79510cd9c45a4c6bc08a37c6348f8293e8a
4
-X-next-at: b2df7f8c29b2dd50cec1b3a7b83887ad946e4685
2
+Subject: What's cooking in git.git (Jun 2010, #03; Fri, 18)
3
+X-master-at: 049e98c875682de2f5638b83e91bfbef5cfbf521
4
+X-next-at: f1fb28a5583a14ae7a9982b12c7cc04f952ac1c0
5
6
-What's cooking in git.git (Jun 2010, #02; Wed, 16)
6
+What's cooking in git.git (Jun 2010, #03; Fri, 18)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -14,180 +14,213 @@ still holding onto them.
14
--------------------------------------------------
15
[Graduated to "master"]
16
17
-* ab/cvsserver (2010-05-15) 6 commits
18
- (merged to 'next' on 2010-06-03 at 9f66c99)
19
- + git-cvsserver: test for pserver authentication support
20
- + git-cvsserver: document making a password without htpasswd
21
- + git-cvsserver: Improved error handling for pserver
22
- + git-cvsserver: indent & clean up authdb code
23
- + git-cvsserver: use a password file cvsserver pserver
24
- + git-cvsserver: authentication support for pserver
25
-
26
-* ab/submodule-foreach-toplevel (2010-05-21) 1 commit
27
- (merged to 'next' on 2010-06-03 at fff7253)
28
- + git-submodule foreach: Add $toplevel variable
29
-
30
-* ab/test-cleanup (2010-05-07) 2 commits
31
- (merged to 'next' on 2010-05-21 at a3cbd67)
32
- + Turn setup code in t2007-checkout-symlink.sh into a test
33
- + Move t6000lib.sh to lib-*
34
-
35
-* bs/userdiff-php (2010-05-23) 1 commit
36
- (merged to 'next' on 2010-06-03 at f1bc101)
37
- + diff: Support visibility modifiers in the PHP hunk header regexp
38
-
39
-* bw/diff-metainfo-color (2010-05-04) 1 commit
40
- (merged to 'next' on 2010-05-21 at 3aa552e)
41
- + diff: fix coloring of extended diff headers
42
-
43
-* cb/assume-unchanged-fix (2010-05-01) 2 commits
44
- (merged to 'next' on 2010-05-21 at bab2342)
45
- + Documentation: git-add does not update files marked "assume unchanged"
46
- + do not overwrite files marked "assume unchanged"
47
-
48
-* jk/diff-m-doc (2010-05-08) 1 commit
49
- (merged to 'next' on 2010-06-03 at 4a86bbd)
50
- + docs: clarify meaning of -M for git-log
51
-
52
-* jk/maint-pull-dry-run-noop (2010-05-25) 1 commit
53
- (merged to 'next' on 2010-06-03 at 45236e3)
54
- + pull: do nothing on --dry-run
55
-
56
-* jk/maint-sha1-file-name-fix (2010-05-22) 1 commit
57
- (merged to 'next' on 2010-06-03 at f7dd263)
58
- + remove over-eager caching in sha1_file_name
59
-
60
-* jn/fsck-ident (2010-05-26) 1 commit
61
- (merged to 'next' on 2010-06-03 at 5fc3811)
62
- + fsck: fix bogus commit header check
63
-
64
-* jn/gitweb-syntax-highlight (2010-04-27) 2 commits
65
- (merged to 'next' on 2010-06-03 at 1685303)
66
- + gitweb: Refactor syntax highlighting support
67
- + gitweb: Syntax highlighting support
68
-
69
-* jn/maint-amend-missing-name (2010-05-02) 1 commit
70
- (merged to 'next' on 2010-05-09 at 9023332)
71
- + commit --amend: cope with missing display name
72
-
73
-* jn/maint-doc-ignore (2010-03-05) 1 commit
74
- (merged to 'next' on 2010-06-03 at 01b4f6a)
75
- + gitignore.5: Clarify matching rules
76
-
77
-* jn/make-header-dependency (2010-05-08) 2 commits
78
- (merged to 'next' on 2010-05-21 at d4ed230)
79
- + Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES
80
- + Makefile: fix header dependency checker to allow NO_CURL builds
81
-
82
-* jn/notes-doc (2010-05-08) 8 commits
83
- (merged to 'next' on 2010-05-21 at 1c28059)
84
- + Documentation/notes: nitpicks
85
- + Documentation/notes: clean up description of rewriting configuration
86
- + Documentation/notes: simplify treatment of default display refs
87
- + Documentation/log: add a CONFIGURATION section
88
- + Documentation/notes: simplify treatment of default notes ref
89
- + Documentation/notes: add configuration section
90
- + Documentation/notes: describe content of notes blobs
91
- + Documentation/notes: document format of notes trees
92
-
93
-* js/maint-windows (2009-07-20) 2 commits
94
- (merged to 'next' on 2010-05-21 at 16abe03)
95
- + Recent MinGW has a C99 implementation of snprintf functions
96
- + mingw: use _commit to implement fsync
97
-
98
-* js/try-to-free-stackable (2010-05-08) 2 commits
99
- (merged to 'next' on 2010-05-21 at 4c1afcb)
100
- + Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used
101
- + Have set_try_to_free_routine return the previous routine
102
-
103
-* mc/maint-zoneparse (2010-05-17) 1 commit
104
- (merged to 'next' on 2010-06-03 at 2b6cc2e)
105
- + Add "Z" as an alias for the timezone "UTC"
106
-
107
-* mg/notes-dry-run (2010-05-14) 1 commit
108
- (merged to 'next' on 2010-06-03 at eddf5f6)
109
- + notes: dry-run and verbose options for prune
110
-
111
-* rs/diff-no-minimal (2010-05-02) 1 commit
112
- (merged to 'next' on 2010-05-09 at 6c74aa0)
113
- + git diff too slow for a file
114
-
115
-* rs/grep-binary (2010-05-22) 8 commits
116
- (merged to 'next' on 2010-06-03 at 6ec4dfc)
117
- + grep: support NUL chars in search strings for -F
118
- + grep: use REG_STARTEND for all matching if available
119
- + grep: continue case insensitive fixed string search after NUL chars
120
- + grep: use memmem() for fixed string search
121
- + grep: --name-only over binary
122
- + grep: --count over binary
123
- + grep: grep: refactor handling of binary mode options
124
- + grep: add test script for binary file handling
125
-
126
-* wp/pretty-enhancement (2010-05-08) 4 commits
127
- (merged to 'next' on 2010-05-09 at eeaa4dc)
128
- + pretty: initialize new cmt_fmt_map to 0
129
- + pretty: add aliases for pretty formats
130
- + pretty: add infrastructure for commit format aliases
131
- + pretty: make it easier to add new formats
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
114
115
--------------------------------------------------
116
[New Topics]
117
136
-* ab/blame-textconv (2010-06-07) 3 commits
137
- - t/t8006: test textconv support for blame
138
- - textconv: support for blame
139
- - textconv: make the API public
140
- (this branch is used by cp/textconv-cat-file.)
118
+* as/maint-completion-set-u-fix (2010-06-17) 1 commit
119
+ - bash-completion: Fix __git_ps1 to work with "set -u"
120
+
121
+--------------------------------------------------
122
+[Stalled -- would discard unless there are some movements soon]
123
+
124
+* js/rebase-origin-x (2010-02-05) 1 commit
125
+ - [RFC w/o test and incomplete] rebase: add -x option to record original commit name
126
+
127
+I retract my objection against the idea of -x; needs polishing before
128
+moving forward.
129
+
130
+--------------------------------------------------
131
+[Cooking]
132
133
* ab/i18n (2010-06-15) 3 commits
134
. Add initial C, Shell and Perl gettext translations
135
. fixup! Add infrastructure
136
. Add infrastructure for translating Git with gettext
137
138
+I haven't got around to fix conflicts merging this with various other
139
+topics yet.
140
+
141
+* zl/mailinfo-recode-patch (2010-06-14) 2 commits
142
+ - add --recode-patch option to git-am
143
+ - add --recode-patch option to git-mailinfo
144
+
145
+Discussion?
146
+
147
+* rr/svn-export (2010-06-10) 7 commits
148
+ - Add LICENSE
149
+ - Add SVN dump parser
150
+ - Add infrastructure to write revisions in fast-export format
151
+ - Add stream helper library
152
+ - Add library for string-specific memory pool
153
+ - Add cpp macro implementation of treaps
154
+ - Add memory pool library
155
+
156
+I recall there was another round of re-roll planned for this one.
157
+
158
+* tr/rev-list-count (2010-06-17) 2 commits
159
+ - bash completion: Support "divergence from upstream" messages in __git_ps1
160
+ - rev-list: introduce --count option
161
+
162
+* tr/send-email-8bit (2010-06-17) 1 commit
163
+ - send-email: ask about and declare 8bit mails
164
+
165
+* 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.
171
+
172
+* cp/textconv-cat-file (2010-06-09) 4 commits
173
+ - [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()
177
+ (this branch uses ab/blame-textconv.)
178
+
179
+* 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
183
+ (this branch is used by cp/textconv-cat-file.)
184
+
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
152
- (this branch uses jc/t9129-any-utf8.)
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
155
- - unpack-trees: Make index lookahead less pessimal
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
158
- - rebase -i: Abort cleanly if new base cannot be checked out
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
161
- - commit: give advice on empty amend
162
-
163
-* jl/maint-diff-ignore-submodules (2010-06-08) 2 commits
164
- - Add optional parameters to the diff option "--ignore-submodules"
165
- - git diff: rename test that had a conflicting name
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
168
- - rebase -i -p: document shortcomings
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
171
- - grep -O: allow optional argument specifying the pager (or editor)
172
- - grep: Add the option '--open-files-in-pager'
173
- - Unify code paths of threaded greps
174
- - grep: refactor grep_objects loop into its own function
210
+ (merged to 'next' on 2010-06-18 at cf96ea8)
211
+ + grep -O: allow optional argument specifying the pager (or editor)
212
+ + grep: Add the option '--open-files-in-pager'
213
+ + Unify code paths of threaded greps
214
+ + grep: refactor grep_objects loop into its own function
215
216
* rr/parse-date-refactor (2010-06-03) 1 commit
177
- - Refactor parse_date for approxidate functions
178
-
179
-* rr/svn-export (2010-06-10) 7 commits
180
- - Add LICENSE
181
- - Add SVN dump parser
182
- - Add infrastructure to write revisions in fast-export format
183
- - Add stream helper library
184
- - Add library for string-specific memory pool
185
- - Add cpp macro implementation of treaps
186
- - Add memory pool library
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
189
- - branch: don't fail listing branches if one of the commits wasn't found
190
- - branch: exit status now reflects if branch listing finds an error
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)
@@ -195,106 +228,56 @@ still holding onto them.
228
(this branch is used by js/maint-receive-pack-symref-alias.)
229
230
* cc/maint-commit-reflog-msg (2010-06-12) 1 commit
198
- - commit: use value of GIT_REFLOG_ACTION env variable as reflog message
199
-
200
-* tr/rev-list-count (2010-06-12) 2 commits
201
- - bash completion: Support "divergence from upstream" warnings in __git_ps1
202
- - rev-list: introduce --count option
203
-
204
-* tr/send-email-8bit (2010-06-12) 1 commit
205
- - send-email: ask about and declare 8bit mails
206
-
207
-* cp/textconv-cat-file (2010-06-09) 4 commits
208
- - [DONTMERGE] git gui: use textconv filter for diff and blame
209
- - t/t8007: test textconv support for cat-file
210
- - textconv: support for cat_file
211
- - sha1_name: add get_sha1_with_context()
212
- (this branch uses ab/blame-textconv.)
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
215
- - gitweb: Return or exit after done serving request
235
+ (merged to 'next' on 2010-06-18 at 44299d4)
236
+ + gitweb: Return or exit after done serving request
237
217
-* pb/maint-perl-errmsg-no-dir (2010-06-14) 1 commit
238
+* pb/maint-perl-errmsg-no-dir (2010-06-18) 1 commit
239
- Git.pm: better error message
240
220
-* zl/mailinfo-recode-patch (2010-06-14) 2 commits
221
- - add --recode-patch option to git-am
222
- - add --recode-patch option to git-mailinfo
223
-
224
-* cc/cherry-pick-stdin (2010-06-14) 3 commits
225
- - revert: do not rebuild argv on heap
226
- - revert: accept arbitrary rev-list options
227
- - t3508 (cherry-pick): futureproof against unmerged files
228
- (this branch uses cc/cherry-pick-series.)
229
-
241
* eb/double-convert-before-merge (2010-06-16) 1 commit
242
- ll-merge: Normalize files before merging
243
244
* jc/maint-simpler-common-prefix (2010-06-16) 1 commit
234
- - common_prefix: simplify and fix scanning for prefixes
245
+ (merged to 'next' on 2010-06-18 at 24fa283)
246
+ + common_prefix: simplify and fix scanning for prefixes
247
248
* 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
240
- . Merge branch 'tr/receive-pack-aliased-update-fix' into js/maint-receive-pack-symref-alias
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
244
- - Make :/ accept a regex rather than a fixed pattern
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
247
- - pretty: Introduce ' ' modifier to add space if non-empty
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
250
- - completion: Add --signature and format.signature
251
- - format-patch: Add a signature option (--signature)
252
-
253
---------------------------------------------------
254
-[Stalled -- would discard unless there are some movements soon]
255
-
256
-* js/rebase-origin-x (2010-02-05) 1 commit
257
- - [RFC w/o test and incomplete] rebase: add -x option to record original commit name
258
-
259
-I retract my objection against the idea of -x; needs polishing before
260
-moving forward.
261
-
262
---------------------------------------------------
263
-[Cooking]
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
266
- - revision: Turn off history simplification in --ancestry-path mode
267
- - revision: Fix typo in --ancestry-path error message
268
- - Documentation/rev-list-options.txt: Explain --ancestry-path
269
- - Documentation/rev-list-options.txt: Fix missing line in example history graph
270
- - revision: --ancestry-path
271
-
272
-* cc/maint-diff-CC-binary (2010-05-26) 1 commit
273
- (merged to 'next' on 2010-06-07 at 1a8bbbb)
274
- + diff: fix "git show -C -C" output when renaming a binary file
275
-
276
-* jn/gitweb-plackup (2010-05-28) 3 commits
277
- (merged to 'next' on 2010-06-03 at c54f1bf)
278
- + git-instaweb: Add support for running gitweb via 'plackup'
279
- + git-instaweb: Wait for server to start before running web browser
280
- + git-instaweb: Remove pidfile after stopping web server
281
- (this branch uses ps/gitweb-soc.)
282
-
283
-* mg/status-b (2010-05-25) 2 commits
284
- (merged to 'next' on 2010-06-07 at d1e3f9e)
285
- + Documentation+t5708: document and test status -s -b
286
- + Show branch information in short output of git status
287
-
288
-* ps/gitweb-soc (2010-06-02) 6 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
276
+
277
+* ps/gitweb-soc (2010-06-02) 2 commits
278
(merged to 'next' on 2010-06-13 at 92245ae)
279
+ git-instaweb: Add option to reuse previous config file
280
+ Makefile: Use $(sharedir)/gitweb for target 'install-gitweb'
292
- (merged to 'next' on 2010-06-03 at 5db4adf)
293
- + git-instaweb: Configure it to work with new gitweb structure
294
- + git-instaweb: Put httpd logs in a "$httpd_only" subdirectory
295
- + gitweb: Set default destination directory for installing gitweb in Makefile
296
- + gitweb: Move static files into seperate subdirectory
297
- (this branch is used by jn/gitweb-plackup.)
281
282
* tc/commit-abbrev-fix (2010-06-12) 3 commits
283
(merged to 'next' on 2010-06-16 at b2df7f8)
@@ -302,28 +285,22 @@ moving forward.
285
+ t7502-commit: add summary output tests for empty and merge commits
286
+ t7502-commit: add tests for summary output
287
305
-* ab/maint-perl-use-instlibdir (2010-05-30) 1 commit
306
- (merged to 'next' on 2010-06-07 at 83cf3b8)
307
- + Makefile: remove redundant munging of @@INSTLIBDIR@@
308
-
309
-* by/diff-graph (2010-05-29) 6 commits
310
- (merged to 'next' on 2010-06-07 at 8771aae)
311
- + Make --color-words work well with --graph
312
- + graph.c: register a callback for graph output
313
- + Emit a whole line in one go
314
- + diff.c: Output the text graph padding before each diff line
315
- + Output the graph columns at the end of the commit message
316
- + Add a prefix output callback to diff output
288
+* cc/cherry-pick-stdin (2010-06-14) 3 commits
289
+ - revert: do not rebuild argv on heap
290
+ - revert: accept arbitrary rev-list options
291
+ - t3508 (cherry-pick): futureproof against unmerged files
292
+ (this branch uses cc/cherry-pick-series.)
293
294
* cc/cherry-pick-series (2010-06-02) 8 commits
319
- - Documentation/revert: describe passing more than one commit
320
- - Documentation/cherry-pick: describe passing more than one commit
321
- - revert: add tests to check cherry-picking many commits
322
- - revert: allow cherry-picking more than one commit
323
- - revert: change help_msg() to take no argument
324
- - revert: refactor code into a do_pick_commit() function
325
- - revert: use run_command_v_opt() instead of execv_git_cmd()
326
- - revert: cleanup code for -x option
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
@@ -357,28 +334,12 @@ moving forward.
334
+ Rewrite dynamic structure initializations to runtime assignment
335
+ Makefile: pass CPPFLAGS through to fllow customization
336
360
-* jh/diff-index-line-abbrev (2010-05-30) 1 commit
361
- (merged to 'next' on 2010-06-07 at 194e9a9)
362
- + diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s
363
-
364
-* jk/am-skip-hint (2010-05-30) 1 commit
365
- (merged to 'next' on 2010-06-07 at f49577f)
366
- + git-am: suggest what to do with superfluous patches
367
-
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
374
-* jn/rebase-cmdline-fix (2010-05-31) 1 commit
375
- (merged to 'next' on 2010-06-07 at 5e6cffe)
376
- + rebase: improve error message when upstream argument is missing
377
-
378
-* ps/gitweb--browse-chrome (2010-05-30) 1 commit
379
- (merged to 'next' on 2010-06-07 at a0fef35)
380
- + git-web--browse: Add support for google chrome and chromium
381
-
343
* bc/portable (2010-06-09) 7 commits
344
(merged to 'next' on 2010-06-13 at a423055)
345
+ Remove python 2.5'isms
@@ -393,17 +354,6 @@ moving forward.
354
* jn/show-num-walks (2010-06-01) 1 commit
355
- DWIM 'git show -5' to 'git show --do-walk -5'
356
396
-* rr/am-help (2010-06-02) 3 commits
397
- (merged to 'next' on 2010-06-07 at 12383bc)
398
- + git am: Remove stray error message from sed
399
- + git am: Display some help text when patch is empty
400
- + git am: Set cmdline globally
401
-
402
-* jc/t9129-any-utf8 (2010-06-02) 1 commit
403
- (merged to 'next' on 2010-06-07 at 6f53da4)
404
- + t9129: fix UTF-8 locale detection
405
- (this branch is used by ab/tap.)
406
-
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
@@ -419,10 +369,6 @@ 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.
371
422
-* ec/diff-noprefix-config (2010-05-02) 1 commit
423
- (merged to 'next' on 2010-06-03 at 75fefba)
424
- + diff: add configuration option for disabling diff prefixes.
425
-
372
* mg/rev-parse-lrbranches-locals (2010-05-14) 1 commit
373
- revlist: Introduce --lrbranches and --locals revision specifiers
374
(this branch uses mg/rev-parse-option-sifter-deprecation.)
@@ -433,54 +379,20 @@ do.
379
- rev-parse: deprecate use as an option sifter
380
(this branch is used by mg/rev-parse-lrbranches-locals.)
381
436
-Some people might interpret "Deprecate" too strongly; the intent is that
437
-we shouldn't keep piling parsing of new rev-list options to it and
438
-discourage the use of "option sifter" in new programs.
439
-
382
* eb/core-eol (2010-06-04) 4 commits
441
- - Add "core.eol" config variable
442
- - Rename the "crlf" attribute "text"
443
- - Add per-repository eol normalization
444
- - Add tests for per-repository eol normalization
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
447
-* jn/remote-set-branches (2010-05-19) 1 commit
448
- (merged to 'next' on 2010-06-03 at 54a1755)
449
- + Add git remote set-branches
450
-
451
-* cb/ls-files-cdup (2010-06-03) 2 commits
452
- (merged to 'next' on 2010-06-07 at 89277b8)
453
- + ls-files: allow relative pathspec
454
- + quote.c: separate quoting and relative path generation
455
-
456
-* jk/url-decode (2010-05-23) 2 commits
457
- (merged to 'next' on 2010-06-03 at 0d8a51e)
458
- + decode file:// and ssh:// URLs
459
- + make url-related functions reusable
460
-
461
-* ph/clone-message-reword (2010-05-09) 1 commit
462
- (merged to 'next' on 2010-05-21 at 1785bd0)
463
- + clone: reword messages to match the end-user perception
464
-
465
-* rc/ls-remote-default (2010-05-12) 1 commit
466
- (merged to 'next' on 2010-06-03 at 8d505fb)
467
- + ls-remote: print URL when no repo is specified
468
-
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
474
-* tc/merge-m-log (2010-05-11) 8 commits
475
- (merged to 'next' on 2010-05-21 at e889876)
476
- + merge: --log appends shortlog to message if specified
477
- + fmt-merge-msg: add function to append shortlog only
478
- + fmt-merge-msg: refactor merge title formatting
479
- + fmt-merge-msg: minor refactor of fmt_merge_msg()
480
- + merge: rename variable
481
- + merge: update comment
482
- + t7604-merge-custom-message: show that --log doesn't append to -m
483
- + t7604-merge-custom-message: shift expected output creation
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)
@@ -489,11 +401,6 @@ discourage the use of "option sifter" in new programs.
401
+ gitweb: Add support for FastCGI, using CGI::Fast
402
+ gitweb: Put all per-connection code in run() subroutine
403
492
-* hg/id-munging (2010-04-06) 2 commits
493
- (merged to 'next' on 2010-06-03 at b045725)
494
- + convert: Keep foreign $Id$ on checkout.
495
- + convert: Safer handling of $Id$ contraction.
496
-
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)
@@ -506,16 +413,3 @@ discourage the use of "option sifter" in new programs.
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.
509
-
510
---------------------------------------------------
511
-[Discarded]
512
-
513
-* ld/discovery-limit-to-fs (2010-06-12) 2 commits
514
- (merged to 'next' on 2010-06-11 at 9c3410c)
515
- + Revert "write-index: check and warn when worktree crosses a filesystem
516
- boundary"
517
- (merged to 'next' on 2010-06-07 at 9780e62)
518
- + write-index: check and warn when worktree crosses a filesystem
519
- boundary
520
-
521
-These are "let's try this" followed by "oops, let's not".