What's cooking (2014/08 #03)
Junio C Hamano committed
Aug 20, 2014 at 16:16 UTC
80d818881a94501db59c54a9f5c87a855b022888
1 file changed
+321
-108
whats-cooking.txt
+321
-108
@@ -1,19 +1,21 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2014, #02; Fri, 8)
4
-X-master-at: f82887f29010e1ec88ec1930a99ddc56b6438452
5
-X-next-at: edb03e5a9b9b63d0864557f99f339b2b5f3a9e4e
3
+Subject: What's cooking in git.git (Aug 2014, #03; Wed, 20)
4
+X-master-at: 6c4ab27f2378ce67940b4496365043119d7ffff2
5
+X-next-at: 9eef2c89753895da807c936ff1ba3a255c8370c9
6
7
-What's cooking in git.git (Aug 2014, #02; Fri, 8)
7
+What's cooking in git.git (Aug 2014, #03; Wed, 20)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-The second release candidate snapshot is out. Hopefully after a
15
-week of a calm pre-release "bugfix-only" period, we can do the 2.1
16
-final late next week.
14
+A few fixes for regressions have been posted since 2.1 was tagged,
15
+which I'd like to address before moving any topic to 'master',
16
+rewinding 'next', or doing anything for the 2.2 cycle. Hopefully by
17
+the end of this week 'next' will be rewound and rebuilt and then we
18
+can start taking patches for new topics in earnest from that point.
19
20
You can find the changes described here in the integration branches
21
of the repositories listed at
@@ -21,139 +23,217 @@ of the repositories listed at
23
http://git-blame.blogspot.com/p/git-public-repositories.html
24
25
--------------------------------------------------
24
-[Graduated to "master"]
26
+[New Topics]
27
26
-* ta/doc-config (2014-07-30) 1 commit
27
- (merged to 'next' on 2014-07-31 at ec577fa)
28
- + add documentation for writing config files
28
+* br/http-init-fix (2014-08-18) 2 commits
29
+ - http: style fixes for curl_multi_init error check
30
+ - http.c: die if curl_*_init fails
31
32
+ Needs S-o-b from peff for the topmost one.
33
31
-* tf/maint-doc-push (2014-07-31) 1 commit
32
- (merged to 'next' on 2014-07-31 at 6a8ef70)
33
- + git-push: fix link in man page
34
35
---------------------------------------------------
36
-[New Topics]
35
+* br/imap-send-simplify-tunnel-child-process (2014-08-20) 2 commits
36
+ - imap-send.c: imap_folder -> imap_server_conf.folder
37
+ - git-imap-send: simplify tunnel construction
38
38
-* tf/imap-send-create (2014-08-01) 3 commits
39
- - SQUASH??? varargs form of issue-imap-cmd is no longer used
40
- - imap-send: create target mailbox if it is missing
41
- - imap-send: clarify CRAM-MD5 vs LOGIN documentation
39
+ Will merge to 'next'.
40
43
- Will merge to 'next' after dealing with the SQUASH??? fix-up.
41
42
+* jc/config-mak-document-darwin-vs-macosx (2014-08-15) 1 commit
43
+ - config.mak.uname: add hint on uname_R for MacOS X
44
+ (this branch uses km/no-apple-common-crypto-on-darwin-8-and-below.)
45
46
-* bc/archive-pax-header-mode (2014-08-04) 1 commit
47
- - archive: honor tar.umask even for pax headers
46
+ Will merge to 'next'.
47
49
- Implementations of "tar" that do not understand an extended pax
50
- header would extract the contents of it in a regular file; make
51
- sure the permission bits of this file follows the same tar.umask
52
- configuration setting.
48
+
49
+* jk/fix-profile-feedback-build (2014-08-19) 1 commit
50
+ - Makefile: make perf tests optional for profile build
51
+
52
+ Fix profile-feedback build broken in 2.1 for tarball releases.
53
54
Will merge to 'next'.
55
56
57
-* bc/imap-send-doc (2014-08-05) 1 commit
58
- - imap-send doc: omit confusing "to use imap-send" modifier
57
+* jk/pack-shallow-always-without-bitmap (2014-08-12) 1 commit
58
+ - pack-objects: turn off bitmaps when we see --shallow lines
59
+
60
+ Reachability bitmaps do not work with shallow operations.
61
62
Will merge to 'next'.
63
64
63
-* jc/apply-ws-prefix (2014-08-07) 3 commits
64
- - apply: omit ws check for excluded paths
65
- - apply: hoist use_patch() helper for path exclusion up
66
- - apply: use the right attribute for paths in non-Git patches
65
+* jn/header-dependencies (2014-08-10) 1 commit
66
+ - Update hard-coded header dependencies
67
+
68
+ Needs further discussions on the list.
69
68
- Applying a patch not generated by Git in a subdirectory used to
69
- check the whitespace breakage using the attributes for incorrect
70
- paths. Also whitespace checks were performed even for paths
71
- excluded via "git apply --exclude=<path>" mechanism.
70
+
71
+* jn/unpack-trees-checkout-m-carry-deletion (2014-08-13) 4 commits
72
+ - SQUASH???
73
+ - checkout -m: attempt merge when deletion of path was staged
74
+ - unpack-trees: use 'cuddled' style for if-else cascade
75
+ - unpack-trees: simplify 'all other failures' case
76
+
77
+ Needs tests; perhaps squashing in the topmost "SQUASH???" is enough.
78
+
79
+
80
+* km/no-apple-common-crypto-on-darwin-8-and-below (2014-08-15) 1 commit
81
+ - config.mak.uname: set NO_APPLE_COMMON_CRYPTO on older systems
82
+ (this branch is used by jc/config-mak-document-darwin-vs-macosx.)
83
+
84
+ Build automation for older versions of MacOS X.
85
86
Will merge to 'next'.
87
88
76
-* jk/command-line-config-empty-string (2014-08-05) 1 commit
77
- - config: teach "git -c" to recognize an empty string
89
+* nd/large-blobs (2014-08-18) 5 commits
90
+ - diff: shortcut for diff'ing two binary SHA-1 objects
91
+ - diff --stat: mark any file larger than core.bigfilethreshold binary
92
+ - diff.c: allow to pass more flags to diff_populate_filespec
93
+ - sha1_file.c: do not die failing to malloc in unpack_compressed_entry
94
+ - wrapper.c: introduce gentle xmallocz that does not die()
95
+
96
+ Will merge to 'next'.
97
+
98
+
99
+* nd/mv-code-cleaning (2014-08-11) 9 commits
100
+ - SQUASH???
101
+ - mv: no SP between function name and the first opening parenthese
102
+ - mv: combine two if(s)
103
+ - mv: unindent one level for directory move code
104
+ - mv: move index search code out
105
+ - mv: remove an "if" that's always true
106
+ - mv: split submodule move preparation code out
107
+ - mv: flatten error handling code block
108
+ - mv: mark strings for translations
109
+
110
+ Needs rerolling to account for the topmost "SQUASH???" simplification.
111
79
- "git -c section.var command" and "git -c section.var= command"
80
- should pass the configuration differently (the former should be
81
- a boolean true, the latter should be an empty string).
112
+
113
+* nd/strbuf-utf8-replace (2014-08-11) 1 commit
114
+ - utf8.c: fix strbuf_utf8_replace() consuming data beyond input string
115
116
Will merge to 'next'.
117
118
86
-* jk/pack-bitmap (2014-08-04) 1 commit
87
- - pack-bitmap: do not use gcc packed attribute
119
+* rr/mergetool-temporary-filename-tweak (2014-08-19) 1 commit
120
+ - Allow the user to change the temporary file name for mergetool
121
+
122
+ Needs rerolling (new paragraph in doc seems to be in a wrong place)
123
+
124
+
125
+* rs/clean-menu-item-defn (2014-08-18) 1 commit
126
+ - clean: use f(void) instead of f() to declare a pointer to a function without arguments
127
128
Will merge to 'next'.
129
130
92
-* jk/pretty-empty-format (2014-07-30) 3 commits
93
- - pretty: make empty userformats truly empty
94
- - pretty: treat "--format=" as an empty userformat
95
- - revision: drop useless string offset when parsing "--pretty"
131
+* rs/inline-compat-path-macros (2014-08-18) 1 commit
132
+ - turn path macros into inline function
133
97
- "git log --pretty/format=" with an empty format string did not mean
98
- the more obvious "No output whatsoever" but "Use default format",
99
- which was counterintuitive.
134
+ Will merge to 'next'.
135
+
136
+
137
+* rs/refresh-beyond-symlink (2014-08-10) 1 commit
138
+ - read-cache: check for leading symlinks when refreshing index
139
+
140
+ "git add x" where x that used to be a directory has become a
141
+ symbolic link to a directory misbehaved.
142
143
Will merge to 'next'.
144
145
104
-* la/init-doc (2014-08-08) 7 commits
105
- - Documentation: git-init: flesh out example
106
- - Documentation: git-init: template directory: reword and cross-reference
107
- - Documentation: git-init: reword parenthetical statements
108
- - Documentation: git-init: --separate-git-dir: clarify
109
- - Documentation: git-init: template directory: reword
110
- - Documentation: git-init: list items facelift
111
- - Documentation: git-init: typographical fixes
146
+* sb/blame-msg-i18n (2014-08-12) 1 commit
147
+ - builtin/blame.c: add translation to warning about failed revision walk
148
149
Will merge to 'next'.
150
151
116
-* lf/bundle-exclusion (2014-08-07) 1 commit
117
- - bundle: fix exclusion of annotated tags
152
+* sb/plug-leaks (2014-08-10) 2 commits
153
+ - clone.c: don't leak memory in cmd_clone
154
+ - remote.c: don't leak the base branch name in format_tracking_info
155
156
Will merge to 'next'.
157
158
122
-* mm/log-branch-desc-plug-leak (2014-08-07) 1 commit
123
- - builtin/log.c: fix minor memory leak
159
+* sb/prepare-revision-walk-error-check (2014-08-12) 1 commit
160
+ - prepare_revision_walk(): check for return value in all places
161
162
Will merge to 'next'.
163
164
128
-* ta/config-set-1 (2014-08-07) 8 commits
129
- - add tests for `git_config_get_string_const()`
130
- - add a test for semantic errors in config files
131
- - rewrite git_config() to use the config-set API
132
- - config: add `git_die_config()` to the config-set API
133
- - change `git_config()` return value to void
134
- - add line number and file name info to `config_set`
135
- - config.c: fix accuracy of line number in errors
136
- - config.c: mark error and warnings strings for translation
137
- (this branch is used by ta/config-set-2; uses ta/config-set.)
165
+* sb/unpack-trees-dead-code-removal (2014-08-12) 2 commits
166
+ - SQUASH???
167
+ - unpack-tree.c: remove dead code
168
169
+ Will discard (jn/unpack-trees-checkout-m-carry-deletion should do the same).
170
140
-* ta/config-set-2 (2014-08-07) 11 commits
141
- - branch.c: replace `git_config()` with `git_config_get_string()
142
- - alias.c: replace `git_config()` with `git_config_get_string()`
143
- - imap-send.c: replace `git_config()` with `git_config_get_*()` family
144
- - pager.c: replace `git_config()` with `git_config_get_value()`
145
- - builtin/gc.c: replace `git_config()` with `git_config_get_*()` family
146
- - rerere.c: replace `git_config()` with `git_config_get_*()` family
147
- - fetchpack.c: replace `git_config()` with `git_config_get_*()` family
148
- - archive.c: replace `git_config()` with `git_config_get_bool()` family
149
- - read-cache.c: replace `git_config()` with `git_config_get_*()` family
150
- - http-backend.c: replace `git_config()` with `git_config_get_bool()` family
151
- - daemon.c: replace `git_config()` with `git_config_get_bool()` family
152
- (this branch uses ta/config-set and ta/config-set-1.)
171
172
+* so/rebase-doc (2014-08-12) 1 commit
173
+ - Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-op
174
155
-* ta/pretty-parse-config (2014-08-04) 1 commit
156
- - pretty.c: make git_pretty_formats_config return -1 on git_config_string failure
175
+ May need description on what makes various modes of operation to
176
+ decide that the request can become a "no-op".
177
+
178
+ Will merge to 'next'.
179
+
180
+
181
+* sp/stream-clean-filter (2014-08-12) 2 commits
182
+ - convert: Stream from fd to required clean filter instead of mmap
183
+ - convert: Refactor would_convert_to_git() to single arg 'path'
184
+
185
+ Will be rerolled.
186
+
187
+
188
+* ta/config-add-to-empty-or-true-fix (2014-08-18) 1 commit
189
+ - make config --add behave correctly for empty and NULL values
190
+
191
+ Will be rerolled.
192
+
193
+
194
+* jc/push-cert (2014-08-19) 18 commits
195
+ - signed push: final protocol update
196
+ - send-pack: send feature request on push-cert packet
197
+ - receive-pack: GPG-validate push certificates
198
+ - the beginning of the signed push
199
+ - pack-protocol doc: typofix for PKT-LINE
200
+ - gpg-interface: move parse_signature() to where it should be
201
+ - gpg-interface: move parse_gpg_output() to where it should be
202
+ - send-pack: clarify that cmds_sent is a boolean
203
+ - send-pack: refactor inspecting and resetting status and sending commands
204
+ - send-pack: rename "new_refs" to "need_pack_data"
205
+ - send-pack: factor out capability string generation
206
+ - send-pack: always send capabilities
207
+ - send-pack: refactor decision to send update per ref
208
+ - send-pack: move REF_STATUS_REJECT_NODELETE logic a bit higher
209
+ - receive-pack: factor out queueing of command
210
+ - receive-pack: do not reuse old_sha1[] to other things
211
+ - receive-pack: parse feature request a bit earlier
212
+ - receive-pack: do not overallocate command structure
213
+
214
+ Allow "git push" request to be signed, so that it can be verified
215
+ audited, using the GPG signature of the person who pushed, that the
216
+ tips of branches at a public repository really point the commits
217
+ the pusher wanted to, without having to "trust" the server.
218
+
219
+ Needs further discussion and then a reroll.
220
+
221
+ Replay attack prevention needs to be tightened and also need to fix
222
+ a few minor typos.
223
+
224
+* jk/diff-tree-t-fix (2014-08-20) 1 commit
225
+ - intersect_paths: respect mode in git's tree-sort
226
+
227
+ Fix (rarely used) "git diff-tree -t" regression in 2.0.
228
+
229
+ Will merge to 'next'.
230
+
231
+
232
+* rs/child-process-init (2014-08-20) 4 commits
233
+ - run-command: inline prepare_run_command_v_opt()
234
+ - run-command: call run_command_v_opt_cd_env() instead of duplicating it
235
+ - run-command: introduce child_process_init()
236
+ - run-command: introduce CHILD_PROCESS_INIT
237
238
Will merge to 'next'.
239
@@ -375,6 +455,136 @@ of the repositories listed at
455
--------------------------------------------------
456
[Cooking]
457
458
+* tf/imap-send-create (2014-08-01) 3 commits
459
+ - SQUASH??? varargs form of issue-imap-cmd is no longer used
460
+ - imap-send: create target mailbox if it is missing
461
+ - imap-send: clarify CRAM-MD5 vs LOGIN documentation
462
+
463
+ Will merge to 'next' after dealing with the SQUASH??? fix-up.
464
+
465
+
466
+* bc/archive-pax-header-mode (2014-08-04) 1 commit
467
+ (merged to 'next' on 2014-08-13 at 9972bb2)
468
+ + archive: honor tar.umask even for pax headers
469
+
470
+ Implementations of "tar" that do not understand an extended pax
471
+ header would extract the contents of it in a regular file; make
472
+ sure the permission bits of this file follows the same tar.umask
473
+ configuration setting.
474
+
475
+ Will merge to 'master'.
476
+
477
+
478
+* bc/imap-send-doc (2014-08-05) 1 commit
479
+ - imap-send doc: omit confusing "to use imap-send" modifier
480
+
481
+ Will merge to 'next'.
482
+
483
+
484
+* jc/apply-ws-prefix (2014-08-07) 3 commits
485
+ - apply: omit ws check for excluded paths
486
+ - apply: hoist use_patch() helper for path exclusion up
487
+ - apply: use the right attribute for paths in non-Git patches
488
+
489
+ Applying a patch not generated by Git in a subdirectory used to
490
+ check the whitespace breakage using the attributes for incorrect
491
+ paths. Also whitespace checks were performed even for paths
492
+ excluded via "git apply --exclude=<path>" mechanism.
493
+
494
+ Will merge to 'next'.
495
+
496
+
497
+* jk/command-line-config-empty-string (2014-08-05) 1 commit
498
+ - config: teach "git -c" to recognize an empty string
499
+
500
+ "git -c section.var command" and "git -c section.var= command"
501
+ should pass the configuration differently (the former should be
502
+ a boolean true, the latter should be an empty string).
503
+
504
+ Will merge to 'next'.
505
+
506
+
507
+* jk/pack-bitmap (2014-08-04) 1 commit
508
+ - pack-bitmap: do not use gcc packed attribute
509
+
510
+ Hold, waiting for Karsten's replacement.
511
+
512
+
513
+* jk/pretty-empty-format (2014-07-30) 3 commits
514
+ (merged to 'next' on 2014-08-13 at 543bb4d)
515
+ + pretty: make empty userformats truly empty
516
+ + pretty: treat "--format=" as an empty userformat
517
+ + revision: drop useless string offset when parsing "--pretty"
518
+
519
+ "git log --pretty/format=" with an empty format string did not mean
520
+ the more obvious "No output whatsoever" but "Use default format",
521
+ which was counterintuitive.
522
+
523
+ Will merge to 'master'.
524
+
525
+
526
+* la/init-doc (2014-08-08) 7 commits
527
+ - Documentation: git-init: flesh out example
528
+ - Documentation: git-init: template directory: reword and cross-reference
529
+ - Documentation: git-init: reword parenthetical statements
530
+ - Documentation: git-init: --separate-git-dir: clarify
531
+ - Documentation: git-init: template directory: reword
532
+ - Documentation: git-init: list items facelift
533
+ - Documentation: git-init: typographical fixes
534
+
535
+ Will merge to 'next'.
536
+
537
+
538
+* lf/bundle-exclusion (2014-08-07) 1 commit
539
+ - bundle: fix exclusion of annotated tags
540
+
541
+ Will merge to 'next'.
542
+
543
+
544
+* mm/log-branch-desc-plug-leak (2014-08-07) 1 commit
545
+ - builtin/log.c: fix minor memory leak
546
+
547
+ Will merge to 'next'.
548
+
549
+
550
+* ta/config-set-1 (2014-08-07) 8 commits
551
+ - add tests for `git_config_get_string_const()`
552
+ - add a test for semantic errors in config files
553
+ - rewrite git_config() to use the config-set API
554
+ - config: add `git_die_config()` to the config-set API
555
+ - change `git_config()` return value to void
556
+ - add line number and file name info to `config_set`
557
+ - config.c: fix accuracy of line number in errors
558
+ - config.c: mark error and warnings strings for translation
559
+ (this branch is used by ta/config-set-2; uses ta/config-set.)
560
+
561
+
562
+* ta/config-set-2 (2014-08-13) 15 commits
563
+ - builtin/apply.c: replace `git_config()` with `git_config_get_string_const()`
564
+ - merge-recursive.c: replace `git_config()` with `git_config_get_int()`
565
+ - ll-merge.c: refactor `read_merge_config()` to use `git_config_string()`
566
+ - fast-import.c: replace `git_config()` with `git_config_get_*()` family
567
+ - branch.c: replace `git_config()` with `git_config_get_string()
568
+ - alias.c: replace `git_config()` with `git_config_get_string()`
569
+ - imap-send.c: replace `git_config()` with `git_config_get_*()` family
570
+ - pager.c: replace `git_config()` with `git_config_get_value()`
571
+ - builtin/gc.c: replace `git_config()` with `git_config_get_*()` family
572
+ - rerere.c: replace `git_config()` with `git_config_get_*()` family
573
+ - fetchpack.c: replace `git_config()` with `git_config_get_*()` family
574
+ - archive.c: replace `git_config()` with `git_config_get_bool()` family
575
+ - read-cache.c: replace `git_config()` with `git_config_get_*()` family
576
+ - http-backend.c: replace `git_config()` with `git_config_get_bool()` family
577
+ - daemon.c: replace `git_config()` with `git_config_get_bool()` family
578
+ (this branch uses ta/config-set and ta/config-set-1.)
579
+
580
+
581
+* ta/pretty-parse-config (2014-08-04) 1 commit
582
+ (merged to 'next' on 2014-08-13 at 07396f4)
583
+ + pretty.c: make git_pretty_formats_config return -1 on git_config_string failure
584
+
585
+ Will merge to 'master'.
586
+
587
+
588
* jk/stash-list-p (2014-08-07) 1 commit
589
- stash: default listing to working-tree diff
590
@@ -386,12 +596,13 @@ of the repositories listed at
596
597
598
* pr/remotes-in-hashmap (2014-07-30) 1 commit
389
- - use a hashmap to make remotes faster
599
+ (merged to 'next' on 2014-08-13 at 850c14a)
600
+ + use a hashmap to make remotes faster
601
602
Optimize remotes configuration look-up in a repository with very
603
many remotes defined.
604
394
- Will merge to 'next'.
605
+ Will merge to 'master'.
606
607
608
* rs/ref-transaction-multi (2014-07-31) 5 commits
@@ -427,9 +638,8 @@ of the repositories listed at
638
- lockfile.c: store absolute path
639
- lockfile.c: remove PATH_MAX limit in resolve_symlink()
640
- lockfile.c: remove PATH_MAX limitation (except in resolve_symlink)
430
- (this branch uses rs/strbuf-getcwd.)
641
432
- Will merge to 'next'.
642
+ Will drop and ask Michael to possibly cooperate and merge with mh/lockfile.
643
644
645
* mm/config-message-i18n (2014-08-01) 1 commit
@@ -491,10 +701,12 @@ of the repositories listed at
701
Update the way the "difftool --help" shows the help message that is
702
shared with the "mergetool" to reduce one shell dependency.
703
494
- Will merge to 'next'.
704
+ Will be rerolled.
705
706
497
-* rs/strbuf-getcwd (2014-07-29) 10 commits
707
+* rs/strbuf-getcwd (2014-08-18) 11 commits
708
+ (merged to 'next' on 2014-08-18 at 9eef2c8)
709
+ + fixup! setup: convert setup_git_directory_gently_1 et al. to strbuf
710
(merged to 'next' on 2014-07-31 at 6edc3bc)
711
+ use strbuf_add_absolute_path() to add absolute paths
712
+ abspath: convert absolute_path() to strbuf
@@ -506,7 +718,6 @@ of the repositories listed at
718
+ setup: convert setup_git_directory_gently_1 et al. to strbuf
719
+ unix-sockets: use strbuf_getcwd()
720
+ strbuf: add strbuf_getcwd()
509
- (this branch is used by nd/lock-paths-absolute.)
721
722
Will cook in 'next'.
723
@@ -522,14 +733,15 @@ of the repositories listed at
733
734
735
* ta/config-set (2014-07-29) 2 commits
525
- - test-config: add tests for the config_set API
526
- - add `config_set` API for caching config-like files
736
+ (merged to 'next' on 2014-08-13 at 99011c8)
737
+ + test-config: add tests for the config_set API
738
+ + add `config_set` API for caching config-like files
739
(this branch is used by ta/config-set-1 and ta/config-set-2.)
740
741
Add in-core caching layer to let us avoid reading the same
742
configuration files number of times.
743
532
- Will merge to 'next'.
744
+ Will merge to 'master'.
745
746
747
* rs/ref-transaction-1 (2014-07-16) 20 commits
@@ -609,23 +821,24 @@ of the repositories listed at
821
rely on symbolic links and make sharing of objects and refs safer
822
by making the borrowee and borrowers aware of each other.
823
612
- Will cook in 'next'.
824
+ Will kick back to 'pu'.
825
826
827
* nd/multiple-work-trees-1 (2014-07-29) 8 commits
616
- - checkout --to: do not touch existing target directory
617
- - checkout: prefix --to argument properly when cwd is moved
618
- - environment.c: fix incorrect git_graft_file initialization
619
- - checkout --to: fix dangling pointers in remove_junk()
620
- - checkout: no auto-detach if the ref is already checked out
621
- - prune --repos: fix uninitialized access
622
- - checkout: no need to call check_linked_checkouts if head_ref is NULL
623
- - gitrepository-layout.txt: s/ignored/ignored if/
828
+ (merged to 'next' on 2014-08-13 at 4f3a585)
829
+ + checkout --to: do not touch existing target directory
830
+ + checkout: prefix --to argument properly when cwd is moved
831
+ + environment.c: fix incorrect git_graft_file initialization
832
+ + checkout --to: fix dangling pointers in remove_junk()
833
+ + checkout: no auto-detach if the ref is already checked out
834
+ + prune --repos: fix uninitialized access
835
+ + checkout: no need to call check_linked_checkouts if head_ref is NULL
836
+ + gitrepository-layout.txt: s/ignored/ignored if/
837
(this branch uses nd/multiple-work-trees.)
838
839
Continue polishing nd/multiple-work-trees topic in 'next'.
840
628
- Will merge to 'next'.
841
+ Will kick back to 'pu'.
842
843
844
* dt/cache-tree-repair (2014-07-14) 4 commits