What's cooking (2011/05 #03)
Junio C Hamano committed
May 6, 2011 at 13:22 UTC
493b2c139ed8bb622d4eddf786aac3f872abe3b8
1 file changed
+169
-244
whats-cooking.txt
+169
-244
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (May 2011, #02; Wed, 4)
3
-X-master-at: 505a138cbd5c45d890d180383c8bd808ee8105aa
4
-X-next-at: 76e37e21d4a31e0ad0e9ef50ca7dc8e2402a26b1
2
+Subject: What's cooking in git.git (May 2011, #03; Fri, 6)
3
+X-master-at: 4e3aa87d13b339fa678cd3cb7f23664d3a48fb21
4
+X-next-at: 711ff7850102428a21459848c6ae899101e93bc6
5
6
-What's cooking in git.git (May 2011, #02; Wed, 4)
6
+What's cooking in git.git (May 2011, #03; Fri, 6)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -12,157 +12,113 @@ only in 'pu' while commits prefixed with '+' are in 'next'.
12
The main part of this cycle is expected to run thru May, aiming for a
13
feature freeze in early June.
14
15
-We are in the middle of week #2 of this cycle.
15
+We are late in the week #2 of this cycle.
16
17
--------------------------------------------------
18
-[New Topics]
18
+[Graduated to "master"]
19
20
-* jc/dotdot-is-parent-directory (2011-05-02) 1 commit
21
- - specifying ranges: we did not mean to make ".." an empty set
20
+* aw/maint-rebase-i-p-no-ff (2011-04-28) 1 commit
21
+ (merged to 'next' on 2011-05-02 at 9a159a5)
22
+ + git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
23
23
-Updated documentation.
24
+* cj/p4merge (2011-05-01) 1 commit
25
+ (merged to 'next' on 2011-05-02 at 7197ef3)
26
+ + Pass empty file to p4merge where no base is suitable.
27
25
-* mg/diff-stat-count (2011-05-03) 2 commits
26
- - diff-options.txt: describe --stat-{width,name-width,count}
27
- - diff: introduce --stat-count to limit the stat lines
28
+* gr/cvsimport-alternative-cvspass-location (2011-05-01) 1 commit
29
+ (merged to 'next' on 2011-05-02 at 5a89e3e)
30
+ + Look for password in both CVS and CVSNT password files.
31
29
-There was a miscounting spotted. Need another round.
32
+* im/hashcmp-optim (2011-04-28) 1 commit
33
+ (merged to 'next' on 2011-05-02 at f131195)
34
+ + hashcmp(): inline memcmp() by hand to optimize
35
31
-* mk/grep-pcre (2011-05-03) 3 commits
32
- - git-grep: Learn PCRE
33
- - Documentation: Add --line-number to git-grep synopsis
34
- - [Missing sign-off and justification] grep: Put calls to fixmatch() and regmatch() into patmatch()
36
+* jc/fix-diff-files-unmerged (2011-04-22) 4 commits
37
+ (merged to 'next' on 2011-04-28 at f1f837c)
38
+ + diff-files: show unmerged entries correctly
39
+ + diff: remove often unused parameters from diff_unmerge()
40
+ + diff.c: return filepair from diff_unmerge()
41
+ + test: use $_z40 from test-lib
42
+ (this branch is used by jc/add-delete-default and jc/fix-add-u-unmerged.)
43
36
-There was a re-roll but I haven't picked it up yet.
44
+* jk/format-patch-quote-special-in-from (2011-04-08) 1 commit
45
+ (merged to 'next' on 2011-04-28 at 587f2d4)
46
+ + pretty: quote rfc822 specials in email addresses
47
38
-* vh/config-interactive-singlekey-doc (2011-05-02) 1 commit
39
- - config.txt: 'interactive.singlekey; is used by...
48
+* jk/merge-one-file-working-tree (2011-04-29) 2 commits
49
+ (merged to 'next' on 2011-05-02 at 308fe21)
50
+ + merge-one-file: fix broken merges with alternate work trees
51
+ + add tests for merge-index / merge-one-file
52
41
-Will merge to 'next' but I recall we discussed the need for more cross
42
-references and description of the configuration variable in Patch mode
43
-documentation.
53
+* jn/run-command-error-failure (2011-04-20) 2 commits
54
+ (merged to 'next' on 2011-04-26 at a1f171e)
55
+ + run-command: handle short writes and EINTR in die_child
56
+ + tests: check error message from run_command
57
45
-* jc/maint-branch-mergeoptions (2011-05-04) 1 commit
46
- - merge: fix branch.<name>.mergeoptions
58
+* js/blame-parsename (2011-05-05) 2 commits
59
+ (merged to 'next' on 2011-05-05 at 1d5e505)
60
+ + t/annotate-tests: Use echo & cat instead of sed
61
+ (merged to 'next' on 2011-04-29 at 5fde945)
62
+ + blame: tolerate bogus e-mail addresses a bit better
63
48
-Fix branch.<name>.mergeoptions that does not override merge.<option>
64
+* js/info-man-path (2011-05-02) 2 commits
65
+ (merged to 'next' on 2011-05-02 at 20a15dd)
66
+ + Documentation: clarify meaning of --html-path, --man-path, and --info-path
67
+ + git: add --info-path and --man-path options
68
50
-* jc/require-work-tree-exists (2011-05-04) 1 commit
51
- - require-work-tree wants more than what its name says
69
+* mg/alias-expose-prefix (2011-04-27) 2 commits
70
+ (merged to 'next' on 2011-05-02 at 1c01d3a)
71
+ + handle_alias: provide GIT_PREFIX to !alias
72
+ + t1020: test !alias in subdirectory
73
53
-Make "git pull" run from a random place work as long as GIT_DIR and
54
-GIT_WORK_TREE are set up correctly. I am not absolutely sure if that
55
-is a sane use case, though.
74
+* mg/diff-uiconfig-doc (2011-04-27) 1 commit
75
+ (merged to 'next' on 2011-05-02 at 579a515)
76
+ + config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
77
+
78
+* nd/struct-pathspec (2011-04-05) 5 commits
79
+ (merged to 'next' on 2011-04-25 at 65dbe80)
80
+ + pathspec: rename per-item field has_wildcard to use_wildcard
81
+ + Improve tree_entry_interesting() handling code
82
+ + Convert read_tree{,_recursive} to support struct pathspec
83
+ + Reimplement read_tree_recursive() using tree_entry_interesting()
84
+ + Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'
85
+
86
+* sg/completion-cleanup (2011-04-28) 2 commits
87
+ + completion: remove unnecessary _get_comp_words_by_ref() invocations
88
+ + completion: don't modify the $cur variable in completion functions
89
+ (this branch is used by sg/completion-updates.)
90
91
--------------------------------------------------
58
-[Graduated to "master"]
92
+[New Topics]
93
60
-* ab/i18n-fixup (2011-04-14) 24 commits
61
- (merged to 'next' on 2011-04-25 at 32fef07)
62
- + i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
63
- + i18n: use test_i18n{grep,cmp} in t7508
64
- + i18n: use test_i18ngrep in t7506
65
- + i18n: use test_i18ngrep and test_i18ncmp in t7502
66
- + i18n: use test_i18ngrep in t7501
67
- + i18n: use test_i18ncmp in t7500
68
- + i18n: use test_i18ngrep in t7201
69
- + i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110
70
- + i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
71
- + i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014
72
- + i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
73
- + i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200
74
- + i18n: use test_i18ngrep in lib-httpd and t2019
75
- + i18n: do not overuse C_LOCALE_OUTPUT (grep)
76
- + i18n: use test_i18ncmp in t1200 and t2200
77
- + i18n: .git file is not a human readable message (t5601)
78
- + i18n: do not overuse C_LOCALE_OUTPUT
79
- + i18n: mark init-db messages for translation
80
- + i18n: mark checkout plural warning for translation
81
- + i18n: mark checkout --detach messages for translation
82
- + i18n: mark clone nonexistent repository message for translation
83
- + i18n: mark merge CHERRY_PICK_HEAD messages for translation
84
- + i18n: mark merge "upstream" messages for translation
85
- + i18n: mark merge "Could not read from" message for translation
86
-
87
-* ft/gitweb-tar-with-gzip-n (2011-04-26) 1 commit
88
- (merged to 'next' on 2011-04-26 at 8e59a0e)
89
- + gitweb: supply '-n' to gzip for identical output
90
-
91
-* jh/notes-add-ui (2011-03-30) 1 commit
92
- (merged to 'next' on 2011-04-25 at 4fb1ac2)
93
- + Make "git notes add" more user-friendly when there are existing notes
94
-
95
-* jk/format-patch-multiline-header (2011-04-14) 1 commit
96
- (merged to 'next' on 2011-04-26 at 3d5eda3)
97
- + format-patch: wrap email addresses after long names
98
-
99
-* jk/notes-ui-updates (2011-04-14) 8 commits
100
- (merged to 'next' on 2011-04-25 at 4216d33)
101
- + contrib/completion: --notes, --no-notes
102
- + log/pretty-options: Document --[no-]notes and deprecate old notes options
103
- + revision.c: make --no-notes reset --notes list
104
- + revision.c: support --notes command-line option
105
- + notes: refactor display notes default handling
106
- + notes: refactor display notes extra refs field
107
- + revision.c: refactor notes ref expansion
108
- + notes: make expand_notes_ref globally accessible
109
-
110
-* jm/mergetool-submodules (2011-04-13) 1 commit
111
- (merged to 'next' on 2011-04-26 at 40892cf)
112
- + mergetool: Teach about submodules
113
-
114
-* jn/format-patch-doc (2011-04-18) 6 commits
115
- (merged to 'next' on 2011-04-26 at 3f64325)
116
- + Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird
117
- + Documentation: publicize hints for sending patches with GMail
118
- + Documentation: publicize KMail hints for sending patches inline
119
- + Documentation: hints for sending patches inline with Thunderbird
120
- + Documentation: explain how to check for patch corruption
121
- + Merge v1.7.5-rc2 into jn/format-patch-doc
122
- (this branch uses jn/maint-format-patch-doc.)
123
-
124
-* jn/maint-format-patch-doc (2011-04-14) 1 commit
125
- (merged to 'next' on 2011-04-26 at 400cf42)
126
- + Documentation: describe the format of messages with inline patches
127
- (this branch is used by jn/format-patch-doc.)
128
-
129
-* mg/rev-list-count-cherry (2011-04-26) 1 commit
130
- (merged to 'next' on 2011-04-26 at dc3e80a)
131
- + rev-list --count: separate count for --cherry-mark
132
-
133
-* ml/test-readme (2011-04-26) 1 commit
134
- (merged to 'next' on 2011-04-26 at d1efe84)
135
- + t/README: unify documentation of test function args
136
-
137
-* mz/maint-rename-unmerged (2011-03-23) 1 commit
138
- (merged to 'next' on 2011-04-25 at 038a8c3)
139
- + diffcore-rename: don't consider unmerged path as source
140
-
141
-* nd/maint-setup (2011-03-26) 2 commits
142
- (merged to 'next' on 2011-04-25 at fd45c63)
143
- + Kill off get_relative_cwd()
144
- + setup: return correct prefix if worktree is '/'
145
-
146
-* nm/submodule-update-force (2011-04-01) 1 commit
147
- (merged to 'next' on 2011-04-25 at 270fffc)
148
- + submodule: Add --force option for git submodule update
149
-
150
-* ss/cherry-pick-x-doc (2011-04-15) 1 commit
151
- (merged to 'next' on 2011-04-26 at c9a6f83)
152
- + doc: Clarify that "cherry-pick -x" does not use "git notes"
153
-
154
-* ss/doc-svn (2011-04-19) 1 commit
155
- (merged to 'next' on 2011-04-26 at a723b91)
156
- + remove noise and inaccuracies from git-svn docs
157
-
158
-* vr/merge-base-doc (2011-04-15) 2 commits
159
- (merged to 'next' on 2011-04-26 at e906ba3)
160
- + Restructure documentation for git-merge-base.
161
- + Documentation: update to git-merge-base --octopus
94
+* sr/maint-fast-import-tighten-option-parsing (2011-05-05) 1 commit
95
+ - fast-import: fix option parser for no-arg options
96
+
97
+Will merge to "next".
98
+
99
+* jc/advice-about-to-lose-commit (2011-05-06) 1 commit
100
+ - checkout: honor advice.detachedHead when reattaching to a branch
101
+
102
+A weather-balloon.
103
+
104
+* mg/merge-ff-config (2011-05-06) 2 commits
105
+ - merge: introduce merge.ff configuration variable
106
+ - Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config
107
+ (this branch uses jc/maint-branch-mergeoptions.)
108
109
--------------------------------------------------
110
[Stalled]
111
112
+* kk/maint-prefix-in-config-mak (2011-05-04) 3 commits
113
+ - config.mak.in: allow "configure --sysconfdir=/else/where"
114
+ - Makefile: allow sysconfdir to be used from configure
115
+ (merged to 'next' on 2011-05-02 at c747ba3)
116
+ + Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
117
+
118
+J6t is unhappy that sysconfdir is ignored in relocatable case. Although I
119
+personally do not think that is a problem, as it has never been an issue,
120
+let's see what others think.
121
+
122
* jn/gitweb-js (2011-04-28) 13 commits
123
- gitweb: Make JavaScript ability to adjust timezones configurable
124
- gitweb.js: Add UI for selecting common timezone to display dates
@@ -180,22 +136,42 @@ is a sane use case, though.
136
137
Rerolled. Waiting for comments.
138
183
-* jn/ctags (2011-04-29) 6 commits
139
+* jn/ctags-more (2011-04-29) 3 commits
140
- gitweb: Optional grouping of projects by category
141
- gitweb: Modularized git_get_project_description to be more generic
142
- gitweb: Split git_project_list_body in two functions
187
- - gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)
188
- - gitweb: Change the way "content tags" ('ctags') are handled
189
- - gitweb: Restructure projects list generation
143
+ (this branch uses jn/ctags.)
144
145
Waiting for comments.
146
147
+* jc/dotdot-is-parent-directory (2011-05-02) 1 commit
148
+ - specifying ranges: we did not mean to make ".." an empty set
149
+
150
+Updated documentation.
151
+
152
+* mg/diff-stat-count (2011-05-03) 2 commits
153
+ - diff-options.txt: describe --stat-{width,name-width,count}
154
+ - diff: introduce --stat-count to limit the stat lines
155
+
156
+There was a miscounting spotted. Need another round.
157
+
158
+* jc/require-work-tree-exists (2011-05-04) 1 commit
159
+ - require-work-tree wants more than what its name says
160
+
161
+Make "git pull" run from a random place work as long as GIT_DIR and
162
+GIT_WORK_TREE are set up correctly. I am not absolutely sure if that
163
+is a sane use case, though.
164
+
165
+* jc/add-delete-default (2011-04-19) 1 commit
166
+ - git add: notice removal of tracked paths by default
167
+ (this branch uses jc/fix-add-u-unmerged.)
168
+
169
* jk/maint-merge-rename-create (2011-03-25) 3 commits
170
- merge: turn on rewrite detection
171
- merge: handle renames with replacement content
172
- t3030: fix accidental success in symlink rename
173
198
-Peff wanted to reroll this, so this is taken out of "next".
174
+Peff wanted to reroll this.
175
176
* rr/rerere-clear-libify (2011-04-13) 1 commit
177
- rerere: Expose an API corresponding to 'clear' functionality
@@ -227,59 +203,48 @@ current usage context.
203
--------------------------------------------------
204
[Cooking]
205
230
-* dm/http-cleanup (2011-05-05) 4 commits
231
- - t5541-http-push: add test for chunked
232
- - http-push: refactor curl_easy_setup madness
233
- - http-push: use const for strings in signatures
234
- - http: make curl callbacks match contracts from curl header
235
-
236
-* im/hashcmp-optim (2011-04-28) 1 commit
237
- (merged to 'next' on 2011-05-02 at f131195)
238
- + hashcmp(): inline memcmp() by hand to optimize
239
-
240
-* jc/add-delete-default (2011-04-19) 1 commit
241
- - git add: notice removal of tracked paths by default
242
- (this branch uses jc/fix-add-u-unmerged, jc/fix-add-u-unmerged and jc/fix-diff-files-unmerged.)
243
-
244
-* kk/maint-prefix-in-config-mak (2011-05-04) 3 commits
245
- - config.mak.in: allow "configure --sysconfdir=/else/where"
246
- - Makefile: allow sysconfdir to be used from configure
247
- (merged to 'next' on 2011-05-02 at c747ba3)
248
- + Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
249
-
250
-Fixed up after hitting 'next'.
206
+* mk/grep-pcre (2011-05-05) 3 commits
207
+ - grep: Put calls to fixmatch() and regmatch() into patmatch()
208
+ - contrib/completion: --line-number to git grep
209
+ - Documentation: Add --line-number to git-grep synopsis
210
252
-* sg/completion-updates (2011-04-28) 3 commits
253
- (merged to 'next' on 2011-05-02 at 0fd443a)
254
- + completion: don't declare 'local words' to make zsh happy
255
- + completion: remove unnecessary _get_comp_words_by_ref() invocations
256
- + completion: don't modify the $cur variable in completion functions
211
+This is without the real PCRE integration. The above three looked
212
+reasonable clean-ups regardless.
213
258
-Has this one settled?
214
+Will merge to "next".
215
260
-* jk/merge-one-file-working-tree (2011-04-29) 2 commits
261
- (merged to 'next' on 2011-05-02 at 308fe21)
262
- + merge-one-file: fix broken merges with alternate work trees
263
- + add tests for merge-index / merge-one-file
216
+* vh/config-interactive-singlekey-doc (2011-05-05) 5 commits
217
+ (merged to 'next' on 2011-05-06 at 46b522c)
218
+ + git-reset.txt: better docs for '--patch'
219
+ + git-checkout.txt: better docs for '--patch'
220
+ + git-stash.txt: better docs for '--patch'
221
+ + git-add.txt: document 'interactive.singlekey'
222
+ + config.txt: 'interactive.singlekey; is used by...
223
265
-* js/blame-parsename (2011-04-21) 1 commit
266
- (merged to 'next' on 2011-04-29 at 5fde945)
267
- + blame: tolerate bogus e-mail addresses a bit better
224
+* jc/maint-branch-mergeoptions (2011-05-04) 1 commit
225
+ - merge: fix branch.<name>.mergeoptions
226
+ (this branch is used by mg/merge-ff-config.)
227
269
-Will merge to "master" by the end of week #2.
228
+Fix branch.<name>.mergeoptions that does not override merge.<option>; this
229
+is needed for the "merge.ff" configuration topic to correctly work.
230
271
-* js/info-man-path (2011-05-02) 2 commits
272
- (merged to 'next' on 2011-05-02 at 20a15dd)
273
- + Documentation: clarify meaning of --html-path, --man-path, and --info-path
274
- + git: add --info-path and --man-path options
231
+* jn/ctags (2011-04-29) 3 commits
232
+ (merged to 'next' on 2011-05-06 at 5c574ff)
233
+ + gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)
234
+ + gitweb: Change the way "content tags" ('ctags') are handled
235
+ + gitweb: Restructure projects list generation
236
+ (this branch is used by jn/ctags-more.)
237
276
-* cj/p4merge (2011-05-01) 1 commit
277
- (merged to 'next' on 2011-05-02 at 7197ef3)
278
- + Pass empty file to p4merge where no base is suitable.
238
+* dm/http-cleanup (2011-05-05) 4 commits
239
+ (merged to 'next' on 2011-05-06 at 711ff78)
240
+ + t5541-http-push: add test for chunked
241
+ + http-push: refactor curl_easy_setup madness
242
+ + http-push: use const for strings in signatures
243
+ + http: make curl callbacks match contracts from curl header
244
280
-* gr/cvsimport-alternative-cvspass-location (2011-05-01) 1 commit
281
- (merged to 'next' on 2011-05-02 at 5a89e3e)
282
- + Look for password in both CVS and CVSNT password files.
245
+* sg/completion-updates (2011-04-28) 1 commit
246
+ (merged to 'next' on 2011-05-02 at 0fd443a)
247
+ + completion: don't declare 'local words' to make zsh happy
248
249
* jc/maint-add-p-overlapping-hunks (2011-04-06) 4 commits
250
(merged to 'next' on 2011-05-02 at e57b66f)
@@ -288,11 +253,14 @@ Will merge to "master" by the end of week #2.
253
+ t3701: Editing a split hunk in an "add -p" session
254
+ add -p: 'q' should really quit
255
256
+Probably needs tests.
257
+
258
* ld/p4-preserve-user-names (2011-04-21) 1 commit
259
(merged to 'next' on 2011-04-29 at 25116c8)
260
+ git-p4: add option to preserve user names
261
295
-Will merge to "master" by the end of week #2.
262
+Luke wants to update this, so will not be merging to "master" until the
263
+update settles down.
264
265
* jh/dirstat-lines (2011-04-29) 8 commits
266
(merged to 'next' on 2011-04-29 at a302674)
@@ -305,76 +273,43 @@ Will merge to "master" by the end of week #2.
273
+ Make --dirstat=0 output directories that contribute < 0.1% of changes
274
+ Add several testcases for --dirstat and friends
275
308
-* aw/maint-rebase-i-p-no-ff (2011-04-28) 1 commit
309
- (merged to 'next' on 2011-05-02 at 9a159a5)
310
- + git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
311
-
312
-* mg/alias-expose-prefix (2011-04-27) 2 commits
313
- (merged to 'next' on 2011-05-02 at 1c01d3a)
314
- + handle_alias: provide GIT_PREFIX to !alias
315
- + t1020: test !alias in subdirectory
316
-
317
-* mg/diff-uiconfig-doc (2011-04-27) 1 commit
318
- (merged to 'next' on 2011-05-02 at 579a515)
319
- + config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
320
-
321
-* jk/format-patch-quote-special-in-from (2011-04-08) 1 commit
322
- (merged to 'next' on 2011-04-28 at 587f2d4)
323
- + pretty: quote rfc822 specials in email addresses
324
-
325
-Will merge to "master" by the end of week #2.
276
+Will merge to "master" by the end of week #3.
277
278
* jn/setup-revisions-glob-and-friends-passthru (2011-04-21) 2 commits
279
(merged to 'next' on 2011-04-28 at 6006cc4)
280
+ revisions: allow --glob and friends in parse_options-enabled commands
281
+ revisions: split out handle_revision_pseudo_opt function
282
283
+Will merge to "master" by the end of week #3.
284
+
285
* cn/log-parse-opt (2011-04-14) 1 commit
286
(merged to 'next' on 2011-04-28 at 02f2eac)
287
+ log: convert to parse-options
288
289
+Will merge to "master" by the end of week #3.
290
+
291
* jc/fix-add-u-unmerged (2011-04-20) 1 commit
292
(merged to 'next' on 2011-04-28 at f7ed821)
293
+ Fix "add -u" that sometimes fails to resolve unmerged paths
339
- (this branch is used by jc/add-delete-default and jc/add-delete-default; uses jc/fix-diff-files-unmerged.)
294
+ (this branch is used by jc/add-delete-default.)
295
341
-* jc/fix-diff-files-unmerged (2011-04-22) 4 commits
342
- (merged to 'next' on 2011-04-28 at f1f837c)
343
- + diff-files: show unmerged entries correctly
344
- + diff: remove often unused parameters from diff_unmerge()
345
- + diff.c: return filepair from diff_unmerge()
346
- + test: use $_z40 from test-lib
347
- (this branch is used by jc/add-delete-default and jc/fix-add-u-unmerged.)
296
+Will merge to "master" by the end of week #3.
297
349
-* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-04-25) 1 commit
298
+* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-05-05) 2 commits
299
+ + send-pack: unbreak push over stateless rpc
300
+ send-pack: avoid deadlock when pack-object dies early
301
(this branch is used by js/maint-send-pack-stateless-rpc-deadlock-fix.)
302
353
-Will merge to "master" by the end of week #2.
303
+Will merge to "master" by the end of week #3.
304
355
-* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-04-25) 1 commit
305
+* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-05-05) 2 commits
306
+ (merged to 'next' on 2011-05-05 at 3f4ffb9)
307
+ + Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
308
(merged to 'next' on 2011-04-28 at db7e04a)
309
+ Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
310
(this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix.)
311
360
-Will merge to "master" by the end of week #2.
361
-
362
-* jn/run-command-error-failure (2011-04-20) 2 commits
363
- (merged to 'next' on 2011-04-26 at a1f171e)
364
- + run-command: handle short writes and EINTR in die_child
365
- + tests: check error message from run_command
366
-
367
-Will merge to "master" by the end of week #2.
368
-
369
-* nd/struct-pathspec (2011-04-05) 5 commits
370
- (merged to 'next' on 2011-04-25 at 65dbe80)
371
- + pathspec: rename per-item field has_wildcard to use_wildcard
372
- + Improve tree_entry_interesting() handling code
373
- + Convert read_tree{,_recursive} to support struct pathspec
374
- + Reimplement read_tree_recursive() using tree_entry_interesting()
375
- + Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'
376
-
377
-Will merge to "master" by the end of week #2.
312
+Will merge to "master" by the end of week #3.
313
314
* jc/magic-pathspec (2011-04-06) 3 commits
315
(merged to 'next' on 2011-04-25 at 788cd46)
@@ -383,16 +318,6 @@ Will merge to "master" by the end of week #2.
318
+ magic pathspec: add tentative ":/path/from/top/level" pathspec support
319
320
Thanks to Peff, Duy, and Michael for helping to whip the syntax and the
386
-basic semantics into a not-so-horrible shape.
387
-
388
-Will merge to "master" by the end of week #2.
389
-
390
-----------------------------------------------------------------
391
-[Discarded]
392
-
393
-* mg/branch-wildcard-config (2011-05-02) 1 commit
394
- - Add default merge options for all branches
395
-
396
-It seems a separate merge.ff configuration would be more favourable
397
-than this approach.
321
+basic semantics into a not-so-horrible shape. Duy wanted to add tests.
322
323
+Will merge to "master" by the end of week #3.