What's cooking (2011/08 #02)
Junio C Hamano committed
Aug 8, 2011 at 15:58 UTC
30e27271999bb434a5a9045448484a768d130f2d
1 file changed
+239
-201
whats-cooking.txt
+239
-201
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2011, #01; Wed, 3)
3
-X-master-at: 6a319e393b856461bab89ffe332a02e71befee40
4
-X-next-at: b06e80e736fa17ec470db045b45ab3a5e6a5bd3a
2
+Subject: What's cooking in git.git (Aug 2011, #02; Mon, 8)
3
+X-master-at: 1421fd9df4f1e3ed232bd1c683c6e264a464a41e
4
+X-next-at: 917d73bc85e756fc5d627c398a3b2aaebc3cf157
5
6
-What's cooking in git.git (Aug 2011, #01; Wed, 3)
6
+What's cooking in git.git (Aug 2011, #02; Mon, 8)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -13,44 +13,43 @@ There are a few 'fixup!' commits queued in topics still in 'pu', so that
13
authors have a choice to just say "that fix looks good, squash it in!"
14
instead of going through an extra round.
15
16
-I should start making noises about the feature freeze by now, but with a
17
-vacation week in the US early in July, my half-absense during OSCON last
18
-week, and just because it is summer in general, this round is going slower
19
-than planned. Let's shoot for the feature freeze in two weeks and decide
20
-which stragglers to postpone to the next round.
21
-
16
--------------------------------------------------
23
-[New Topics]
17
+[Graduated to "master"]
18
25
-* ac/describe-dirty-refresh (2011-08-01) 2 commits
26
- - fixup! describe: Refresh the index when run with --dirty
27
- - describe: Refresh the index when run with --dirty
19
+* jc/diff-index-refactor (2011-07-13) 2 commits
20
+ (merged to 'next' on 2011-08-01 at 98d8b08)
21
+ + diff-lib: refactor run_diff_index() and do_diff_cache()
22
+ + diff-lib: simplify do_diff_cache()
23
29
-* cb/maint-ls-files-error-report (2011-08-01) 2 commits
30
- - squash! ls-files: fix pathspec display on error
31
- - ls-files: fix pathspec display on error
24
+* jc/pack-order-tweak (2011-07-08) 2 commits
25
+ (merged to 'next' on 2011-07-25 at 1460c31)
26
+ + pack-objects: optimize "recency order"
27
+ + core: log offset pack data accesses happened
28
33
-* ef/ipv4-connect-error-report (2011-08-01) 2 commits
34
- (merged to 'next' on 2011-08-03 at ea4842b)
35
- + connect: only log if all attempts failed (ipv4)
36
- + Merge branch 'maint' into ef/ipv4-connect-error-report
29
+* jk/reset-reflog-message-fix (2011-07-22) 1 commit
30
+ (merged to 'next' on 2011-08-01 at 6c88837)
31
+ + reset: give better reflog messages
32
33
* jl/submodule-status-summary-doc (2011-08-01) 1 commit
34
(merged to 'next' on 2011-08-03 at 88f97a9)
35
+ Documentation/submodule: add command references and update options
36
42
-* js/bisect-no-checkout (2011-08-03) 9 commits
43
- - bisect: add documentation for --no-checkout option.
44
- - fixup! bisect: add tests for the --no-checkout option
45
- - bisect: add tests for the --no-checkout option.
46
- - fixup! bisect: introduce --no-checkout support into porcelain
47
- - bisect: introduce --no-checkout support into porcelain.
48
- - bisect: introduce support for --no-checkout option.
49
- - bisect: add tests to document expected behaviour in presence of broken trees.
50
- - bisect: use && to connect statements that are deferred with eval.
51
- - bisect: move argument parsing before state modification.
37
+* jl/submodule-update-quiet (2011-07-28) 1 commit
38
+ (merged to 'next' on 2011-08-01 at c611587)
39
+ + submodule: update and add must honor --quiet flag
40
53
-Getting there; I have a couple of trivial fix-ups queued there, though.
41
+* jn/gitweb-config-list-case (2011-07-31) 1 commit
42
+ (merged to 'next' on 2011-08-01 at 9268738)
43
+ + gitweb: Git config keys are case insensitive, make config search too
44
+
45
+* jn/gitweb-system-config (2011-07-24) 1 commit
46
+ (merged to 'next' on 2011-08-01 at 4941e45)
47
+ + gitweb: Introduce common system-wide settings for convenience
48
+
49
+* js/ls-tree-error (2011-07-25) 2 commits
50
+ (merged to 'next' on 2011-08-01 at 61bae55)
51
+ + Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.
52
+ + Add a test to check that git ls-tree sets non-zero exit code on error.
53
54
* ms/reflog-show-is-default (2011-08-01) 1 commit
55
(merged to 'next' on 2011-08-03 at ae9cf6f)
@@ -60,79 +59,103 @@ Getting there; I have a couple of trivial fix-ups queued there, though.
59
(merged to 'next' on 2011-08-03 at faeff94)
60
+ pull: remove extra space from reflog message
61
63
-* rs/grep-function-context (2011-08-01) 2 commits
64
- - grep: long context options
65
- - grep: add option to show whole function as context
62
+* tc/minix (2011-07-20) 1 commit
63
+ (merged to 'next' on 2011-07-25 at 36ad29f)
64
+ + Makefile: add Minix configuration options.
65
+
66
+--------------------------------------------------
67
+[New Topics]
68
+
69
+* jc/maint-combined-diff-work-tree (2011-08-04) 1 commit
70
+ (merged to 'next' on 2011-08-05 at 976a4d4)
71
+ + diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
72
+
73
+Will merge to "master" after cooking for a bit more.
74
+
75
+* jk/fast-export-quote-path (2011-08-05) 1 commit
76
+ (merged to 'next' on 2011-08-05 at a80e5f5)
77
+ + fast-export: quote paths in output
78
+
79
+Will merge to "master".
80
+
81
+* js/sh-style (2011-08-05) 2 commits
82
+ - filter-branch.sh: de-dent usage string
83
+ - misc-sh: fix up whitespace in some other .sh files.
84
85
Will merge to "next".
86
69
-* cb/partial-commit-relative-pathspec (2011-08-02) 1 commit
70
- (merged to 'next' on 2011-08-03 at 6918f69)
71
- + commit: allow partial commits with relative paths
87
+* ma/am-exclude (2011-08-03) 1 commit
88
+ (merged to 'next' on 2011-08-05 at 658e57c)
89
+ + am: pass exclude down to apply
90
73
-* mh/check-attr-relative (2011-08-02) 7 commits
74
- - fixup! builtin/check-attr.c and test-path-utils.c
75
- - test-path-utils: Add subcommand "prefix_path"
76
- - test-path-utils: Add subcommand "absolute_path"
77
- - git-check-attr: Normalize paths
78
- - git-check-attr: Demonstrate problems with relative paths
79
- - git-check-attr: Demonstrate problems with unnormalized paths
80
- - git-check-attr: test that no output is written to stderr
81
- (this branch uses mh/check-attr-listing.)
91
+Will merge to "master" after cooking for a bit more.
92
83
---------------------------------------------------
84
-[Graduated to "master"]
93
+* po/cygwin-backslash (2011-08-05) 2 commits
94
+ - On Cygwin support both UNIX and DOS style path-names
95
+ - git-compat-util: add generic find_last_dir_sep that respects is_dir_sep
96
+
97
+I think a further refactoring (no, not my suggestion) was offered?
98
86
-* jc/maint-reset-unmerged-path (2011-07-13) 1 commit
87
- (merged to 'next' on 2011-07-19 at bbc2d54)
88
- + reset [<commit>] paths...: do not mishandle unmerged paths
89
- (this branch is used by jc/diff-index-refactor.)
90
-
91
-* jc/streaming-filter (2011-07-22) 1 commit
92
- (merged to 'next' on 2011-07-22 at 2081cd7)
93
- + streaming: free git_istream upon closing
94
-
95
-A large leak found and plugged.
96
-
97
-* jk/clone-detached (2011-06-07) 4 commits
98
- (merged to 'next' on 2011-07-25 at 013d7d0)
99
- + clone: always fetch remote HEAD
100
- + make copy_ref globally available
101
- + consider only branches in guess_remote_head
102
- + t: add tests for cloning remotes with detached HEAD
103
-
104
-* sr/transport-helper-fix (2011-07-19) 21 commits
105
- (merged to 'next' on 2011-07-19 at e1ef414)
106
- + transport-helper: die early on encountering deleted refs
107
- + transport-helper: implement marks location as capability
108
- + transport-helper: Use capname for refspec capability too
109
- + transport-helper: change import semantics
110
- + transport-helper: update ref status after push with export
111
- + transport-helper: use the new done feature where possible
112
- + transport-helper: check status code of finish_command
113
- + transport-helper: factor out push_update_refs_status
114
- + fast-export: support done feature
115
- + fast-import: introduce 'done' command
116
- + git-remote-testgit: fix error handling
117
- + git-remote-testgit: only push for non-local repositories
118
- + remote-curl: accept empty line as terminator
119
- + remote-helpers: export GIT_DIR variable to helpers
120
- + git_remote_helpers: push all refs during a non-local export
121
- + transport-helper: don't feed bogus refs to export push
122
- + git-remote-testgit: import non-HEAD refs
123
- + t5800: document some non-functional parts of remote helpers
124
- + t5800: use skip_all instead of prereq
125
- + t5800: factor out some ref tests
126
- + transport-helper: fix minor leak in push_refs_with_export
127
- (this branch is used by sr/transport-helper-fix-rfc.)
128
-
129
-* vi/make-test-vector-less-specific (2011-07-19) 1 commit
130
- (merged to 'next' on 2011-07-25 at 1973192)
131
- + tests: cleanup binary test vector files
99
+* rc/maint-http-wrong-free (2011-08-03) 2 commits
100
+ (merged to 'next' on 2011-08-05 at cea08ed)
101
+ + Makefile: some changes for http-related flag documentation
102
+ + http.c: fix an invalid free()
103
+
104
+Will merge to "master".
105
+
106
+* db/am-skip-blank-at-the-beginning (2011-08-08) 2 commits
107
+ - RE: [PATCH v2] am: ignore leading whitespace before patch
108
+ - am: ignore leading whitespace before patch
109
+
110
+Hmmm, perhaps mailinfo should consider [Rr][Ee]: instead of [Rr]e:
111
+as a known noise?
112
+
113
+Will merge to "next" after squashing them into one.
114
+
115
+* jc/maint-smart-http-race-upload-pack (2011-08-08) 1 commit
116
+ - helping smart-http/stateless-rpc fetch race
117
+
118
+Will merge to "next".
119
+
120
+* jn/maint-test-return (2011-08-08) 2 commits
121
+ - test: cope better with use of return for errors
122
+ - test: simplify return value of test_run_
123
+
124
+Will merge to "next".
125
+
126
+* rt/zlib-smaller-window (2011-08-08) 3 commits
127
+ - test: consolidate definition of $LF
128
+ - fixup! Tolerate zlib deflation with window
129
+ - Tolerate zlib deflation with window size < 32Kb
130
+
131
+Will merge to "next" after squashing the second one into the bottom one.
132
+
133
+* fg/submodule-git-file-git-dir (2011-08-08) 3 commits
134
+ - Move git-dir for submodules
135
+ - fixup! rev-parse: add option --is-well-formed-git-dir
136
+ - rev-parse: add option --is-well-formed-git-dir <path>
137
138
--------------------------------------------------
139
[Stalled]
140
141
+* jc/merge-reword (2011-05-25) 2 commits
142
+ - merge: mark the final "Merge made by..." message for l10n
143
+ - merge: reword the final message
144
+
145
+Probably the topmost commit should be dropped.
146
+
147
+* cb/maint-ls-files-error-report (2011-08-01) 2 commits
148
+ - squash! ls-files: fix pathspec display on error
149
+ - ls-files: fix pathspec display on error
150
+
151
+Will merge to "next" after getting an Ack for the fix-up and squashing it.
152
+
153
+* ac/describe-dirty-refresh (2011-08-01) 2 commits
154
+ - fixup! describe: Refresh the index when run with --dirty
155
+ - describe: Refresh the index when run with --dirty
156
+
157
+Will merge to "next" after squashing the fixup into the bottom one.
158
+
159
* nk/branch-v-abbrev (2011-07-01) 1 commit
160
- branch -v: honor core.abbrev
161
@@ -177,43 +200,115 @@ Cf. $gmane/176254, 176255, 166256
200
The initial "tag --contains" de-pessimization without need for generation
201
numbers is already in; backburnered.
202
203
+* en/merge-recursive (2011-08-04) 49 commits
204
+ - t3030: fix accidental success in symlink rename
205
+ - merge-recursive: Fix working copy handling for rename/rename/add/add
206
+ - merge-recursive: add handling for rename/rename/add-dest/add-dest
207
+ - merge-recursive: Have conflict_rename_delete reuse modify/delete code
208
+ - merge-recursive: Make modify/delete handling code reusable
209
+ - merge-recursive: Consider modifications in rename/rename(2to1) conflicts
210
+ - merge-recursive: Create function for merging with branchname:file markers
211
+ - merge-recursive: Record more data needed for merging with dual renames
212
+ - merge-recursive: Defer rename/rename(2to1) handling until process_entry
213
+ - merge-recursive: Small cleanups for conflict_rename_rename_1to2
214
+ - merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
215
+ - merge-recursive: Introduce a merge_file convenience function
216
+ - merge-recursive: Fix modify/delete resolution in the recursive case
217
+ - merge-recursive: Provide more info in conflict markers with file renames
218
+ - merge-recursive: Cleanup and consolidation of rename_conflict_info
219
+ - merge-recursive: Consolidate process_entry() and process_df_entry()
220
+ - merge-recursive: Improve handling of rename target vs. directory addition
221
+ - merge-recursive: Add comments about handling rename/add-source cases
222
+ - merge-recursive: Make dead code for rename/rename(2to1) conflicts undead
223
+ - merge-recursive: Fix deletion of untracked file in rename/delete conflicts
224
+ - merge-recursive: When we detect we can skip an update, actually skip it
225
+ - merge-recursive: Split update_stages_and_entry; only update stages at end
226
+ - merge-recursive: Consolidate different update_stages functions
227
+ - merge-recursive: Allow make_room_for_path() to remove D/F entries
228
+ - merge-recursive: Split was_tracked() out of would_lose_untracked()
229
+ - merge-recursive: Save D/F conflict filenames instead of unlinking them
230
+ - merge-recursive: Fix code checking for D/F conflicts still being present
231
+ - merge-recursive: Fix sorting order and directory change assumptions
232
+ - merge-recursive: Fix recursive case with D/F conflict via add/add conflict
233
+ - merge-recursive: Avoid working directory changes during recursive case
234
+ - merge-recursive: Remember to free generated unique path names
235
+ - merge-recursive: Mark some diff_filespec struct arguments const
236
+ - merge-recursive: Correct a comment
237
+ - merge-recursive: Make BUG message more legible by adding a newline
238
+ - t6022: Add testcase for merging a renamed file with a simple change
239
+ - t6022: New tests checking for unnecessary updates of files
240
+ - t6022: Remove unnecessary untracked files to make test cleaner
241
+ - t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify
242
+ - t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify
243
+ - t6036: tests for criss-cross merges with various directory/file conflicts
244
+ - t6036: criss-cross with weird content can fool git into clean merge
245
+ - t6036: Add differently resolved modify/delete conflict in criss-cross test
246
+ - t6042: Ensure rename/rename conflicts leave index and workdir in sane state
247
+ - t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts
248
+ - t6042: Add tests for content issues with modify/rename/directory conflicts
249
+ - t6042: Add a testcase where undetected rename causes silent file deletion
250
+ - t6042: Add a pair of cases where undetected renames cause issues
251
+ - t6042: Add failing testcase for rename/modify/add-source conflict
252
+ - t6042: Add a testcase where git deletes an untracked file
253
+
254
+Re-roll being worked on.
255
+
256
+* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
257
+ - t5800: point out that deleting branches does not work
258
+ - t5800: document inability to push new branch with old content
259
+
260
--------------------------------------------------
261
[Cooking]
262
183
-* cb/maint-exec-error-report (2011-08-01) 2 commits
184
- - notice error exit from pager
185
- - error_routine: use parent's stderr if exec fails
263
+* ef/ipv4-connect-error-report (2011-08-01) 2 commits
264
+ (merged to 'next' on 2011-08-03 at ea4842b)
265
+ + connect: only log if all attempts failed (ipv4)
266
+ + Merge branch 'maint' into ef/ipv4-connect-error-report
267
187
-* cb/maint-quiet-push (2011-07-31) 1 commit
188
- (merged to 'next' on 2011-08-01 at 87df938)
189
- + propagate --quiet to send-pack/receive-pack
268
+Will merge to "master".
269
191
-* jl/submodule-update-quiet (2011-07-28) 1 commit
192
- (merged to 'next' on 2011-08-01 at c611587)
193
- + submodule: update and add must honor --quiet flag
270
+* js/bisect-no-checkout (2011-08-05) 10 commits
271
+ - bisect: further style nitpicks
272
+ - bisect: replace "; then" with "\n<tab>*then"
273
+ - bisect: cleanup whitespace errors in git-bisect.sh.
274
+ - bisect: add documentation for --no-checkout option.
275
+ - bisect: add tests for the --no-checkout option.
276
+ - bisect: introduce --no-checkout support into porcelain.
277
+ - bisect: introduce support for --no-checkout option.
278
+ - bisect: add tests to document expected behaviour in presence of broken trees.
279
+ - bisect: use && to connect statements that are deferred with eval.
280
+ - bisect: move argument parsing before state modification.
281
195
-* jn/gitweb-config-list-case (2011-07-31) 1 commit
196
- (merged to 'next' on 2011-08-01 at 9268738)
197
- + gitweb: Git config keys are case insensitive, make config search too
282
+Will merge to "next".
283
199
-* jn/gitweb-system-config (2011-07-24) 1 commit
200
- (merged to 'next' on 2011-08-01 at 4941e45)
201
- + gitweb: Introduce common system-wide settings for convenience
284
+* rs/grep-function-context (2011-08-01) 2 commits
285
+ (merged to 'next' on 2011-08-05 at 8d63a8c)
286
+ + grep: long context options
287
+ + grep: add option to show whole function as context
288
203
-* js/ls-tree-error (2011-07-25) 2 commits
204
- (merged to 'next' on 2011-08-01 at 61bae55)
205
- + Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.
206
- + Add a test to check that git ls-tree sets non-zero exit code on error.
289
+Will merge to "master".
290
208
-* jc/merge-reword (2011-05-25) 2 commits
209
- - merge: mark the final "Merge made by..." message for l10n
210
- - merge: reword the final message
291
+* cb/partial-commit-relative-pathspec (2011-08-02) 1 commit
292
+ (merged to 'next' on 2011-08-03 at 6918f69)
293
+ + commit: allow partial commits with relative paths
294
212
-Probably the topmost commit should be dropped.
295
+Ideally the pathspec-prefix helper should be renamed to something more
296
+sensible, but we could live with it for now.
297
214
-* jk/reset-reflog-message-fix (2011-07-22) 1 commit
215
- (merged to 'next' on 2011-08-01 at 6c88837)
216
- + reset: give better reflog messages
298
+* cb/maint-exec-error-report (2011-08-01) 2 commits
299
+ (merged to 'next' on 2011-08-05 at 2764424)
300
+ + notice error exit from pager
301
+ + error_routine: use parent's stderr if exec fails
302
+
303
+Will merge to "master" after cooking for a bit more.
304
+
305
+* cb/maint-quiet-push (2011-08-08) 2 commits
306
+ (merged to 'next' on 2011-08-08 at 917d73b)
307
+ + receive-pack: do not overstep command line argument array
308
+ (merged to 'next' on 2011-08-01 at 87df938)
309
+ + propagate --quiet to send-pack/receive-pack
310
+
311
+Will merge to "master" after cooking for a bit more.
312
313
* jk/add-i-hunk-filter (2011-07-27) 5 commits
314
- add--interactive: add option to autosplit hunks
@@ -222,8 +317,10 @@ Probably the topmost commit should be dropped.
317
- add--interactive: factor out regex error handling
318
- add--interactive: refactor patch mode argument processing
319
225
-* mh/check-attr-listing (2011-08-02) 19 commits
226
- - Rename struct git_attr_check to git_attr_value
320
+Will merge to "next".
321
+
322
+* mh/check-attr-listing (2011-08-04) 23 commits
323
+ - Rename git_checkattr() to git_check_attr()
324
- git-check-attr: Fix command-line handling to match docs
325
- git-check-attr: Drive two tests using the same raw data
326
- git-check-attr: Add an --all option to show all attributes
@@ -234,6 +331,10 @@ Probably the topmost commit should be dropped.
331
- git-check-attr: Introduce a new variable
332
- git-check-attr: Extract a function output_attr()
333
- Allow querying all attributes on a file
334
+ - Remove redundant check
335
+ - Remove redundant call to bootstrap_attr_stack()
336
+ - Extract a function collect_all_attrs()
337
+ - Teach prepare_attr_stack() to figure out dirlen itself
338
- git-check-attr: Use git_attr_name()
339
- Provide access to the name attribute of git_attr
340
- git-check-attr: Add tests of command-line parsing
@@ -244,16 +345,18 @@ Probably the topmost commit should be dropped.
345
- doc: Add a link from gitattributes(5) to git-check-attr(1)
346
(this branch is used by mh/check-attr-relative.)
347
247
-Except for a few nits, this seems mostly ready.
348
+Will merge to "next".
349
249
-* jc/diff-index-refactor (2011-07-13) 2 commits
250
- (merged to 'next' on 2011-08-01 at 98d8b08)
251
- + diff-lib: refactor run_diff_index() and do_diff_cache()
252
- + diff-lib: simplify do_diff_cache()
350
+* mh/check-attr-relative (2011-08-04) 6 commits
351
+ - test-path-utils: Add subcommand "prefix_path"
352
+ - test-path-utils: Add subcommand "absolute_path"
353
+ - git-check-attr: Normalize paths
354
+ - git-check-attr: Demonstrate problems with relative paths
355
+ - git-check-attr: Demonstrate problems with unnormalized paths
356
+ - git-check-attr: test that no output is written to stderr
357
+ (this branch uses mh/check-attr-listing.)
358
254
-* sr/transport-helper-fix-rfc (2011-07-19) 2 commits
255
- - t5800: point out that deleting branches does not work
256
- - t5800: document inability to push new branch with old content
359
+Will merge to "next".
360
361
* jk/http-auth-keyring (2011-08-03) 13 commits
362
(merged to 'next' on 2011-08-03 at b06e80e)
@@ -275,15 +378,6 @@ Looked mostly reasonable except for the limitation that it is not clear
378
how to deal with a site at which a user needs to use different passwords
379
for different repositories.
380
278
-* tc/minix (2011-07-20) 1 commit
279
- (merged to 'next' on 2011-07-25 at 36ad29f)
280
- + Makefile: add Minix configuration options.
281
-
282
-* jc/pack-order-tweak (2011-07-08) 2 commits
283
- (merged to 'next' on 2011-07-25 at 1460c31)
284
- + pack-objects: optimize "recency order"
285
- + core: log offset pack data accesses happened
286
-
381
* js/ref-namespaces (2011-07-21) 5 commits
382
(merged to 'next' on 2011-07-25 at 5b7dcfe)
383
+ ref namespaces: tests
@@ -292,8 +386,7 @@ for different repositories.
386
+ ref namespaces: infrastructure
387
+ Fix prefix handling in ref iteration functions
388
295
-* rc/histogram-diff (2011-08-03) 13 commits
296
- - fixup! xdiff/xhistogram: rework handling of recursed results
389
+* rc/histogram-diff (2011-08-08) 12 commits
390
- xdiff/xhistogram: drop need for additional variable
391
- xdiff/xhistogram: rely on xdl_trim_ends()
392
- xdiff/xhistogram: rework handling of recursed results
@@ -309,7 +402,9 @@ for different repositories.
402
+ xdiff/xprepare: refactor abort cleanups
403
+ xdiff/xprepare: use memset()
404
312
-* rr/revert-cherry-pick-continue (2011-08-01) 18 commits
405
+Will merge to "next".
406
+
407
+* rr/revert-cherry-pick-continue (2011-08-08) 18 commits
408
- revert: Propagate errors upwards from do_pick_commit
409
- revert: Introduce --continue to continue the operation
410
- revert: Don't implicitly stomp pending sequencer operation
@@ -329,61 +424,4 @@ for different repositories.
424
- config: Introduce functions to write non-standard file
425
- advice: Introduce error_resolve_conflict
426
332
-Rerolled (v5) and looked reasonably clean.
333
-Will merge to "next".
334
-
335
-* en/merge-recursive (2011-07-14) 50 commits
336
- - fixup! Do not assume that qsort is stable
337
- - t3030: fix accidental success in symlink rename
338
- - merge-recursive: Fix working copy handling for rename/rename/add/add
339
- - merge-recursive: add handling for rename/rename/add-dest/add-dest
340
- - merge-recursive: Have conflict_rename_delete reuse modify/delete code
341
- - merge-recursive: Make modify/delete handling code reusable
342
- - merge-recursive: Consider modifications in rename/rename(2to1) conflicts
343
- - merge-recursive: Create function for merging with branchname:file markers
344
- - merge-recursive: Record more data needed for merging with dual renames
345
- - merge-recursive: Defer rename/rename(2to1) handling until process_entry
346
- - merge-recursive: Small cleanups for conflict_rename_rename_1to2
347
- - merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base
348
- - merge-recursive: Introduce a merge_file convenience function
349
- - merge-recursive: Fix modify/delete resolution in the recursive case
350
- - merge-recursive: Provide more info in conflict markers with file renames
351
- - merge-recursive: Cleanup and consolidation of rename_conflict_info
352
- - merge-recursive: Consolidate process_entry() and process_df_entry()
353
- - merge-recursive: Improve handling of rename target vs. directory addition
354
- - merge-recursive: Add comments about handling rename/add-source cases
355
- - merge-recursive: Make dead code for rename/rename(2to1) conflicts undead
356
- - merge-recursive: Fix deletion of untracked file in rename/delete conflicts
357
- - merge-recursive: When we detect we can skip an update, actually skip it
358
- - merge-recursive: Split update_stages_and_entry; only update stages at end
359
- - merge-recursive: Consolidate different update_stages functions
360
- - merge-recursive: Allow make_room_for_path() to remove D/F entries
361
- - merge-recursive: Split was_tracked() out of would_lose_untracked()
362
- - merge-recursive: Save D/F conflict filenames instead of unlinking them
363
- - merge-recursive: Fix code checking for D/F conflicts still being present
364
- - merge-recursive: Fix sorting order and directory change assumptions
365
- - merge-recursive: Fix recursive case with D/F conflict via add/add conflict
366
- - merge-recursive: Avoid working directory changes during recursive case
367
- - merge-recursive: Remember to free generated unique path names
368
- - merge-recursive: Mark some diff_filespec struct arguments const
369
- - merge-recursive: Correct a comment
370
- - merge-recursive: Make BUG message more legible by adding a newline
371
- - t6022: Add testcase for merging a renamed file with a simple change
372
- - t6022: New tests checking for unnecessary updates of files
373
- - t6022: Remove unnecessary untracked files to make test cleaner
374
- - t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify
375
- - t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify
376
- - t6036: tests for criss-cross merges with various directory/file conflicts
377
- - t6036: criss-cross with weird content can fool git into clean merge
378
- - t6036: Add differently resolved modify/delete conflict in criss-cross test
379
- - t6042: Ensure rename/rename conflicts leave index and workdir in sane state
380
- - t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts
381
- - t6042: Add tests for content issues with modify/rename/directory conflicts
382
- - t6042: Add a testcase where undetected rename causes silent file deletion
383
- - t6042: Add a pair of cases where undetected renames cause issues
384
- - t6042: Add failing testcase for rename/modify/add-source conflict
385
- - t6042: Add a testcase where git deletes an untracked file
386
-
387
-The tip one should be squashed somewhere. I wanted to push this out in
388
-'next' today, but this seems to regress a rather trivial renaming merge,
389
-so I had to rewind and rebuild 'next' before pushing it out.
427
+Getting into a reasonable shape. Is another round of re-roll coming?