What's cooking (2010/08 #02)
Junio C Hamano committed
Aug 11, 2010 at 16:20 UTC
2e4be0d6a9d4d27ecd3218da44c158d404e44a68
1 file changed
+294
-82
whats-cooking.txt
+294
-82
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Aug 2010, #01; Wed, 4)
3
-X-master-at: 721e76cbfac650ce676fc789b717eb21e1daa46e
4
-X-next-at: 7f78604dbfb7c90248f8142905329a97e26c8539
2
+Subject: What's cooking in git.git (Aug 2010, #02; Wed, 11)
3
+X-master-at: 7980e41746bc5de91eea775f9142ce44b1100361
4
+X-next-at: ca9fef0665a1958ac7895c60b29faa8be1e281e0
5
6
-What's cooking in git.git (Aug 2010, #01; Wed, 4)
6
+What's cooking in git.git (Aug 2010, #02; Wed, 11)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,53 +11,198 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones
11
marked with '.' do not appear in any of the integration branches, but I am
12
still holding onto them.
13
14
-The tip of 'next' has been rewound and rebuilt on top of v1.7.2; also a
15
-few topics have been ejected as I've been warning to. I'll start merging
16
-more stuff to 'next' in the next round after reading them over again.
17
-
18
---------------------------------------------------
19
-[Graduated to "master"]
20
-
21
-* gp/pack-refs-remove-empty-dirs (2010-07-06) 1 commit
22
- (merged to 'next' on 2010-07-14 at 7d25131)
23
- + pack-refs: remove newly empty directories
24
-
25
-* pt/git-gui (2010-08-02) 13 commits
26
- + Merge git://repo.or.cz/git-gui into pt/git-gui
27
- + git-gui: fix size and position of window panes on startup
28
- + git-gui: mc cannot be used before msgcat has been loaded
29
- + git-gui: use textconv filter for diff and blame
30
- + git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32
31
- + git-gui: fix shortcut creation on cygwin
32
- + git-gui: fix PATH environment for mingw development environment
33
- + git-gui: fix usage of _gitworktree when creating shortcut for windows
34
- + git-gui: fix "Explore Working Copy" for Windows again
35
- + git-gui: fix usage of themed widgets variable
36
- + git-gui: Handle failure of core.worktree to identify the working directory.
37
- + Merge branch 'maint'
38
- + git-gui: check whether systems nice command works or disable it
39
-
40
-* rr/svn-fe (2010-07-29) 2 commits
41
- + contrib/svn-fe: Add the svn-fe target to .gitignore
42
- + contrib/svn-fe: Fix IncludePath
43
-
44
-* sv/maint-diff-q-clear-fix (2010-08-02) 1 commit
45
- + Fix DIFF_QUEUE_CLEAR refactoring
14
+Has the rate of patch traffic increased markedly for the past few months?
15
+I am feeling perpetually behind these days...
16
17
--------------------------------------------------
18
[New Topics]
19
50
-* jc/sha1-name-find-fix (2010-08-02) 1 commit
51
- - sha1_name.c: fix parsing of ":/token" syntax
20
+* ab/omit-aggregate-test-result-under-tap-harness (2010-08-11) 1 commit
21
+ - test-lib: Don't write test-results when HARNESS_ACTIVE
22
+
23
+* ab/test-prereq (2010-08-11) 5 commits
24
+ - test-lib: Multi-prereq support only checked the last prereq
25
+ - tests: A SANITY test prereq for testing if we're root
26
+ - t/README: Document the predefined test prerequisites
27
+ - test-lib: Print missing prerequisites in test output
28
+ - test-lib: Add support for multiple test prerequisites
29
+
30
+* ab/test-smoke (2010-08-08) 4 commits
31
+ - t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target
32
+ - t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh
33
+ - t/README: Document the Smoke testing
34
+ - tests: Infrastructure for Git smoke testing
35
+
36
+Will merge the above three topics to 'next' together with other "test"
37
+topics from the same author shortly.
38
+
39
+* by/line-log (2010-08-11) 18 commits
40
+ - line-log: minimum compilation fix
41
+ - Document line history browser
42
+ - Add tests for line history browser
43
+ - Add --full-line-diff option
44
+ - Add --graph prefix before line history output
45
+ - Add parent rewriting to line history browser
46
+ - Make graph_next_line external to other part of git
47
+ - Make rewrite_parents public to other part of git
48
+ - Hook line history into cmd_log, ensuring a topo-ordered walk
49
+ - Print the line log
50
+ - map/take range to the parent of commits
51
+ - Add range clone functions
52
+ - Export three functions from diff.c
53
+ - Parse the -L options
54
+ - Refactor parse_loc
55
+ - Add the basic data structure for line level history
56
+ - parse-options: add two helper functions
57
+ - parse-options: enhance STOP_AT_NON_OPTION
58
+
59
+Does not seem to pass the self test for me...
60
+
61
+* dg/local-mod-error-messages (2010-08-11) 5 commits
62
+ - t7609: test merge and checkout error messages
63
+ - unpack_trees: group error messages by type
64
+ - merge-recursive: distinguish "removed" and "overwritten" messages
65
+ - merge-recursive: porcelain messages for checkout
66
+ - Turn unpack_trees_options.msgs into an array + enum
67
+
68
+Looking good.
69
+
70
+* en/rebase-against-rebase-fix (2010-08-06) 2 commits
71
+ - pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
72
+ - t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
73
+
74
+* gb/split-cmdline-errmsg (2010-08-07) 1 commit
75
+ - split_cmdline: Allow caller to access error string
76
+
77
+* jc/builtin-binsearch (2010-08-05) 2 commits
78
+ . git.c: binary search in the built-in command list
79
+ . git.c: sort the list of built-in command names
80
+
81
+* jl/submodule-ignore-diff (2010-08-06) 4 commits
82
+ - Add tests for the diff.ignoreSubmodules config option
83
+ - Add the 'diff.ignoreSubmodules' config setting
84
+ - Submodules: Use "ignore" settings from .gitmodules too for diff and status
85
+ - Submodules: Add the new "ignore" config option for diff and status
86
+
87
+Looking good.
88
+
89
+* jn/commit-no-change-wo-status (2010-07-24) 9 commits
90
+ . commit: suppress status summary when no changes staged
91
+ . commit --dry-run: give advice on empty amend
92
+ . commit: give empty-commit avoidance code its own function
93
+ . t7508 (status): modernize style
94
+ . commit: split off the piece that writes status
95
+ . commit: split commit -s handling into its own function
96
+ . commit: split off a function to fetch the default log message
97
+ . wt-status: split off a function for printing submodule summary
98
+ . wt-status: split wt_status_print into digestible pieces
99
+
100
+* jn/merge-renormalize (2010-08-05) 12 commits
101
+ . merge-recursive --renormalize
102
+ . rerere: never renormalize
103
+ . rerere: migrate to parse-options API
104
+ . t4200 (rerere): modernize style
105
+ . ll-merge: let caller decide whether to renormalize
106
+ . ll-merge: make flag easier to populate
107
+ . Documentation/technical: document ll_merge
108
+ . merge-trees: let caller decide whether to renormalize
109
+ . merge-trees: push choice to renormalize away from low level
110
+ . t6038 (merge.renormalize): check that it can be turned off
111
+ . t6038 (merge.renormalize): try checkout -m and cherry-pick
112
+ . t6038 (merge.renormalize): style nitpicks
113
+ (this branch uses eb/double-convert-before-merge.)
114
+
115
+* jn/paginate-fix (2010-08-05) 13 commits
116
+ . merge-file: run setup_git_directory_gently() sooner
117
+ . var: run setup_git_directory_gently() sooner
118
+ . ls-remote: run setup_git_directory_gently() sooner
119
+ . index-pack: run setup_git_directory_gently() sooner
120
+ . Merge branch 'jn/maint-setup-fix' (early part) into HEAD
121
+ . config: run setup_git_directory_gently() sooner
122
+ . bundle: run setup_git_directory_gently() sooner
123
+ . apply: run setup_git_directory_gently() sooner
124
+ . grep: run setup_git_directory_gently() sooner
125
+ . shortlog: run setup_git_directory_gently() sooner
126
+ . git wrapper: allow setup_git_directory_gently() be called earlier
127
+ . setup: remember whether repository was found
128
+ . git wrapper: introduce startup_info struct
129
+ (this branch uses jn/maint-setup-fix.)
130
+
131
+I had trouble merging these three topics to 'pu' and ran out of time my
132
+git Wednesday this week. I think the "no-change-wo-status" one had some
133
+unintended consequences discovered on the list?
134
+
135
+* jn/maint-plug-leak (2010-08-09) 3 commits
136
+ - write-tree: Avoid leak when index refers to an invalid object
137
+ - read-tree: stop leaking tree objects
138
+ - core: Stop leaking ondisk_cache_entrys
139
+
140
+Will fast-track merging to 'next', 'master' and 'maint' after giving it
141
+another look.
142
+
143
+* jn/svn-fe (2010-08-09) 10 commits
144
+ - svn-fe manual: Clarify warning about deltas in dump files
145
+ - Update svn-fe manual
146
+ - SVN dump parser
147
+ - Infrastructure to write revisions in fast-export format
148
+ - Add stream helper library
149
+ - Add string-specific memory pool
150
+ - Add treap implementation
151
+ - Add memory pool library
152
+ - Introduce vcs-svn lib
153
+ - Export parse_date_basic() to convert a date string to timestamp
154
53
-* jn/doc-pull (2010-08-02) 1 commit
54
- - Documentation: flesh out “git pull” description
155
+There was a screw-up on my part---I should have dropped the first one and
156
+branched this off of jn/parse-date-basic (I'll fix it up before merging
157
+this to 'next').
158
56
-* jn/maint-gitweb-dynconf (2010-07-30) 1 commit
57
- - gitweb: allow configurations that change with each request
159
+* js/detached-stash (2010-08-10) 9 commits
160
+ - Documentation: git stash branch now tolerates non-stash references.
161
+ - t3903-stash.sh: tests of git stash with stash-like arguments
162
+ - stash: teach git stash show to always tolerate stash-like arguments.
163
+ - stash: teach git stash branch to tolerate stash-like arguments
164
+ - stash: teach git stash drop to fail early if the specified revision is not a stash reference
165
+ - stash: teach git stash pop to fail early if the argument is not a stash ref
166
+ - stash: introduce is_stash_ref and assert_stash_ref functions.
167
+ - stash: extract stash-like check into its own function
168
+ - stash: refactor - create pop_stash function
169
59
-* sr/local-config (2010-08-03) 1 commit
60
- - config: add --local option
170
+Haven't looked this new round closely yet.
171
+
172
+* mm/rebase-i-exec (2010-08-10) 2 commits
173
+ - test-lib: user-friendly alternatives to test [-d|-f|-e]
174
+ - rebase -i: add exec command to launch a shell command
175
+
176
+Looking good.
177
+
178
+* so/http-user-agent (2010-08-11) 1 commit
179
+ - Allow HTTP user agent string to be modified.
180
+
181
+Looking good.
182
+
183
+* sp/fix-smart-http-deadlock-on-error (2010-08-06) 1 commit
184
+ (merged to 'next' on 2010-08-11 at 0a6369e)
185
+ + smart-http: Don't deadlock on server failure
186
+
187
+Will fast-track merging to 'master' and 'maint' after giving it another
188
+look.
189
+
190
+--------------------------------------------------
191
+[Ejected]
192
+
193
+* rr/svn-export (2010-07-29) 9 commits
194
+ . vcs-svn: Remove stray calls to removed functions
195
+ . Add SVN dump parser
196
+ . Add infrastructure to write revisions in fast-export format
197
+ . Add stream helper library
198
+ . Add string-specific memory pool
199
+ . vcs-svn: treap_search should return NULL for missing items
200
+ . Add treap implementation
201
+ . Add memory pool library
202
+ . Introduce vcs-svn lib
203
+ (this branch uses jn/parse-date-basic.)
204
+
205
+Replaced with Jonathan's reroll.
206
207
--------------------------------------------------
208
[Stalled]
@@ -77,6 +222,29 @@ I recall there was another round of re-roll planned for this one.
222
--------------------------------------------------
223
[Cooking]
224
225
+* jc/sha1-name-find-fix (2010-08-02) 1 commit
226
+ (merged to 'next' on 2010-08-11 at 51106a5)
227
+ + sha1_name.c: fix parsing of ":/token" syntax
228
+
229
+Will merge to 'master' (and perhaps 'maint').
230
+
231
+* jn/doc-pull (2010-08-02) 1 commit
232
+ (merged to 'next' on 2010-08-11 at a223479)
233
+ + Documentation: flesh out “git pull” description
234
+
235
+Will merge to 'master'.
236
+
237
+* jn/maint-gitweb-dynconf (2010-07-30) 1 commit
238
+ (merged to 'next' on 2010-08-11 at a94ce85)
239
+ + gitweb: allow configurations that change with each request
240
+
241
+Will merge to 'master'.
242
+
243
+* sr/local-config (2010-08-03) 1 commit
244
+ - config: add --local option
245
+
246
+Looked Ok. Will merge to 'next'.
247
+
248
* ab/test-coverage (2010-07-26) 8 commits
249
- Makefile: make gcov invocation configurable
250
- t/README: Add a note about the dangers of coverage chasing
@@ -87,7 +255,15 @@ I recall there was another round of re-roll planned for this one.
255
- Makefile: Include subdirectories in "make cover" reports
256
- gitignore: Ignore files generated by "make coverage"
257
90
-* ab/test-no-skip (2010-07-28) 5 commits
258
+* ab/test-no-skip (2010-08-10) 13 commits
259
+ - git-notes: Run partial expensive test everywhere
260
+ - t/t3300-funny-names: change from skip_all=* to prereq skip
261
+ - t/t3902-quoted: change from skip_all=* to prereq skip
262
+ - t/t4016-diff-quote: change from skip_all=* to prereq skip
263
+ - t/t5503-tagfollow: change from skip_all=* to prereq skip
264
+ - t/t7005-editor: change from skip_all=* to prereq skip
265
+ - t/t5705-clone-2gb: change from skip_all=* to prereq skip
266
+ - t/t1304-default-acl: change from skip_all=* to prereq skip
267
- t/README: Update "Skipping tests" to align with best practices
268
- t/t7800-difftool.sh: Skip with prereq on no PERL
269
- t/t5800-remote-helpers.sh: Skip with prereq on python <2.4
@@ -95,8 +271,11 @@ I recall there was another round of re-roll planned for this one.
271
- tests: implicitly skip SYMLINKS tests using <prereq>
272
273
* bc/use-more-hardlinks-in-install (2010-07-23) 2 commits
98
- - Makefile: make hard/symbolic links for non-builtins too
99
- - Makefile: link builtins residing in bin directory to main git binary too
274
+ (merged to 'next' on 2010-08-11 at 59dd30e)
275
+ + Makefile: make hard/symbolic links for non-builtins too
276
+ + Makefile: link builtins residing in bin directory to main git binary too
277
+
278
+Will merge to 'master'.
279
280
* cc/find-commit-subject (2010-07-22) 6 commits
281
- blame: use find_commit_subject() instead of custom code
@@ -106,6 +285,8 @@ I recall there was another round of re-roll planned for this one.
285
- revert: refactor code to find commit subject in find_commit_subject()
286
- revert: fix off by one read when searching the end of a commit subject
287
288
+Looked Ok. Will merge to 'next'.
289
+
290
* gb/shell-ext (2010-07-28) 3 commits
291
- Add sample commands for git-shell
292
- Add interactive mode to git-shell for user-friendliness
@@ -114,24 +295,34 @@ I recall there was another round of re-roll planned for this one.
295
* jc/log-grep (2010-07-19) 1 commit
296
- git log: add -G<regexp> that greps in the patch text
297
298
+This is broken, but haven't found any time to revisit it yet.
299
+
300
* jh/clean-exclude (2010-07-20) 2 commits
301
- Add test for git clean -e.
302
- Add -e/--exclude to git-clean.
303
304
+Looked Ok. Will merge to 'next'.
305
+
306
* jh/use-test-must-fail (2010-07-20) 1 commit
307
- Convert "! git" to "test_must_fail git"
308
309
+Looked Ok. Will merge to 'next'.
310
+
311
* jn/apply-filename-with-sp (2010-07-23) 4 commits
312
- apply: Handle traditional patches with space in filename
313
- t4135 (apply): use expand instead of pr for portability
314
- tests: Test how well "git apply" copes with weird filenames
315
- apply: Split quoted filename handling into new function
316
317
+Looked Ok. Will merge to 'next'.
318
+
319
* jn/fix-abbrev (2010-07-27) 3 commits
320
- examples/commit: use --abbrev for commit summary
321
- checkout, commit: remove confusing assignments to rev.abbrev
322
- archive: abbreviate substituted commit ids again
323
324
+Looked Ok. Will merge to 'next'.
325
+
326
* jn/maint-setup-fix (2010-07-24) 11 commits
327
- setup: split off a function to handle ordinary .git directories
328
- Revert "rehabilitate 'git index-pack' inside the object store"
@@ -144,6 +335,7 @@ I recall there was another round of re-roll planned for this one.
335
- setup: split off $GIT_DIR-set case from setup_git_directory_gently
336
- tests: try git apply from subdir of toplevel
337
- t1501 (rev-parse): clarify
338
+ (this branch is used by jn/paginate-fix.)
339
340
* jn/rebase-rename-am (2008-11-10) 5 commits
341
- rebase: protect against diff.renames configuration
@@ -152,15 +344,21 @@ I recall there was another round of re-roll planned for this one.
344
- t4150 (am): futureproof against failing tests
345
- t4150 (am): style fix
346
347
+Will merge to 'next'.
348
+
349
* ml/rebase-x-strategy (2010-07-29) 1 commit
350
- rebase: support -X to pass through strategy options
351
158
-* mm/shortopt-detached (2010-07-30) 5 commits
159
- - log: parse detached option for --glob
160
- - log: parse detached options like git log --grep foo
161
- - diff: parse detached options --stat-width n, --stat-name-width n
352
+Looked Ok. Will merge to 'next'.
353
+
354
+* mm/shortopt-detached (2010-08-05) 5 commits
355
+ - log: parse separate option for --glob
356
+ - log: parse separate options like git log --grep foo
357
+ - diff: parse separate options --stat-width n, --stat-name-width n
358
- diff: split off a function for --stat-* option parsing
163
- - diff: parse detached options like -S foo
359
+ - diff: parse separate options like -S foo
360
+
361
+Looked Ok. Will merge to 'next'.
362
363
* nd/fix-sparse-checkout (2010-07-31) 5 commits
364
- unpack-trees: mark new entries skip-worktree appropriately
@@ -169,22 +367,31 @@ I recall there was another round of re-roll planned for this one.
367
- unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set
368
- t1011 (sparse checkout): style nitpicks
369
370
+Looked Ok. Will merge to 'next'.
371
+
372
* tr/ab-i18n-fix (2010-07-25) 1 commit
373
- tests: locate i18n lib&data correctly under --valgrind
374
(this branch uses ab/i18n.)
375
376
+Looked Ok. Will merge to 'next'.
377
+
378
* tr/maint-no-unquote-plus (2010-07-24) 1 commit
379
- Do not unquote + into ' ' in URLs
380
381
* tr/xsize-bits (2010-07-28) 1 commit
180
- - xsize_t: check whether we lose bits
382
+ (merged to 'next' on 2010-08-11 at bcc0271)
383
+ + xsize_t: check whether we lose bits
384
385
* vs/doc-spell (2010-07-20) 1 commit
386
- Documentation: spelling fixes
387
388
+Looked Ok. Will merge to 'next'.
389
+
390
* ab/report-corrupt-object-with-type (2010-06-10) 1 commit
391
- sha1_file: Show the the type and path to corrupt objects
392
393
+Looked Ok. Will merge to 'next'.
394
+
395
* cc/revert (2010-07-21) 5 commits
396
- t3508: add check_head_differs_from() helper function and use it
397
- revert: improve success message by adding abbreviated commit sha1
@@ -197,41 +404,41 @@ I recall there was another round of re-roll planned for this one.
404
- fast-export: Fix dropping of files with --import-marks and path limiting
405
406
* jn/parse-date-basic (2010-07-15) 1 commit
200
- - Export parse_date_basic() to convert a date string to timestamp
407
+ (merged to 'next' on 2010-08-11 at ca9fef0)
408
+ + Export parse_date_basic() to convert a date string to timestamp
409
(this branch is used by rr/svn-export.)
410
411
+Will merge to 'master'.
412
+
413
* kf/post-receive-sample-hook (2010-07-16) 1 commit
414
- post-receive-email: optional message line count limit
415
416
+I do not particularly like the idea of counting number of lines in a shell
417
+loop but this is an opt-in feature to a contrib/ item so it should be ok.
418
+Will merge to 'next'.
419
+
420
* tr/rfc-reset-doc (2010-07-18) 5 commits
207
- - Documentation/reset: move "undo permanently" example behind "make topic"
208
- - Documentation/reset: reorder examples to match description
209
- - Documentation/reset: promote 'examples' one section up
210
- - Documentation/reset: separate options by mode
211
- - Documentation/git-reset: reorder modes for soft-mixed-hard progression
421
+ (merged to 'next' on 2010-08-11 at 8e7c8d1)
422
+ + Documentation/reset: move "undo permanently" example behind "make topic"
423
+ + Documentation/reset: reorder examples to match description
424
+ + Documentation/reset: promote 'examples' one section up
425
+ + Documentation/reset: separate options by mode
426
+ + Documentation/git-reset: reorder modes for soft-mixed-hard progression
427
213
-* rr/svn-export (2010-07-29) 9 commits
214
- - vcs-svn: Remove stray calls to removed functions
215
- - Add SVN dump parser
216
- - Add infrastructure to write revisions in fast-export format
217
- - Add stream helper library
218
- - Add string-specific memory pool
219
- - vcs-svn: treap_search should return NULL for missing items
220
- - Add treap implementation
221
- - Add memory pool library
222
- - Introduce vcs-svn lib
223
- (this branch uses jn/parse-date-basic.)
428
+Looked fine. Will merge to 'master'.
429
430
* hv/autosquash-config (2010-07-14) 1 commit
431
- add configuration variable for --autosquash option of interactive rebase
432
433
* jh/graph-next-line (2010-07-13) 2 commits
229
- - Enable custom schemes for column colors in the graph API
230
- - Make graph_next_line() available in the graph.h API
434
+ (merged to 'next' on 2010-08-11 at 333f9df)
435
+ + Enable custom schemes for column colors in the graph API
436
+ + Make graph_next_line() available in the graph.h API
437
438
* ar/string-list-foreach (2010-07-03) 2 commits
233
- - Convert the users of for_each_string_list to for_each_string_list_item macro
234
- - Add a for_each_string_list_item macro
439
+ (merged to 'next' on 2010-08-11 at 993dc02)
440
+ + Convert the users of for_each_string_list to for_each_string_list_item macro
441
+ + Add a for_each_string_list_item macro
442
(this branch is used by tf/string-list-init.)
443
444
* il/rfc-remote-fd-ext (2010-07-31) 4 commits
@@ -241,12 +448,14 @@ I recall there was another round of re-roll planned for this one.
448
- New remote helper git-remote-fd
449
450
* hv/submodule-find-ff-merge (2010-07-07) 3 commits
244
- - Implement automatic fast-forward merge for submodules
245
- - setup_revisions(): Allow walking history in a submodule
246
- - Teach ref iteration module about submodules
451
+ (merged to 'next' on 2010-08-11 at 6900d2c)
452
+ + Implement automatic fast-forward merge for submodules
453
+ + setup_revisions(): Allow walking history in a submodule
454
+ + Teach ref iteration module about submodules
455
456
* jn/fast-import-subtree (2010-06-30) 1 commit
249
- - Teach fast-import to import subtrees named by tree id
457
+ (merged to 'next' on 2010-08-11 at 5e19de0)
458
+ + Teach fast-import to import subtrees named by tree id
459
460
* sg/rerere-gc-old-still-used (2010-07-13) 2 commits
461
- rerere: fix overeager gc
@@ -271,12 +480,15 @@ I recall there was another round of re-roll planned for this one.
480
- Add infrastructure for translating Git with gettext
481
(this branch is used by tr/ab-i18n-fix.)
482
274
-* tc/checkout-B (2010-06-24) 3 commits
275
- - builtin/checkout: learn -B
276
- - builtin/checkout: reword hint for -b
277
- - add tests for checkout -b
483
+* tc/checkout-B (2010-08-10) 4 commits
484
+ (merged to 'next' on 2010-08-11 at 5433b51)
485
+ + builtin/checkout: handle -B from detached HEAD correctly
486
+ + builtin/checkout: learn -B
487
+ + builtin/checkout: reword hint for -b
488
+ + add tests for checkout -b
489
490
* eb/double-convert-before-merge (2010-07-02) 3 commits
491
- Don't expand CRLFs when normalizing text during merge
492
- Try normalizing files to avoid delete/modify conflicts when merging
493
- Avoid conflicts when merging branches with mixed normalization
494
+ (this branch is used by jn/merge-renormalize.)