What's cooking (2010/12 #02)
Junio C Hamano committed
Dec 8, 2010 at 15:33 UTC
56f3db086db2d920b392c07e9521dc34bcc4d3a9
1 file changed
+260
-440
whats-cooking.txt
+260
-440
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Dec 2010, #01; Sat, 4)
3
-X-master-at: 0b0cd0e0a29a139f418991dd769ea4266ffec370
4
-X-next-at: 98527b968b3ba19b57ff8906ec69d51dceda9030
2
+Subject: What's cooking in git.git (Dec 2010, #02; Wed, 8)
3
+X-master-at: f80b6de4eca9c4c4abfe9407736311de27726e53
4
+X-next-at: e348a8704e9acfb4ce3956593fbefdb9bd0ba893
5
6
-What's cooking in git.git (Dec 2010, #01; Sat, 4)
6
+What's cooking in git.git (Dec 2010, #02; Wed, 8)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,284 +12,113 @@ marked with '.' do not appear in any of the integration branches, but I am
12
still holding onto them.
13
14
--------------------------------------------------
15
-[New Topics]
16
-
17
-* aa/status-hilite-branch (2010-11-18) 1 commit
18
- - status: show branchname with a configurable color
19
-
20
-I am indifferent/uninterested; I don't see anything wrong with it, but I
21
-do not find coloring the field particularly useful myself.
22
-
23
-* ef/help-cmd-prefix (2010-11-26) 2 commits
24
- - (jc) review comments
25
- - help: always suggest common-cmds if prefix of cmd
26
-
27
-Reroll, or squash?
28
-
29
-* jn/fast-import-blob-access (2010-12-03) 5 commits
30
- - t9300: remove unnecessary use of /dev/stdin
31
- - fast-import: Allow cat-blob requests at arbitrary points in stream
32
- - fast-import: let importers retrieve blobs
33
- - fast-import: clarify documentation of "feature" command
34
- - fast-import: stricter parsing of integer options
35
-
36
-Will merge to 'next' soon.
37
-
38
-* jn/gitweb-per-request-config (2010-11-28) 2 commits
39
- - gitweb: document $per_request_config better
40
- - gitweb: selectable configurations that change with each request
41
-
42
-Will merge to 'next' soon.
43
-
44
-* kb/diff-C-M-synonym (2010-11-29) 1 commit
45
- - diff: add --detect-copies-harder as a synonym for --find-copies-harder
46
-
47
-Will merge to 'next' soon.
48
-
49
-* mg/cvsimport (2010-11-28) 3 commits
50
- - cvsimport.txt: document the mapping between config and options
51
- - cvsimport: fix the parsing of uppercase config options
52
- - cvsimport: partial whitespace cleanup
53
-
54
-I was being lazy and said "Ok" to "cvsimport.capital-r" but luckily other
55
-people injected sanity to the discussion. Weatherbaloon patch sent, but
56
-not queued here.
57
-
58
-* mz/maint-rebase-stat-config (2010-11-09) 1 commit
59
- - rebase: only show stat if configured to true
60
-
61
-Will merge to 'next' soon.
62
-
63
-* mz/pull-rebase-rebased (2010-11-13) 1 commit
64
- - Use reflog in 'pull --rebase . foo'
65
-
66
-Will merge to 'next' soon.
15
+[Graduated to "master"]
16
68
-* nd/maint-hide-checkout-index-from-error (2010-11-28) 1 commit
69
- - entry.c: remove "checkout-index" from error messages
17
+* gb/gitweb-remote-heads (2010-11-11) 11 commits
18
+ (merged to 'next' on 2010-11-24 at 6fb4a6f)
19
+ + git instaweb: enable remote_heads
20
+ + gitweb: group remote heads by remote
21
+ + gitweb: provide a routine to display (sub)sections
22
+ + gitweb: refactor repository URL printing
23
+ + gitweb: remotes view for a single remote
24
+ + gitweb: allow action specialization in page header
25
+ + gitweb: nagivation menu for tags, heads and remotes
26
+ + gitweb: separate heads and remotes lists
27
+ + gitweb: git_get_heads_list accepts an optional list of refs
28
+ + gitweb: introduce remote_heads feature
29
+ + gitweb: use fullname as hash_base in heads link
30
71
-Will merge to 'next' soon.
31
+* gc/http-with-non-ascii-username-url (2010-11-14) 2 commits
32
+ (merged to 'next' on 2010-11-24 at 08f317f)
33
+ + Fix username and password extraction from HTTP URLs
34
+ + t5550: test HTTP authentication and userinfo decoding
35
73
-* tf/commit-list-prefix (2010-11-26) 1 commit
74
- - commit: Add commit_list prefix in two function names.
36
+* il/remote-fd-ext (2010-11-17) 4 commits
37
+ (merged to 'next' on 2010-11-24 at ef80cf1)
38
+ + remote-fd/ext: finishing touches after code review
39
+ (merged to 'next' on 2010-11-05 at 7413413)
40
+ + git-remote-ext
41
+ + git-remote-fd
42
+ + Add bidirectional_transfer_loop()
43
76
-* gb/web--browse (2010-12-03) 4 commits
77
- - web--browse: better support for chromium
78
- - web--browse: support opera, seamonkey and elinks
79
- - web--browse: split valid_tool list
80
- - web--browse: coding style
44
+* jh/notes-merge (2010-11-09) 23 commits
45
+ (merged to 'next' on 2010-11-24 at 6218115)
46
+ + Provide 'git merge --abort' as a synonym to 'git reset --merge'
47
+ + cmd_merge(): Parse options before checking MERGE_HEAD
48
+ + Provide 'git notes get-ref' to easily retrieve current notes ref
49
+ + git notes merge: Add testcases for merging notes trees at different fanouts
50
+ + git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
51
+ + git notes merge: --commit should fail if underlying notes ref has moved
52
+ + git notes merge: List conflicting notes in notes merge commit message
53
+ + git notes merge: Manual conflict resolution, part 2/2
54
+ + git notes merge: Manual conflict resolution, part 1/2
55
+ + Documentation: Preliminary docs on 'git notes merge'
56
+ + git notes merge: Add automatic conflict resolvers (ours, theirs, union)
57
+ + git notes merge: Handle real, non-conflicting notes merges
58
+ + builtin/notes.c: Refactor creation of notes commits.
59
+ + git notes merge: Initial implementation handling trivial merges only
60
+ + builtin/notes.c: Split notes ref DWIMmery into a separate function
61
+ + notes.c: Use two newlines (instead of one) when concatenating notes
62
+ + (trivial) t3303: Indent with tabs instead of spaces for consistency
63
+ + notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond
64
+ + notes.h/c: Allow combine_notes functions to remove notes
65
+ + notes.c: Reorder functions in preparation for next commit
66
+ + notes.h: Make default_notes_ref() available in notes API
67
+ + (trivial) notes.h: Minor documentation fixes to copy_notes()
68
+ + notes.c: Hexify SHA1 in die() message from init_notes()
69
82
-Will merge to 'next' soon. The remainder of the series, which is mostly
83
-Debian specific addition, can wait (or just left for the distro).
70
+* jk/diff-CBM (2010-10-21) 1 commit
71
+ (merged to 'next' on 2010-11-05 at 9d1ec14)
72
+ + diff: report bogus input to -C/-M/-B
73
85
-* ja/maint-pull-rebase-doc (2010-12-03) 1 commit
86
- - git-pull.txt: Mention branch.autosetuprebase
74
+* jk/maint-decorate-01-bool (2010-11-17) 1 commit
75
+ (merged to 'next' on 2010-11-24 at 347f73b)
76
+ + log.decorate: accept 0/1 bool values
77
+ (this branch is used by jk/pager-per-command.)
78
88
-Will merge to 'next'.
79
+* jk/pager-per-command (2010-11-17) 1 commit
80
+ (merged to 'next' on 2010-11-24 at 9ebcffc)
81
+ + allow command-specific pagers in pager.<cmd>
82
+ (this branch uses jk/maint-decorate-01-bool.)
83
90
-* js/configurable-tab (2010-11-30) 2 commits
91
- - Make the tab width used for whitespace checks configurable
92
- - Merge branch 'js/maint-apply-tab-in-indent-fix' into HEAD
93
- (this branch uses js/maint-apply-tab-in-indent-fix.)
84
+* jn/gitweb-time-hires-comes-with-5.8 (2010-11-09) 1 commit
85
+ (merged to 'next' on 2010-11-24 at 6b91b41)
86
+ + gitweb: Time::HiRes is in core for Perl 5.8
87
95
-Will merge to 'next'.
88
+* ks/maint-getenv-fix (2010-11-11) 1 commit
89
+ (merged to 'next' on 2010-11-24 at fa89826)
90
+ + setup: make sure git_dir path is in a permanent buffer, getenv(3) case
91
+ (this branch is used by jn/getenv-poison.)
92
97
-* js/maint-apply-tab-in-indent-fix (2010-11-30) 1 commit
98
- - apply --whitespace=fix: fix tab-in-indent
99
- (this branch is used by js/configurable-tab.)
93
+* mg/maint-tag-rfc1991 (2010-11-10) 5 commits
94
+ (merged to 'next' on 2010-11-24 at 03864ed)
95
+ + tag: recognize rfc1991 signatures
96
+ + tag: factor out sig detection for tag display
97
+ + tag: factor out sig detection for body edits
98
+ + verify-tag: factor out signature detection
99
+ + t/t7004-tag: test handling of rfc1991 signatures
100
101
-Will merge to 'next'.
101
+--------------------------------------------------
102
+[New Topics]
103
103
-* pd/bash-4-completion (2010-12-01) 2 commits
104
- - Use the new functions to get the current cword.
105
- - Introduce functions from bash-completion project.
104
+* ak/describe-exact (2010-12-07) 4 commits
105
+ - describe: Delay looking up commits until searching for an inexact match
106
+ - describe: Store commit_names in a hash table by commit SHA1
107
+ - describe: Do not use a flex array in struct commit_name
108
+ - describe: Use for_each_rawref
109
107
-There is a "here is a better way to do this" from Jonathan, still in
108
-flight.
110
+* jc/maint-svn-info-test-fix (2010-12-06) 1 commit
111
+ (merged to 'next' on 2010-12-08 at f821694)
112
+ + t9119: do not compare "Text Last Updated" line from "svn info"
113
110
---------------------------------------------------
111
-[Graduated to "master"]
114
+* jn/submodule-b-current (2010-12-05) 2 commits
115
+ (merged to 'next' on 2010-12-08 at 33423f3)
116
+ + git submodule: Remove now obsolete tests before cloning a repo
117
+ + git submodule -b ... of current HEAD fails
118
113
-* ak/apply-non-git-epoch (2010-09-29) 2 commits
114
- (merged to 'next' on 2010-11-17 at a00579c)
115
- + apply: handle patches with funny filename and colon in timezone
116
- + apply: Recognize epoch timestamps with : in the timezone
117
-
118
-* cb/leading-path-removal (2010-11-15) 6 commits
119
- (merged to 'next' on 2010-11-17 at ec7d709)
120
- + use persistent memory for rejected paths
121
- (merged to 'next' on 2010-11-05 at 55ea322)
122
- + do not overwrite files in leading path
123
- + lstat_cache: optionally return match_len
124
- + add function check_ok_to_remove()
125
- + t7607: add leading-path tests
126
- + t7607: use test-lib functions and check MERGE_HEAD
127
-
128
-* cm/diff-check-at-eol (2010-10-10) 1 commit
129
- (merged to 'next' on 2010-11-17 at ad7005a)
130
- + diff --check: correct line numbers of new blank lines at EOF
131
-
132
-* en/merge-recursive (2010-11-08) 40 commits
133
- (merged to 'next' on 2010-11-17 at 1b6f865)
134
- + t6022: Use -eq not = to test output of wc -l
135
- (merged to 'next' on 2010-11-05 at 16902eb)
136
- + merge-recursive:make_room_for_directories - work around dumb compilers
137
- + merge-recursive: Remove redundant path clearing for D/F conflicts
138
- + merge-recursive: Make room for directories in D/F conflicts
139
- + handle_delete_modify(): Check whether D/F conflicts are still present
140
- + merge_content(): Check whether D/F conflicts are still present
141
- + conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
142
- + conflict_rename_delete(): Check whether D/F conflicts are still present
143
- + merge-recursive: Delay modify/delete conflicts if D/F conflict present
144
- + merge-recursive: Delay content merging for renames
145
- + merge-recursive: Delay handling of rename/delete conflicts
146
- + merge-recursive: Move handling of double rename of one file to other file
147
- + merge-recursive: Move handling of double rename of one file to two
148
- + merge-recursive: Avoid doubly merging rename/add conflict contents
149
- + merge-recursive: Update merge_content() call signature
150
- + merge-recursive: Update conflict_rename_rename_1to2() call signature
151
- + merge-recursive: Structure process_df_entry() to handle more cases
152
- + merge-recursive: Have process_entry() skip D/F or rename entries
153
- + merge-recursive: New function to assist resolving renames in-core only
154
- + merge-recursive: New data structures for deferring of D/F conflicts
155
- + merge-recursive: Move process_entry's content merging into a function
156
- + merge-recursive: Move delete/modify handling into dedicated function
157
- + merge-recursive: Move rename/delete handling into dedicated function
158
- + merge-recursive: Nuke rename/directory conflict detection
159
- + merge-recursive: Rename conflict_rename_rename*() for clarity
160
- + merge-recursive: Small code clarification -- variable name and comments
161
- + t6036: Add testcase for undetected conflict
162
- + t6036: Add a second testcase similar to the first but with content changes
163
- + t6036: Test index and worktree state, not just that merge fails
164
- + t6020: Add a testcase for modify/delete + directory/file conflict
165
- + t6020: Modernize style a bit
166
- + t6022: Add tests for rename/rename combined with D/F conflicts
167
- + t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)
168
- + t6022: Add tests with both rename source & dest involved in D/F conflicts
169
- + t6022: Add tests for reversing order of merges when D/F conflicts present
170
- + t6022: Add test combinations of {content conflict?, D/F conflict remains?}
171
- + t6032: Add a test checking for excessive output from merge
172
- + merge-recursive: Restructure showing how to chain more process_* functions
173
- + t3030: Add a testcase for resolvable rename/add conflict with symlinks
174
- + Merge branch 'en/rename-d-f' into en/merge-recursive
175
- (this branch uses en/rename-d-f.)
176
-
177
-* en/rename-d-f (2010-09-08) 2 commits
178
- + merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
179
- + t3509: Add rename + D/F conflict testcase that recursive strategy fails
180
- (this branch is used by en/merge-recursive.)
181
-
182
-* fc/apply-p2-get-header-name (2010-10-21) 2 commits
183
- (merged to 'next' on 2010-11-17 at 05a8e94)
184
- + test: git-apply -p2 rename/chmod only
185
- + Fix git-apply with -p greater than 1
186
-
187
-* jc/abbrev-guard (2010-10-28) 1 commit
188
- (merged to 'next' on 2010-11-24 at f26c943)
189
- + core.abbrevguard: Ensure short object names stay unique a bit longer
190
-
191
-* jc/emfile (2010-10-28) 2 commits
192
- (merged to 'next' on 2010-11-17 at dac1bc6)
193
- + A loose object is not corrupt if it cannot be read due to EMFILE
194
- + read_sha1_file(): report correct name of packfile with a corrupt object
195
- (this branch is used by sp/emfile.)
196
-
197
-* jj/icase-directory (2010-10-03) 8 commits
198
- (merged to 'next' on 2010-11-24 at 0da9385)
199
- + Support case folding in git fast-import when core.ignorecase=true
200
- + Support case folding for git add when core.ignorecase=true
201
- + Add case insensitivity support when using git ls-files
202
- + Add case insensitivity support for directories when using git status
203
- + Case insensitivity support for .gitignore via core.ignorecase
204
- + Add string comparison functions that respect the ignore_case variable.
205
- + Makefile & configure: add a NO_FNMATCH_CASEFOLD flag
206
- + Makefile & configure: add a NO_FNMATCH flag
207
-
208
-* jl/add-p-reverse-message (2010-10-27) 1 commit
209
- (merged to 'next' on 2010-11-17 at db2ce14)
210
- + Correct help blurb in checkout -p and friends
211
-
212
-* jl/clone-recurse-sm-synonym (2010-11-04) 1 commit
213
- (merged to 'next' on 2010-11-17 at 8c326c2)
214
- + clone: Add the --recurse-submodules option as alias for --recursive
215
-
216
-* jn/cherry-pick-refresh-index (2010-10-31) 1 commit
217
- (merged to 'next' on 2010-11-17 at 75e9103)
218
- + cherry-pick/revert: transparently refresh index
219
-
220
-* jn/fast-import-fix (2010-10-20) 4 commits
221
- (merged to 'next' on 2010-11-17 at ef3b791)
222
- + fast-import: do not clear notes in do_change_note_fanout()
223
- + t9300 (fast-import): another test for the "replace root" feature
224
- + fast-import: tighten M 040000 syntax
225
- + fast-import: filemodify after M 040000 <tree> "" crashes
226
-
227
-* jn/ignore-doc (2010-11-10) 2 commits
228
- (merged to 'next' on 2010-11-24 at c0a9730)
229
- + Documentation: point to related commands from gitignore
230
- + Documentation: split gitignore page into sections
231
-
232
-* jn/thinner-wrapper (2010-11-06) 7 commits
233
- (merged to 'next' on 2010-11-24 at 3f2227d)
234
- + Remove pack file handling dependency from wrapper.o
235
- + pack-objects: mark file-local variable static
236
- + wrapper: give zlib wrappers their own translation unit
237
- + strbuf: move strbuf_branchname to sha1_name.c
238
- + path helpers: move git_mkstemp* to wrapper.c
239
- + wrapper: move odb_* to environment.c
240
- + wrapper: move xmmap() to sha1_file.c
241
-
242
-* js/configuable-tab (2010-11-29) 1 commit
243
- - Make the tab width used for whitespace checks configurable
244
-
245
-* kb/blame-author-email (2010-10-15) 1 commit
246
- (merged to 'next' on 2010-11-17 at 6fd6a2f)
247
- + blame: Add option to show author email instead of name
248
-
249
-* kb/maint-status-cquote (2010-11-08) 1 commit
250
- (merged to 'next' on 2010-11-24 at e15b73d)
251
- + status: Quote paths with spaces in short format
252
-
253
-* md/interix (2010-10-27) 2 commits
254
- (merged to 'next' on 2010-11-17 at 2a8b562)
255
- + Interix: add configure checks
256
- + add support for the SUA layer (interix; windows)
257
-
258
-* np/diff-in-corrupt-repository (2010-10-22) 1 commit
259
- (merged to 'next' on 2010-11-17 at b57a6cb)
260
- + diff: don't presume empty file when corresponding object is missing
261
-
262
-* np/pack-broken-boundary (2010-10-22) 1 commit
263
- (merged to 'next' on 2010-11-17 at 69a9f46)
264
- + make pack-objects a bit more resilient to repo corruption
265
-
266
-* pn/commit-autosquash (2010-11-02) 6 commits
267
- (merged to 'next' on 2010-11-24 at acc9c78)
268
- + add tests of commit --squash
269
- + commit: --squash option for use with rebase --autosquash
270
- + add tests of commit --fixup
271
- + commit: --fixup option for use with rebase --autosquash
272
- + pretty.c: teach format_commit_message() to reencode the output
273
- + commit: helper methods to reduce redundant blocks of code
274
-
275
-* rr/needs-clean-work-tree (2010-10-19) 1 commit
276
- (merged to 'next' on 2010-11-17 at b8aee21)
277
- + Porcelain scripts: Rewrite cryptic "needs update" error message
278
-
279
-* sn/diff-doc (2010-11-04) 3 commits
280
- (merged to 'next' on 2010-11-24 at 77190a5)
281
- + docs: clarify git diff modes of operation
282
- + diff,difftool: Don't use the {0,2} notation in usage strings
283
- + CodingGuidelines: Add a section on writing documentation
284
-
285
-* sp/emfile (2010-11-01) 2 commits
286
- (merged to 'next' on 2010-11-24 at f46d2ce)
287
- + Work around EMFILE when there are too many pack files
288
- + Use git_open_noatime when accessing pack data
289
-
290
-* tc/smart-http-post-redirect (2010-09-25) 1 commit
291
- (merged to 'next' on 2010-11-17 at 6478f7f)
292
- + smart-http: Don't change POST to GET when following redirect
119
+* jc/maint-no-openssl-build-fix (2010-12-08) 1 commit
120
+ (merged to 'next' on 2010-12-08 at e348a87)
121
+ + Do not link with -lcrypto under NO_OPENSSL
122
123
--------------------------------------------------
124
[Stalled]
@@ -330,40 +159,125 @@ This unfortunately heavily conflicts with patches in flight...
159
--------------------------------------------------
160
[Cooking]
161
333
-* ef/win32-dirent (2010-11-23) 6 commits
334
- - win32: use our own dirent.h
335
- - msvc: opendir: handle paths ending with a slash
336
- - win32: dirent: handle errors
337
- - msvc: opendir: do not start the search
338
- - msvc: opendir: allocate enough memory
339
- - msvc: opendir: fix malloc-failure
162
+* aa/status-hilite-branch (2010-11-18) 1 commit
163
+ (merged to 'next' on 2010-12-08 at 0291858)
164
+ + status: show branchname with a configurable color
165
341
-Will merge to 'next' soon.
166
+I am indifferent/uninterested; I don't see anything wrong with it, but I
167
+do not find coloring the field particularly useful myself.
168
343
-* jk/asciidoc-update (2010-11-19) 1 commit
344
- - docs: default to more modern toolset
169
+* ef/help-cmd-prefix (2010-11-26) 1 commit
170
+ (merged to 'next' on 2010-12-08 at c92752e)
171
+ + help: always suggest common-cmds if prefix of cmd
172
346
-Will merge to 'next' soon.
173
+* jn/fast-import-blob-access (2010-12-03) 5 commits
174
+ (merged to 'next' on 2010-12-08 at a42f0b3)
175
+ + t9300: remove unnecessary use of /dev/stdin
176
+ + fast-import: Allow cat-blob requests at arbitrary points in stream
177
+ + fast-import: let importers retrieve blobs
178
+ + fast-import: clarify documentation of "feature" command
179
+ + fast-import: stricter parsing of integer options
180
348
-* jk/maint-reflog-bottom (2010-11-21) 1 commit
349
- - reflogs: clear flags properly in corner case
181
+* jn/gitweb-per-request-config (2010-11-28) 2 commits
182
+ (merged to 'next' on 2010-12-08 at 44be9e5)
183
+ + gitweb: document $per_request_config better
184
+ + gitweb: selectable configurations that change with each request
185
351
-Will merge to 'next' soon.
186
+* kb/diff-C-M-synonym (2010-11-29) 1 commit
187
+ - diff: add --detect-copies-harder as a synonym for --find-copies-harder
188
353
-* jn/fast-import-ondemand-checkpoint (2010-11-22) 1 commit
354
- - fast-import: treat SIGUSR1 as a request to access objects early
189
+I am not married to the approach and actually am fine with renaming the
190
+recent "detect" to "find", which I tend to think is probably nicer.
191
356
-* jn/maint-fast-import-object-reuse (2010-11-23) 1 commit
357
- - fast-import: insert new object entries at start of hash bucket
192
+* mg/cvsimport (2010-11-28) 3 commits
193
+ - cvsimport.txt: document the mapping between config and options
194
+ - cvsimport: fix the parsing of uppercase config options
195
+ - cvsimport: partial whitespace cleanup
196
359
-Will merge to 'next' soon.
197
+I was being lazy and said "Ok" to "cvsimport.capital-r" but luckily other
198
+people injected sanity to the discussion. Weatherbaloon patch sent, but
199
+not queued here.
200
361
-* jn/maint-svn-fe (2010-10-10) 1 commit
362
- - t9010 (svn-fe): Eliminate dependency on svn perl bindings
201
+* mz/maint-rebase-stat-config (2010-11-09) 1 commit
202
+ (merged to 'next' on 2010-12-08 at 97d4912)
203
+ + rebase: only show stat if configured to true
204
364
-Will merge to 'next' soon.
205
+* mz/pull-rebase-rebased (2010-11-13) 1 commit
206
+ (merged to 'next' on 2010-12-08 at 99c1762)
207
+ + Use reflog in 'pull --rebase . foo'
208
+
209
+* nd/maint-hide-checkout-index-from-error (2010-11-28) 1 commit
210
+ (merged to 'next' on 2010-12-08 at 1869996)
211
+ + entry.c: remove "checkout-index" from error messages
212
+
213
+* tf/commit-list-prefix (2010-11-26) 1 commit
214
+ - commit: Add commit_list prefix in two function names.
215
+
216
+* gb/web--browse (2010-12-03) 4 commits
217
+ (merged to 'next' on 2010-12-08 at cff4009)
218
+ + web--browse: better support for chromium
219
+ + web--browse: support opera, seamonkey and elinks
220
+ + web--browse: split valid_tool list
221
+ + web--browse: coding style
222
+
223
+The remainder of the series, which is mostly Debian specific addition, can
224
+wait (or just left for the distro).
225
366
-* jn/svn-fe (2010-11-19) 17 commits
226
+* ja/maint-pull-rebase-doc (2010-12-03) 1 commit
227
+ (merged to 'next' on 2010-12-08 at 211bf89)
228
+ + git-pull.txt: Mention branch.autosetuprebase
229
+
230
+* js/configurable-tab (2010-11-30) 2 commits
231
+ (merged to 'next' on 2010-12-08 at 3257365)
232
+ + Make the tab width used for whitespace checks configurable
233
+ + Merge branch 'js/maint-apply-tab-in-indent-fix' into HEAD
234
+ (this branch uses js/maint-apply-tab-in-indent-fix.)
235
+
236
+* js/maint-apply-tab-in-indent-fix (2010-11-30) 1 commit
237
+ (merged to 'next' on 2010-12-08 at 02aedd5)
238
+ + apply --whitespace=fix: fix tab-in-indent
239
+ (this branch is used by js/configurable-tab.)
240
+
241
+* pd/bash-4-completion (2010-12-01) 2 commits
242
+ - Use the new functions to get the current cword.
243
+ - Introduce functions from bash-completion project.
244
+
245
+There is a "here is a better way to do this" from Jonathan, but I lost
246
+track.
247
+
248
+* ef/win32-dirent (2010-11-23) 6 commits
249
+ (merged to 'next' on 2010-12-08 at 1a7169d)
250
+ + win32: use our own dirent.h
251
+ + msvc: opendir: handle paths ending with a slash
252
+ + win32: dirent: handle errors
253
+ + msvc: opendir: do not start the search
254
+ + msvc: opendir: allocate enough memory
255
+ + msvc: opendir: fix malloc-failure
256
+
257
+* jk/asciidoc-update (2010-11-19) 1 commit
258
+ (merged to 'next' on 2010-12-08 at 72ffafe)
259
+ + docs: default to more modern toolset
260
+
261
+* jk/maint-reflog-bottom (2010-11-21) 1 commit
262
+ (merged to 'next' on 2010-12-08 at f5ca80a)
263
+ + reflogs: clear flags properly in corner case
264
+
265
+* jn/fast-import-ondemand-checkpoint (2010-11-22) 1 commit
266
+ (merged to 'next' on 2010-12-08 at f538396)
267
+ + fast-import: treat SIGUSR1 as a request to access objects early
268
+
269
+* jn/maint-fast-import-object-reuse (2010-11-23) 1 commit
270
+ (merged to 'next' on 2010-12-08 at 5d29c08)
271
+ + fast-import: insert new object entries at start of hash bucket
272
+
273
+* jn/maint-svn-fe (2010-12-05) 3 commits
274
+ (merged to 'next' on 2010-12-08 at e25350b)
275
+ + vcs-svn: fix intermittent repo_tree corruption
276
+ + treap: make treap_insert return inserted node
277
+ + t9010 (svn-fe): Eliminate dependency on svn perl bindings
278
+
279
+* jn/svn-fe (2010-12-06) 18 commits
280
+ - vcs-svn: Allow change nodes for root of tree (/)
281
- vcs-svn: Implement Prop-delta handling
282
- vcs-svn: Sharpen parsing of property lines
283
- vcs-svn: Split off function for handling of individual properties
@@ -385,12 +299,12 @@ Will merge to 'next' soon.
299
Some RFC patches, to give them early and wider exposure.
300
301
* mz/rebase-abort-reflog-fix (2010-11-21) 1 commit
388
- - rebase --abort: do not update branch ref
302
+ (merged to 'next' on 2010-12-08 at adce2e1)
303
+ + rebase --abort: do not update branch ref
304
305
* mz/rebase-i-verify (2010-11-22) 1 commit
391
- - rebase: support --verify
392
-
393
-Will merge to 'next' soon.
306
+ (merged to 'next' on 2010-12-08 at 18275df)
307
+ + rebase: support --verify
308
309
* nd/maint-relative (2010-11-20) 1 commit
310
- get_cwd_relative(): do not misinterpret root path
@@ -398,108 +312,60 @@ Will merge to 'next' soon.
312
Will merge to 'next' soon.
313
314
* tc/format-patch-p (2010-11-23) 1 commit
401
- - format-patch: page output with --stdout
315
+ (merged to 'next' on 2010-12-08 at e8bff23)
316
+ + format-patch: page output with --stdout
317
318
I am indifferent/uninterested; I don't see anything wrong with it,
319
though.
320
321
* tc/http-urls-ends-with-slash (2010-11-25) 9 commits
407
- - http-fetch: rework url handling
408
- - http-push: add trailing slash at arg-parse time, instead of later on
409
- - http-push: check path length before using it
410
- - http-push: Normalise directory names when pushing to some WebDAV servers
411
- - http-backend: use end_url_with_slash()
412
- - url: add str wrapper for end_url_with_slash()
413
- - shift end_url_with_slash() from http.[ch] to url.[ch]
414
- - t5550-http-fetch: add test for http-fetch
415
- - t5550-http-fetch: add missing '&&'
416
-
417
-Will merge to 'next' soon.
418
-
419
-* gb/gitweb-remote-heads (2010-11-11) 11 commits
420
- (merged to 'next' on 2010-11-24 at 6fb4a6f)
421
- + git instaweb: enable remote_heads
422
- + gitweb: group remote heads by remote
423
- + gitweb: provide a routine to display (sub)sections
424
- + gitweb: refactor repository URL printing
425
- + gitweb: remotes view for a single remote
426
- + gitweb: allow action specialization in page header
427
- + gitweb: nagivation menu for tags, heads and remotes
428
- + gitweb: separate heads and remotes lists
429
- + gitweb: git_get_heads_list accepts an optional list of refs
430
- + gitweb: introduce remote_heads feature
431
- + gitweb: use fullname as hash_base in heads link
432
-
433
-* gc/http-with-non-ascii-username-url (2010-11-14) 2 commits
434
- (merged to 'next' on 2010-11-24 at 08f317f)
435
- + Fix username and password extraction from HTTP URLs
436
- + t5550: test HTTP authentication and userinfo decoding
437
-
438
-* jk/maint-decorate-01-bool (2010-11-17) 1 commit
439
- (merged to 'next' on 2010-11-24 at 347f73b)
440
- + log.decorate: accept 0/1 bool values
441
- (this branch is used by jk/pager-per-command.)
442
-
443
-* jk/pager-per-command (2010-11-17) 1 commit
444
- (merged to 'next' on 2010-11-24 at 9ebcffc)
445
- + allow command-specific pagers in pager.<cmd>
446
- (this branch uses jk/maint-decorate-01-bool.)
447
-
448
-* jn/getenv-poison (2010-11-12) 1 commit
449
- . add GETENV_POISON option to simulate unfriendly getenv()
450
- (this branch uses ks/maint-getenv-fix.)
451
-
452
-* jn/gitweb-time-hires-comes-with-5.8 (2010-11-09) 1 commit
453
- (merged to 'next' on 2010-11-24 at 6b91b41)
454
- + gitweb: Time::HiRes is in core for Perl 5.8
455
-
456
-* ks/maint-getenv-fix (2010-11-11) 1 commit
457
- (merged to 'next' on 2010-11-24 at fa89826)
458
- + setup: make sure git_dir path is in a permanent buffer, getenv(3) case
459
- (this branch is used by jn/getenv-poison.)
322
+ (merged to 'next' on 2010-12-08 at b9a878a)
323
+ + http-fetch: rework url handling
324
+ + http-push: add trailing slash at arg-parse time, instead of later on
325
+ + http-push: check path length before using it
326
+ + http-push: Normalise directory names when pushing to some WebDAV servers
327
+ + http-backend: use end_url_with_slash()
328
+ + url: add str wrapper for end_url_with_slash()
329
+ + shift end_url_with_slash() from http.[ch] to url.[ch]
330
+ + t5550-http-fetch: add test for http-fetch
331
+ + t5550-http-fetch: add missing '&&'
332
333
* nd/extended-sha1-relpath (2010-11-28) 2 commits
462
- - get_sha1: support relative path ":path" syntax
463
- - Make prefix_path() return char* without const
334
+ (merged to 'next' on 2010-12-08 at 940e5e2)
335
+ + get_sha1: support relative path ":path" syntax
336
+ + Make prefix_path() return char* without const
337
(this branch uses jn/parse-options-extra.)
338
466
-As jn/parse-options-extra seems to be still rerolled, this needs to stay
467
-outside 'next' waiting for it.
468
-
469
-* nd/maint-fix-add-typo-detection (2010-11-27) 6 commits
339
+* nd/maint-fix-add-typo-detection (2010-11-27) 5 commits
340
- Revert "excluded_1(): support exclude files in index"
341
- unpack-trees: fix sparse checkout's "unable to match directories"
342
- unpack-trees: move all skip-worktree checks back to unpack_trees()
343
- dir.c: add free_excludes()
344
- cache.h: realign and use (1 << x) form for CE_* constants
475
- (merged to 'next' on 2010-11-24 at 6832306)
476
- + add: do not rely on dtype being NULL behavior
345
478
-Will merge to 'next'.
346
+Note that the commit that used to be at the bottom of this series
347
+have been merged to 'master' (it was a no-op fix).
348
349
* jh/gitweb-caching (2010-12-03) 4 commits
481
- - gitweb: Minimal testing of gitweb caching
482
- - gitweb: File based caching layer (from git.kernel.org)
483
- - gitweb: add output buffering and associated functions
484
- - gitweb: Prepare for splitting gitweb
485
-
486
-Slightly updated.
350
+ . gitweb: Minimal testing of gitweb caching
351
+ . gitweb: File based caching layer (from git.kernel.org)
352
+ . gitweb: add output buffering and associated functions
353
+ . gitweb: Prepare for splitting gitweb
354
355
* jn/parse-options-extra (2010-12-01) 10 commits
489
- - update-index: migrate to parse-options API
490
- - setup: save prefix (original cwd relative to toplevel) in startup_info
491
- - parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION
492
- - parse-options: allow git commands to invent new option types
493
- - parse-options: never suppress arghelp if LITERAL_ARGHELP is set
494
- - parse-options: do not infer PARSE_OPT_NOARG from option type
495
- - parse-options: sanity check PARSE_OPT_NOARG flag
496
- - parse-options: move NODASH sanity checks to parse_options_check
497
- - parse-options: clearer reporting of API misuse
498
- - parse-options: Don't call parse_options_check() so much
356
+ (merged to 'next' on 2010-12-08 at 3a3e3ac)
357
+ + update-index: migrate to parse-options API
358
+ + setup: save prefix (original cwd relative to toplevel) in startup_info
359
+ + parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION
360
+ + parse-options: allow git commands to invent new option types
361
+ + parse-options: never suppress arghelp if LITERAL_ARGHELP is set
362
+ + parse-options: do not infer PARSE_OPT_NOARG from option type
363
+ + parse-options: sanity check PARSE_OPT_NOARG flag
364
+ + parse-options: move NODASH sanity checks to parse_options_check
365
+ + parse-options: clearer reporting of API misuse
366
+ + parse-options: Don't call parse_options_check() so much
367
(this branch is used by nd/extended-sha1-relpath.)
368
501
-Rerolled.
502
-
369
* nd/setup (2010-11-26) 47 commits
370
- git.txt: correct where --work-tree path is relative to
371
- Revert "Documentation: always respect core.worktree if set"
@@ -549,32 +415,15 @@ Rerolled.
415
- Add t1510 and basic rules that run repo setup
416
- builtins: print setup info if repo is found
417
552
-Rerolled.
553
-
554
-* mg/maint-tag-rfc1991 (2010-11-10) 5 commits
555
- (merged to 'next' on 2010-11-24 at 03864ed)
556
- + tag: recognize rfc1991 signatures
557
- + tag: factor out sig detection for tag display
558
- + tag: factor out sig detection for body edits
559
- + verify-tag: factor out signature detection
560
- + t/t7004-tag: test handling of rfc1991 signatures
561
-
562
-* jk/diff-CBM (2010-10-21) 1 commit
563
- (merged to 'next' on 2010-11-05 at 9d1ec14)
564
- + diff: report bogus input to -C/-M/-B
565
-
566
-Will merge to master soonish.
567
-
418
* jn/git-cmd-h-bypass-setup (2010-10-22) 7 commits
569
- - update-index -h: show usage even with corrupt index
570
- - merge -h: show usage even with corrupt index
571
- - ls-files -h: show usage even with corrupt index
572
- - gc -h: show usage even with broken configuration
573
- - commit/status -h: show usage even with broken configuration
574
- - checkout-index -h: show usage even in an invalid repository
575
- - branch -h: show usage even in an invalid repository
576
-
577
-Will merge to 'next'.
419
+ (merged to 'next' on 2010-12-08 at 0fc3158)
420
+ + update-index -h: show usage even with corrupt index
421
+ + merge -h: show usage even with corrupt index
422
+ + ls-files -h: show usage even with corrupt index
423
+ + gc -h: show usage even with broken configuration
424
+ + commit/status -h: show usage even with broken configuration
425
+ + checkout-index -h: show usage even in an invalid repository
426
+ + branch -h: show usage even in an invalid repository
427
428
* yd/dir-rename (2010-10-29) 5 commits
429
- Allow hiding renames of individual files involved in a directory rename.
@@ -585,46 +434,18 @@ Will merge to 'next'.
434
435
Yet to be rerolled.
436
588
-* il/remote-fd-ext (2010-11-17) 4 commits
589
- (merged to 'next' on 2010-11-24 at ef80cf1)
590
- + remote-fd/ext: finishing touches after code review
591
- (merged to 'next' on 2010-11-05 at 7413413)
592
- + git-remote-ext
593
- + git-remote-fd
594
- + Add bidirectional_transfer_loop()
595
-
596
-* jh/notes-merge (2010-11-09) 23 commits
597
- (merged to 'next' on 2010-11-24 at 6218115)
598
- + Provide 'git merge --abort' as a synonym to 'git reset --merge'
599
- + cmd_merge(): Parse options before checking MERGE_HEAD
600
- + Provide 'git notes get-ref' to easily retrieve current notes ref
601
- + git notes merge: Add testcases for merging notes trees at different fanouts
602
- + git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
603
- + git notes merge: --commit should fail if underlying notes ref has moved
604
- + git notes merge: List conflicting notes in notes merge commit message
605
- + git notes merge: Manual conflict resolution, part 2/2
606
- + git notes merge: Manual conflict resolution, part 1/2
607
- + Documentation: Preliminary docs on 'git notes merge'
608
- + git notes merge: Add automatic conflict resolvers (ours, theirs, union)
609
- + git notes merge: Handle real, non-conflicting notes merges
610
- + builtin/notes.c: Refactor creation of notes commits.
611
- + git notes merge: Initial implementation handling trivial merges only
612
- + builtin/notes.c: Split notes ref DWIMmery into a separate function
613
- + notes.c: Use two newlines (instead of one) when concatenating notes
614
- + (trivial) t3303: Indent with tabs instead of spaces for consistency
615
- + notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond
616
- + notes.h/c: Allow combine_notes functions to remove notes
617
- + notes.c: Reorder functions in preparation for next commit
618
- + notes.h: Make default_notes_ref() available in notes API
619
- + (trivial) notes.h: Minor documentation fixes to copy_notes()
620
- + notes.c: Hexify SHA1 in die() message from init_notes()
621
-
622
-* nd/struct-pathspec (2010-09-20) 5 commits
437
+* nd/struct-pathspec (2010-09-20) 11 commits
438
- ce_path_match: drop prefix matching in favor of match_pathspec
439
- Convert ce_path_match() to use struct pathspec
440
- tree_entry_interesting: turn to match_pathspec if wildcard is present
441
- pathspec: add tree_recursive_diff parameter
442
- pathspec: mark wildcard pathspecs from the beginning
443
+ - Move tree_entry_interesting() to tree-walk.c and export it
444
+ - tree_entry_interesting(): remove dependency on struct diff_options
445
+ - Convert struct diff_options to use struct pathspec
446
+ - pathspec: cache string length when initializing pathspec
447
+ - diff-no-index: use diff_tree_setup_paths()
448
+ - Add struct pathspec
449
(this branch is tangled with en/object-list-with-pathspec.)
450
451
This is related to something I have long been wanting to see happen.
@@ -642,11 +463,10 @@ Wait Nguyen for another round (2010-11-11).
463
(this branch is tangled with nd/struct-pathspec.)
464
465
* jl/fetch-submodule-recursive (2010-11-11) 3 commits
645
- - Submodules: Add the "fetchRecurseSubmodules" config option
646
- - Add the 'fetch.recurseSubmodules' config setting
647
- - fetch/pull: Add the --recurse-submodules option
648
-
649
-Will merge to 'next' soonish.
466
+ (merged to 'next' on 2010-12-08 at 676c4f5)
467
+ + Submodules: Add the "fetchRecurseSubmodules" config option
468
+ + Add the 'fetch.recurseSubmodules' config setting
469
+ + fetch/pull: Add the --recurse-submodules option
470
471
* tr/merge-unborn-clobber (2010-08-22) 1 commit
472
- Exhibit merge bug that clobbers index&WT