What's cooking (2011/05 #01)
Junio C Hamano committed
May 1, 2011 at 16:35 UTC
ed35c5ea26b01ed97b653bfb007b231e125fda7a
1 file changed
+211
-272
whats-cooking.txt
+211
-272
@@ -1,188 +1,168 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Apr 2011, #07; Wed, 27)
3
-X-master-at: e839fe6c1206292aeb4518939b8f124ae5068619
4
-X-next-at: f5ef3c22908b68d63e56ce32f4234438cd775f22
2
+Subject: What's cooking in git.git (May 2011, #01; Sun, 1)
3
+X-master-at: 791a765e54b9b4c8d2cf4f069222e31cef8aa24e
4
+X-next-at: b50356093b95c296fb375196ef0251da18b66448
5
6
-What's cooking in git.git (Apr 2011, #07; Wed, 27)
6
+What's cooking in git.git (May 2011, #01; Sun, 1)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' while commits prefixed with '+' are in 'next'.
11
12
The main part of this cycle is expected to run thru May, aiming for a
13
-feature freeze in early June. We are in the middle of week #1 of this
14
-cycle and week #2 starts on May 2nd.
13
+feature freeze in early June.
14
16
---------------------------------------------------
17
-[Graduated to "master"]
18
-
19
-* ar/clean-rmdir-empty (2011-04-01) 1 commit
20
- (merged to 'next' on 2011-04-25 at 5a71fdb)
21
- + clean: unreadable directory may still be rmdir-able if it is empty
22
-
23
-* cn/format-patch-quiet (2011-04-12) 2 commits
24
- (merged to 'next' on 2011-04-25 at 40e2d1c)
25
- + format-patch: document --quiet option
26
- + format-patch: don't pass on the --quiet flag
27
-
28
-* dm/color-palette (2011-04-05) 1 commit
29
- (merged to 'next' on 2011-04-25 at 839b17b)
30
- + Share color list between graph and show-branch
31
-
32
-* dm/stash-k-i-p (2011-04-07) 2 commits
33
- (merged to 'next' on 2011-04-25 at 01a207c)
34
- + stash: ensure --no-keep-index and --patch can be used in any order
35
- + stash: add two more tests for --no-keep-index
36
-
37
-* ef/maint-strbuf-init (2011-04-10) 2 commits
38
- (merged to 'next' on 2011-04-25 at 6a45422)
39
- + config: support values longer than 1023 bytes
40
- + strbuf: make sure buffer is zero-terminated
41
-
42
-* jc/merge-dash-previous (2011-04-07) 1 commit
43
- (merged to 'next' on 2011-04-25 at 512faf4)
44
- + merge: allow "-" as a short-hand for "previous branch"
45
-
46
-* jc/pack-objects-bigfile (2011-04-05) 1 commit
47
- (merged to 'next' on 2011-04-25 at 621035c)
48
- + Teach core.bigfilethreashold to pack-objects
49
-
50
-* jk/maint-stash-oob (2011-04-06) 2 commits
51
- (merged to 'next' on 2011-04-25 at 8478a92)
52
- + stash: fix false positive in the invalid ref test.
53
- + stash: fix accidental apply of non-existent stashes
54
-
55
-* jk/maint-upload-pack-shallow (2011-04-06) 1 commit
56
- (merged to 'next' on 2011-04-25 at 073dac4)
57
- + upload-pack: start pack-objects before async rev-list
58
-
59
-* jk/stash-loosen-safety (2011-04-05) 1 commit
60
- (merged to 'next' on 2011-04-25 at cdc549f)
61
- + stash: drop dirty worktree check on apply
62
-
63
-* mg/reflog-with-options (2011-04-01) 3 commits
64
- (merged to 'next' on 2011-04-25 at 1ab8b78)
65
- + reflog: fix overriding of command line options
66
- + t/t1411: test reflog with formats
67
- + builtin/log.c: separate default and setup of cmd_log_init()
68
- (this branch is used by mg/show-without-prune.)
69
-
70
-* mg/sha1-path-advise (2011-03-31) 2 commits
71
- (merged to 'next' on 2011-04-25 at 8b094f5)
72
- + sha1_name: Suggest commit:./file for path in subdir
73
- + t1506: factor out test for "Did you mean..."
74
-
75
-* mg/x-years-12-months (2011-04-20) 1 commit
76
- (merged to 'next' on 2011-04-25 at 74ba83b)
77
- + date: avoid "X years, 12 months" in relative dates
78
-
79
-* mh/git-svn-automkdirs (2011-04-01) 1 commit
80
- (merged to 'next' on 2011-04-25 at 2e95357)
81
- + git-svn: add an option to skip the creation of empty directories
82
-
83
-* nk/blame-abbrev (2011-04-06) 1 commit
84
- (merged to 'next' on 2011-04-25 at 59a4281)
85
- + blame: add --abbrev command line option and make it honor core.abbrev
86
-
87
-* rj/sparse (2011-04-07) 7 commits
88
- (merged to 'next' on 2011-04-25 at e1af2af)
89
- + sparse: Fix some "symbol not declared" warnings
90
- + sparse: Fix errors due to missing target-specific variables
91
- + sparse: Fix an "symbol 'merge_file' not decared" warning
92
- + sparse: Fix an "symbol 'format_subject' not declared" warning
93
- + sparse: Fix some "Using plain integer as NULL pointer" warnings
94
- + sparse: Fix an "symbol 'cmd_index_pack' not declared" warning
95
- + Makefile: Use cgcc rather than sparse in the check target
96
-
97
-* rr/doc-content-type (2011-04-07) 4 commits
98
- (merged to 'next' on 2011-04-25 at 83c41e4)
99
- + Documentation: Allow custom diff tools to be specified in 'diff.tool'
100
- + Documentation: Add diff.<driver>.* to config
101
- + Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
102
- + Documentation: Add filter.<driver>.* to config
15
+The week #2 of this cycle starts on May 2nd.
16
17
--------------------------------------------------
18
[New Topics]
19
107
-* aw/maint-rebase-i-p-no-ff (2011-04-20) 1 commit
108
- - git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
20
+* im/hashcmp-optim (2011-04-28) 1 commit
21
+ - hashcmp(): inline memcmp() by hand to optimize
22
110
-* mg/alias-expose-prefix (2011-04-27) 2 commits
111
- - handle_alias: provide GIT_PREFIX to !alias
112
- - t1020: test !alias in subdirectory
23
+Will merge to "next".
24
114
-* mg/diff-uiconfig-doc (2011-04-27) 1 commit
115
- - config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
25
+* jc/add-delete-default (2011-04-19) 1 commit
26
+ - git add: notice removal of tracked paths by default
27
+ (this branch uses jc/fix-add-u-unmerged, jc/fix-add-u-unmerged and jc/fix-diff-files-unmerged.)
28
117
-With tentative rewording.
29
+* kk/maint-prefix-in-config-mak (2011-04-28) 1 commit
30
+ - Honor $(prefix) set in config.mak* when defining ETC_GIT* and sysconfdir
31
119
-* ld/p4-preserve-user-names (2011-04-21) 1 commit
120
- - git-p4: add option to preserve user names
32
+Wait for msysgit folks to Ack, and then merge to "next".
33
122
-Pete acked and told Luke to wait and then resend; I just picked it up so
123
-that the patch is not lost.
34
+* sg/completion-updates (2011-04-28) 3 commits
35
+ - completion: don't declare 'local words' to make zsh happy
36
+ - completion: remove unnecessary _get_comp_words_by_ref() invocations
37
+ - completion: don't modify the $cur variable in completion functions
38
125
-* mg/rev-list-count-cherry (2011-04-26) 1 commit
126
- (merged to 'next' on 2011-04-26 at dc3e80a)
127
- + rev-list --count: separate count for --cherry-mark
39
+Will merge to "next".
40
129
-Will merge to "master" by the end of week #2.
41
+* jk/merge-one-file-working-tree (2011-04-29) 2 commits
42
+ - merge-one-file: fix broken merges with alternate work trees
43
+ - add tests for merge-index / merge-one-file
44
131
-* ft/gitweb-tar-with-gzip-n (2011-04-26) 1 commit
132
- (merged to 'next' on 2011-04-26 at 8e59a0e)
133
- + gitweb: supply '-n' to gzip for identical output
45
+Will merge to "next".
46
+
47
+* js/blame-parsename (2011-04-21) 1 commit
48
+ (merged to 'next' on 2011-04-29 at 5fde945)
49
+ + blame: tolerate bogus e-mail addresses a bit better
50
51
Will merge to "master" by the end of week #2.
52
137
-* ml/test-readme (2011-04-26) 1 commit
138
- (merged to 'next' on 2011-04-26 at d1efe84)
139
- + t/README: unify documentation of test function args
53
+* jn/ctags (2011-04-29) 6 commits
54
+ - gitweb: Optional grouping of projects by category
55
+ - gitweb: Modularized git_get_project_description to be more generic
56
+ - gitweb: Split git_project_list_body in two functions
57
+ - gitweb: Mark matched 'ctag' / contents tag (?by_tag=foo)
58
+ - gitweb: Change the way "content tags" ('ctags') are handled
59
+ - gitweb: Restructure projects list generation
60
141
-Will merge to "master" by the end of week #2.
61
+* js/info-man-path (2011-05-01) 1 commit
62
+ - git: add --info-path and --man-path options
63
143
-* sp/maint-clear-postfields (2011-04-26) 1 commit
144
- (merged to 'next' on 2011-04-26 at 0082503)
145
- + http: clear POSTFIELDS when initializing a slot
64
+* cj/p4merge (2011-05-01) 1 commit
65
+ - Pass empty file to p4merge where no base is suitable.
66
147
-Fixes a rather nasty bug we had since the beginning of smart-HTTP
148
-but has become a lot easier to trigger since 1.7.5, introducing a
149
-regression.
67
+--------------------------------------------------
68
+[Graduated to "master"]
69
151
-Will merge to "master" by the end of week #1.
70
+* en/merge-recursive (2011-03-17) 4 commits
71
+ (merged to 'next' on 2011-04-25 at 8027acd)
72
+ + merge-recursive: tweak magic band-aid
73
+ + merge-recursive: When we detect we can skip an update, actually skip it
74
+ + t6022: New test checking for unnecessary updates of files in D/F conflicts
75
+ + t6022: New test checking for unnecessary updates of renamed+modified files
76
153
-* jk/format-patch-quote-special-in-from (2011-04-08) 1 commit
154
- - pretty: quote rfc822 specials in email addresses
77
+* jc/diff-irreversible-delete (2011-02-28) 1 commit
78
+ (merged to 'next' on 2011-04-25 at c37610d)
79
+ + git diff -D: omit the preimage of deletes
80
156
-Will merge to "next".
81
+* jc/rename-degrade-cc-to-c (2011-01-06) 4 commits
82
+ (merged to 'next' on 2011-04-25 at 25c195e)
83
+ + diffcore-rename: fall back to -C when -C -C busts the rename limit
84
+ + diffcore-rename: record filepair for rename src
85
+ + diffcore-rename: refactor "too many candidates" logic
86
+ + builtin/diff.c: remove duplicated call to diff_result_code()
87
+
88
+* jh/dirstat (2011-04-12) 4 commits
89
+ (merged to 'next' on 2011-04-25 at cb277e6)
90
+ + --dirstat: In case of renames, use target filename instead of source filename
91
+ + Teach --dirstat not to completely ignore rearranged lines within a file
92
+ + --dirstat-by-file: Make it faster and more correct
93
+ + --dirstat: Describe non-obvious differences relative to --stat or regular diff
94
+ (this branch is used by jh/dirstat-lines.)
95
+
96
+* mz/rebase (2011-02-28) 34 commits
97
+ (merged to 'next' on 2011-04-25 at 4bbed46)
98
+ + rebase: define options in OPTIONS_SPEC
99
+ + Makefile: do not install sourced rebase scripts
100
+ + rebase: use @{upstream} if no upstream specified
101
+ + rebase -i: remove unnecessary state rebase-root
102
+ + rebase -i: don't read unused variable preserve_merges
103
+ + git-rebase--am: remove unnecessary --3way option
104
+ + rebase -m: don't print exit code 2 when merge fails
105
+ + rebase -m: remember allow_rerere_autoupdate option
106
+ + rebase: remember strategy and strategy options
107
+ + rebase: remember verbose option
108
+ + rebase: extract code for writing basic state
109
+ + rebase: factor out sub command handling
110
+ + rebase: make -v a tiny bit more verbose
111
+ + rebase -i: align variable names
112
+ + rebase: show consistent conflict resolution hint
113
+ + rebase: extract am code to new source file
114
+ + rebase: extract merge code to new source file
115
+ + rebase: remove $branch as synonym for $orig_head
116
+ + rebase -i: support --stat
117
+ + rebase: factor out call to pre-rebase hook
118
+ + rebase: factor out clean work tree check
119
+ + rebase: factor out reference parsing
120
+ + rebase: reorder validation steps
121
+ + rebase -i: remove now unnecessary directory checks
122
+ + rebase: factor out command line option processing
123
+ + rebase: align variable content
124
+ + rebase: align variable names
125
+ + rebase: stricter check of standalone sub command
126
+ + rebase: act on command line outside parsing loop
127
+ + rebase: improve detection of rebase in progress
128
+ + rebase: remove unused rebase state 'prev_head'
129
+ + rebase: read state outside loop
130
+ + rebase: refactor reading of state
131
+ + rebase: clearer names for directory variables
132
133
* rs/strbuf-setlen-assert (2011-04-27) 1 commit
159
- - strbuf: clarify assertion in strbuf_setlen()
134
+ (merged to 'next' on 2011-04-28 at d1e8d0d)
135
+ + strbuf: clarify assertion in strbuf_setlen()
136
161
-Will merge to "next".
137
+Will merge to "master" by the end of week #1.
138
+
139
+* sp/maint-clear-postfields (2011-04-26) 1 commit
140
+ (merged to 'next' on 2011-04-26 at 0082503)
141
+ + http: clear POSTFIELDS when initializing a slot
142
+
143
+Fixes a rather nasty bug we had since the beginning of smart-HTTP
144
+but has become a lot easier to trigger since 1.7.5, introducing a
145
+regression.
146
163
-* jh/dirstat-lines (2011-04-27) 7 commits
164
- - diff --dirstat: tighten and clean-up parsing.
165
- - New --dirstat=lines mode, doing dirstat analysis based on diffstat
166
- - Allow specifying --dirstat cut-off percentage as a floating point number
167
- - Add config variable for specifying default --dirstat behavior
168
- - Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file
169
- - Make --dirstat=0 output directories that contribute < 0.1% of changes
170
- - Add several testcases for --dirstat and friends
171
- (this branch uses jh/dirstat.)
147
+* vh/git-svn-doc (2011-04-26) 3 commits
148
+ (merged to 'next' on 2011-04-28 at 5556e8c)
149
+ + git-svn.txt: small typeface improvements
150
+ + git-svn.txt: move option descriptions
151
+ + git-svn.txt: fix usage of --add-author-from
152
173
-This is v3/v4 that is still being discussed.
153
+Will merge to "master" by the end of week #1.
154
155
--------------------------------------------------
156
[Stalled]
157
178
-* jn/gitweb-js (2011-04-15) 13 commits
158
+* jn/gitweb-js (2011-04-28) 13 commits
159
- gitweb: Make JavaScript ability to adjust timezones configurable
160
- gitweb.js: Add UI for selecting common timezone to display dates
161
- gitweb: JavaScript ability to adjust time based on timezone
162
- gitweb: Unify the way long timestamp is displayed
163
- gitweb: Refactor generating of long dates into format_timestamp_html
164
- gitweb.js: Provide getElementsByClassName method (if it not exists)
185
- - gitweb.js: Introduce gitweb/static/js/lib/cookies.js
165
+ - gitweb.js: Introduce code to handle cookies from JavaScript
166
- gitweb.js: Extract and improve datetime handling
167
- gitweb.js: Provide default values for padding in padLeftStr and padLeft
168
- gitweb.js: Update and improve comments in JavaScript files
@@ -190,8 +170,7 @@ This is v3/v4 that is still being discussed.
170
- Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
171
- git-instaweb: Simplify build dependency on gitweb
172
193
-I do not recall seeing this series much reviewed. Is everybody happy with
194
-this series?
173
+Rerolled. Waiting for comments.
174
175
* jk/maint-merge-rename-create (2011-03-25) 3 commits
176
- merge: turn on rewrite detection
@@ -204,8 +183,8 @@ Peff wanted to reroll this, so this is taken out of "next".
183
- http-push: refactor curl_easy_setup madness
184
- http: make curl callbacks match contracts from curl header
185
207
-The second one will probably need re-rolling after
208
-sp/maint-clear-postfields settles.
186
+The second one will probably need re-rolling on top of
187
+sp/maint-clear-postfields after it settles.
188
189
* rr/rerere-clear-libify (2011-04-13) 1 commit
190
- rerere: Expose an API corresponding to 'clear' functionality
@@ -213,25 +192,6 @@ sp/maint-clear-postfields settles.
192
Jonathan had good comments on moving the garbage collection interface as
193
well. Perhaps needs a re-roll.
194
216
-* jc/maint-add-p-overlapping-hunks (2011-04-06) 2 commits
217
- - "add -p": work-around an old laziness that does not coalesce hunks
218
- - add--interactive.perl: factor out repeated --recount option
219
-
220
-This came from http://thread.gmane.org/gmane.comp.version-control.git/170685/focus=171000;
221
-we may want to add tests before moving it forward.
222
-
223
-* mg/show-without-prune (2011-04-01) 1 commit
224
- - builtin/show: do not prune by pathspec
225
-
226
-I wanted to like this, but it still feels like too much magic. Will drop
227
-and wait for the topic to resurface.
228
-
229
-* gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit
230
- - Look for password in both CVS and CVSNT password files.
231
-
232
-It seems that we need separate parsers for these two formats in order not
233
-to regress the users of the original cvs.
234
-
195
* jc/index-pack (2011-02-25) 5 commits
196
- index-pack --verify: read anomalous offsets from v2 idx file
197
- write_idx_file: need_large_offset() helper function
@@ -256,48 +216,106 @@ current usage context.
216
--------------------------------------------------
217
[Cooking]
218
259
-* jn/setup-revisions-glob-and-friends-passthru (2011-04-21) 2 commits
260
- - revisions: allow --glob and friends in parse_options-enabled commands
261
- - revisions: split out handle_revision_pseudo_opt function
219
+* gr/cvsimport-alternative-cvspass-location (2011-05-01) 1 commit
220
+ - Look for password in both CVS and CVSNT password files.
221
263
-Will merge to "next".
222
+* jc/maint-add-p-overlapping-hunks (2011-04-06) 4 commits
223
+ - "add -p": work-around an old laziness that does not coalesce hunks
224
+ - add--interactive.perl: factor out repeated --recount option
225
+ - t3701: Editing a split hunk in an "add -p" session
226
+ - add -p: 'q' should really quit
227
265
-* cn/log-parse-opt (2011-04-14) 1 commit
266
- - log: convert to parse-options
228
+Now out of "Stalled" category with tests.
229
+
230
+* ld/p4-preserve-user-names (2011-04-21) 1 commit
231
+ (merged to 'next' on 2011-04-29 at 25116c8)
232
+ + git-p4: add option to preserve user names
233
+
234
+Will merge to "master" by the end of week #2.
235
+
236
+* jh/dirstat-lines (2011-04-29) 8 commits
237
+ (merged to 'next' on 2011-04-29 at a302674)
238
+ + Mark dirstat error messages for translation
239
+ + Improve error handling when parsing dirstat parameters
240
+ + New --dirstat=lines mode, doing dirstat analysis based on diffstat
241
+ + Allow specifying --dirstat cut-off percentage as a floating point number
242
+ + Add config variable for specifying default --dirstat behavior
243
+ + Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file
244
+ + Make --dirstat=0 output directories that contribute < 0.1% of changes
245
+ + Add several testcases for --dirstat and friends
246
+
247
+* aw/maint-rebase-i-p-no-ff (2011-04-28) 1 commit
248
+ - git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
249
250
Will merge to "next".
251
270
-* jc/fix-add-u-unmerged (2011-04-20) 1 commit
271
- - Fix "add -u" that sometimes fails to resolve unmerged paths
272
- (this branch uses jc/fix-diff-files-unmerged.)
252
+* mg/alias-expose-prefix (2011-04-27) 2 commits
253
+ - handle_alias: provide GIT_PREFIX to !alias
254
+ - t1020: test !alias in subdirectory
255
256
Will merge to "next".
257
276
-* jc/fix-diff-files-unmerged (2011-04-22) 4 commits
277
- - diff-files: show unmerged entries correctly
278
- - diff: remove often unused parameters from diff_unmerge()
279
- - diff.c: return filepair from diff_unmerge()
280
- - test: use $_z40 from test-lib
281
- (this branch is used by jc/fix-add-u-unmerged.)
258
+* mg/diff-uiconfig-doc (2011-04-27) 1 commit
259
+ - config.txt,diff-options.txt: porcelain vs. plumbing for color.diff
260
261
Will merge to "next".
262
263
+* mg/rev-list-count-cherry (2011-04-26) 1 commit
264
+ (merged to 'next' on 2011-04-26 at dc3e80a)
265
+ + rev-list --count: separate count for --cherry-mark
266
+
267
+Will merge to "master" by the end of week #2.
268
+
269
+* ft/gitweb-tar-with-gzip-n (2011-04-26) 1 commit
270
+ (merged to 'next' on 2011-04-26 at 8e59a0e)
271
+ + gitweb: supply '-n' to gzip for identical output
272
+
273
+Will merge to "master" by the end of week #2.
274
+
275
+* ml/test-readme (2011-04-26) 1 commit
276
+ (merged to 'next' on 2011-04-26 at d1efe84)
277
+ + t/README: unify documentation of test function args
278
+
279
+Will merge to "master" by the end of week #2.
280
+
281
+* jk/format-patch-quote-special-in-from (2011-04-08) 1 commit
282
+ (merged to 'next' on 2011-04-28 at 587f2d4)
283
+ + pretty: quote rfc822 specials in email addresses
284
+
285
+Will merge to "master" by the end of week #2.
286
+
287
+* jn/setup-revisions-glob-and-friends-passthru (2011-04-21) 2 commits
288
+ (merged to 'next' on 2011-04-28 at 6006cc4)
289
+ + revisions: allow --glob and friends in parse_options-enabled commands
290
+ + revisions: split out handle_revision_pseudo_opt function
291
+
292
+* cn/log-parse-opt (2011-04-14) 1 commit
293
+ (merged to 'next' on 2011-04-28 at 02f2eac)
294
+ + log: convert to parse-options
295
+
296
+* jc/fix-add-u-unmerged (2011-04-20) 1 commit
297
+ (merged to 'next' on 2011-04-28 at f7ed821)
298
+ + Fix "add -u" that sometimes fails to resolve unmerged paths
299
+ (this branch is used by jc/add-delete-default and jc/add-delete-default; uses jc/fix-diff-files-unmerged.)
300
+
301
+* jc/fix-diff-files-unmerged (2011-04-22) 4 commits
302
+ (merged to 'next' on 2011-04-28 at f1f837c)
303
+ + diff-files: show unmerged entries correctly
304
+ + diff: remove often unused parameters from diff_unmerge()
305
+ + diff.c: return filepair from diff_unmerge()
306
+ + test: use $_z40 from test-lib
307
+ (this branch is used by jc/add-delete-default and jc/fix-add-u-unmerged.)
308
+
309
* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-04-25) 1 commit
286
- - send-pack: avoid deadlock when pack-object dies early
310
+ + send-pack: avoid deadlock when pack-object dies early
311
(this branch is used by js/maint-send-pack-stateless-rpc-deadlock-fix.)
312
313
* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-04-25) 1 commit
290
- - Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
314
+ (merged to 'next' on 2011-04-28 at db7e04a)
315
+ + Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
316
(this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix.)
317
293
-Will merge to "next".
294
-
295
-* vh/git-svn-doc (2011-04-26) 3 commits
296
- - git-svn.txt: small typeface improvements
297
- - git-svn.txt: move option descriptions
298
- - git-svn.txt: fix usage of --add-author-from
299
-
300
-Will merge to "next".
318
+Will merge to "master" by the end of week #2.
319
320
* jk/format-patch-multiline-header (2011-04-14) 1 commit
321
(merged to 'next' on 2011-04-26 at 3d5eda3)
@@ -350,16 +368,6 @@ Will merge to "master" by the end of week #2.
368
369
Will merge to "master" by the end of week #2.
370
353
-* jh/dirstat (2011-04-12) 4 commits
354
- (merged to 'next' on 2011-04-25 at cb277e6)
355
- + --dirstat: In case of renames, use target filename instead of source filename
356
- + Teach --dirstat not to completely ignore rearranged lines within a file
357
- + --dirstat-by-file: Make it faster and more correct
358
- + --dirstat: Describe non-obvious differences relative to --stat or regular diff
359
- (this branch is used by jh/dirstat-lines.)
360
-
361
-Will merge to "master" by the end of week #1.
362
-
371
* jm/mergetool-submodules (2011-04-13) 1 commit
372
(merged to 'next' on 2011-04-26 at 40892cf)
373
+ mergetool: Teach about submodules
@@ -401,12 +409,6 @@ Will merge to "master" by the end of week #2.
409
410
Will merge to "master" by the end of week #2.
411
404
-* jc/diff-irreversible-delete (2011-02-28) 1 commit
405
- (merged to 'next' on 2011-04-25 at c37610d)
406
- + git diff -D: omit the preimage of deletes
407
-
408
-Will merge to "master" by the end of week #2.
409
-
412
* jh/notes-add-ui (2011-03-30) 1 commit
413
(merged to 'next' on 2011-04-25 at 4fb1ac2)
414
+ Make "git notes add" more user-friendly when there are existing notes
@@ -433,45 +435,6 @@ Will merge to "master" by the end of week #2.
435
436
Will merge to "master" by the end of week #2.
437
436
-* mz/rebase (2011-02-28) 34 commits
437
- (merged to 'next' on 2011-04-25 at 4bbed46)
438
- + rebase: define options in OPTIONS_SPEC
439
- + Makefile: do not install sourced rebase scripts
440
- + rebase: use @{upstream} if no upstream specified
441
- + rebase -i: remove unnecessary state rebase-root
442
- + rebase -i: don't read unused variable preserve_merges
443
- + git-rebase--am: remove unnecessary --3way option
444
- + rebase -m: don't print exit code 2 when merge fails
445
- + rebase -m: remember allow_rerere_autoupdate option
446
- + rebase: remember strategy and strategy options
447
- + rebase: remember verbose option
448
- + rebase: extract code for writing basic state
449
- + rebase: factor out sub command handling
450
- + rebase: make -v a tiny bit more verbose
451
- + rebase -i: align variable names
452
- + rebase: show consistent conflict resolution hint
453
- + rebase: extract am code to new source file
454
- + rebase: extract merge code to new source file
455
- + rebase: remove $branch as synonym for $orig_head
456
- + rebase -i: support --stat
457
- + rebase: factor out call to pre-rebase hook
458
- + rebase: factor out clean work tree check
459
- + rebase: factor out reference parsing
460
- + rebase: reorder validation steps
461
- + rebase -i: remove now unnecessary directory checks
462
- + rebase: factor out command line option processing
463
- + rebase: align variable content
464
- + rebase: align variable names
465
- + rebase: stricter check of standalone sub command
466
- + rebase: act on command line outside parsing loop
467
- + rebase: improve detection of rebase in progress
468
- + rebase: remove unused rebase state 'prev_head'
469
- + rebase: read state outside loop
470
- + rebase: refactor reading of state
471
- + rebase: clearer names for directory variables
472
-
473
-Will merge to "master" by the end of week #2.
474
-
438
* mz/maint-rename-unmerged (2011-03-23) 1 commit
439
(merged to 'next' on 2011-04-25 at 038a8c3)
440
+ diffcore-rename: don't consider unmerged path as source
@@ -499,35 +462,11 @@ basic semantics into a not-so-horrible shape.
462
463
Will merge to "master" by the end of week #2.
464
502
-* jc/rename-degrade-cc-to-c (2011-01-06) 4 commits
503
- (merged to 'next' on 2011-04-25 at 25c195e)
504
- + diffcore-rename: fall back to -C when -C -C busts the rename limit
505
- + diffcore-rename: record filepair for rename src
506
- + diffcore-rename: refactor "too many candidates" logic
507
- + builtin/diff.c: remove duplicated call to diff_result_code()
508
-
509
-Will merge to "master" by the end of week #2.
510
-
511
-* en/merge-recursive (2011-03-17) 4 commits
512
- (merged to 'next' on 2011-04-25 at 8027acd)
513
- + merge-recursive: tweak magic band-aid
514
- + merge-recursive: When we detect we can skip an update, actually skip it
515
- + t6022: New test checking for unnecessary updates of files in D/F conflicts
516
- + t6022: New test checking for unnecessary updates of renamed+modified files
517
-
518
-Will merge to "master" by the end of week #2.
519
-
465
--------------------------------------------------
466
[Discarded]
467
523
-* jk/maint-push-async-hang (2011-03-31) 4 commits
524
- . send-pack: abort sideband demuxer on pack-objects error
525
- . run-command: allow aborting async code prematurely
526
- . finish_async: be quiet when waiting for async process
527
- . teach wait_or_whine a "quiet" mode
528
- (this branch is used by jk/maint-push-async-hang-threads.)
529
-
530
-* jk/maint-push-async-hang-threads (2011-03-31) 2 commits
531
- . run-command: implement abort_async for pthreads
532
- . Merge branch 'jk/maint-push-async-hang' into jk/maint-push-async-hang-threads
533
- (this branch uses jk/maint-push-async-hang.)
468
+* mg/show-without-prune (2011-04-01) 1 commit
469
+ . builtin/show: do not prune by pathspec
470
+
471
+I wanted to like this, but it still feels like too much magic. Will wait
472
+for the topic to resurface.