What's cooking (2014/06 #03)
Junio C Hamano committed
Jun 10, 2014 at 15:11 UTC
1f58507af2a18ea9c22460165ad962c8cb26022a
1 file changed
+391
-432
whats-cooking.txt
+391
-432
@@ -1,26 +1,19 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2014, #02; Fri, 6)
4
-X-master-at: 0953113bb5687f42bcdfc3d20dd3a125784ad383
5
-X-next-at: 41885497b0c577b31af733b8c4b05bcded1912bd
3
+Subject: What's cooking in git.git (Jun 2014, #03; Tue, 10)
4
+X-master-at: 50f84e34a1b0bb893327043cb0c491e02ced9ff5
5
+X-next-at: 8cd8cf873f2edce97930416c82a1a2213d488ee4
6
7
-What's cooking in git.git (Jun 2014, #02; Fri, 6)
7
+What's cooking in git.git (Jun 2014, #03; Tue, 10)
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 batch of topics, all of which have been cooking for quite
15
-a while on the 'next' branch, have been merged to 'master'.
16
-
17
-I am aware of a handful of multi-patch topics sent to the list the
18
-past week that have not been picked up, and I won't be picking them
19
-up yet, before we have a chance to first have some topics that have
20
-been cooking in 'next' during the previous cycle merged to 'master'
21
-and then rewind the tip of 'next'. At that point, I may have to ask
22
-for them to be rebased on top of the updated 'master' to reduce
23
-conflicts. Thanks for your patience.
14
+The tip of 'next' has been rewound. I originally wanted to eject
15
+many younger topics and slim the branch down, but decided against
16
+it.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
@@ -30,295 +23,312 @@ of the repositories listed at
23
--------------------------------------------------
24
[Graduated to "master"]
25
33
-* bc/blame-crlf-test (2014-05-08) 1 commit
34
- (merged to 'next' on 2014-05-14 at b819505)
35
- + blame: correctly handle files regardless of autocrlf
36
-
37
- If a file contained CRLF line endings in a repository with
38
- core.autocrlf=input, then blame always marked lines as "Not
39
- Committed Yet", even if they were unmodified.
40
-
41
-
42
-* da/imap-send-use-credential-helper (2014-04-29) 1 commit
43
- (merged to 'next' on 2014-05-12 at b0698a5)
44
- + imap-send: use git-credential
45
-
46
- "git imap-send" learned to ask the credential helper for
47
- authentication material.
48
-
49
-
50
-* dk/blame-reorg (2014-04-28) 1 commit
51
- (merged to 'next' on 2014-05-14 at 354a0e3)
52
- + blame: large-scale performance rewrite
53
-
54
- "git blame" has been optimized greatly by reorganising the data
55
- structure that is used to keep track of the work to be done, thanks
56
- to David Karstrup <dak@gnu.org>.
57
-
58
-
59
-* dk/raise-core-deltabasecachelimit (2014-05-06) 1 commit
60
- (merged to 'next' on 2014-05-12 at 97ec92a)
61
- + Bump core.deltaBaseCacheLimit to 96m
62
-
63
- The `core.deltabasecachelimit` used to default to 16 MiB, but this
64
- proved to be too small, and has been bumped to 96 MiB.
65
-
66
-
67
-* dt/merge-recursive-case-insensitive (2014-05-08) 2 commits
68
- (merged to 'next' on 2014-05-12 at 820d524)
69
- + mv: allow renaming to fix case on case insensitive filesystems
70
- + merge-recursive.c: fix case-changing merge bug
71
-
72
- On a case insensitive filesystem, merge-recursive incorrectly
73
- deleted the file that is to be renamed to a name that is the same
74
- except for case differences.
75
-
76
-
77
-* ep/shell-assign-and-export-vars (2014-05-23) 2 commits
78
- (merged to 'next' on 2014-05-23 at 7699c0e)
79
- + scripts: more "export VAR=VALUE" fixes
80
- + scripts: "export VAR=VALUE" construct is not portable
81
-
82
-
83
-* fc/status-printf-squelch-format-zero-length-warnings (2014-05-07) 1 commit
84
- (merged to 'next' on 2014-05-12 at 6b04e23)
85
- + silence a bunch of format-zero-length warnings
86
-
87
-
88
-* jc/coding-guidelines (2014-05-20) 9 commits
89
- (merged to 'next' on 2014-05-23 at bb351fc)
90
- + CodingGuidelines: avoid "test <cond> -a/-o <cond>"
91
- (merged to 'next' on 2014-05-12 at e1fcf62)
92
- + CodingGuidelines: on splitting a long line
93
- + CodingGuidelines: on comparison
94
- + CodingGuidelines: do not call the conditional statement "if()"
95
- + CodingGuidelines: give an example for shell function preamble
96
- + CodingGuidelines: give an example for control statements
97
- + CodingGuidelines: give an example for redirection
98
- + CodingGuidelines: give an example for case/esac statement
99
- + CodingGuidelines: once it is in, it is not worth the code churn
100
-
101
- Some people need these things spelled out, unable to follow advices
102
- given by others when they fail to imitate the surrounding existing
103
- code.
104
-
105
-
106
-* jd/subtree (2014-05-13) 6 commits
107
- (merged to 'next' on 2014-05-14 at 977db74)
108
- + contrib/subtree: allow adding an annotated tag
109
- (merged to 'next' on 2014-05-07 at 81b375d)
110
- + contrib/subtree/Makefile: clean up rule for "clean"
111
- + contrib/subtree/Makefile: clean up rules to generate documentation
112
- + contrib/subtree/Makefile: s/libexecdir/gitexecdir/
113
- + contrib/subtree/Makefile: use GIT-VERSION-FILE
114
- + contrib/subtree/Makefile: scrap unused $(gitdir)
115
-
116
- Clean-up build procedure of subtree in contrib/.
26
+* jc/rev-parse-argh-dashed-multi-words (2014-06-04) 1 commit
27
+ (merged to 'next' on 2014-06-06 at 8b04440)
28
+ + update-index: fix segfault with missing --cacheinfo argument
29
30
+ "update-index --cacheinfo" in 2.0 crashes on a malformed command line.
31
119
-* je/pager-do-not-recurse (2014-04-28) 1 commit
120
- (merged to 'next' on 2014-05-12 at 32de470)
121
- + pager: do allow spawning pager recursively
32
123
- We used to unconditionally disable the pager in the pager process
124
- we spawn to feed out output, but that prevented people who want to
125
- run "less" within "less" from doing so.
33
+* jc/shortlog-ref-exclude (2014-06-04) 1 commit
34
+ (merged to 'next' on 2014-06-06 at a358cbe)
35
+ + shortlog: allow --exclude=<glob> to be passed
36
37
+ "shortlog --opts and args" and "log --opts and args | shortlog"
38
+ should be equivalent, but the former did not grok some options.
39
128
-* jj/command-line-adjective (2014-05-21) 1 commit
129
- (merged to 'next' on 2014-05-23 at fe136c8)
130
- + Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
40
41
+* lt/request-pull (2014-06-02) 1 commit
42
+ (merged to 'next' on 2014-06-06 at ad4d79d)
43
+ + fix brown paper bag breakage in t5150-request-pull.sh
44
133
-* jk/commit-C-pick-empty (2014-04-28) 1 commit
134
- (merged to 'next' on 2014-05-12 at c187e1e)
135
- + commit: do not complain of empty messages from -C
45
137
- "git commit --allow-empty-message -C $commit" did not work when the
138
- commit did not have any log message.
46
+* mn/sideband-no-ansi (2014-06-02) 1 commit
47
+ (merged to 'next' on 2014-06-06 at f61fc73)
48
+ + sideband.c: do not use ANSI control sequence on non-terminal
49
50
141
-* jk/grep-tell-run-command-to-cd-when-running-pager (2014-05-07) 1 commit
142
- (merged to 'next' on 2014-05-12 at 065cb22)
143
- + grep: use run-command's "dir" option for --open-files-in-pager
51
+* na/no-http-test-in-the-middle (2014-05-30) 1 commit
52
+ (merged to 'next' on 2014-06-06 at e195615)
53
+ + t5538: move http push tests out to t5542
54
55
146
-* jk/index-pack-report-missing (2014-05-12) 1 commit
147
- (merged to 'next' on 2014-05-14 at 72d40e1)
148
- + index-pack: distinguish missing objects from type errors
56
+* pb/trim-trailing-spaces (2014-06-02) 1 commit
57
+ (merged to 'next' on 2014-06-06 at 741efc2)
58
+ + dir.c:trim_trailing_spaces(): fix for " \ " sequence
59
60
+ Fix an error in parsing of .gitignore files that use a trailing
61
+ "\ " to mark pathnames that end with a SP.
62
151
-* jk/squelch-compiler-warning-from-funny-error-macro (2014-05-06) 2 commits
152
- (merged to 'next' on 2014-05-12 at d9daf8d)
153
- + let clang use the constant-return error() macro
154
- + inline constant return from error() function
63
64
+* rs/mailinfo-header-cmp (2014-06-02) 1 commit
65
+ (merged to 'next' on 2014-06-06 at 5e856f4)
66
+ + mailinfo: use strcmp() for string comparison
67
157
-* jk/utf8-switch-between-nfd-and-nfc (2014-04-29) 1 commit
158
- (merged to 'next' on 2014-05-12 at 948823c)
159
- + t3910: show failure of core.precomposeunicode with decomposed filenames
68
+ Avoid running over the end of header string while parsing an
69
+ incoming e-mail message to extract the patch.
70
161
- Document a known breakage with a test.
71
+--------------------------------------------------
72
+[New Topics]
73
74
+* ep/avoid-test-a-o (2014-06-10) 21 commits
75
+ - git-submodule.sh: avoid "echo" path-like values
76
+ - SQUASH: misconversion breakage fix
77
+ - git-submodule.sh: avoid "test <cond> -a/-o <cond>"
78
+ - t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"
79
+ - t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"
80
+ - t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"
81
+ - t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"
82
+ - t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"
83
+ - t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"
84
+ - t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"
85
+ - t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"
86
+ - t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"
87
+ - git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"
88
+ - git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
89
+ - git-bisect.sh: avoid "test <cond> -a/-o <cond>"
90
+ - contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"
91
+ - contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"
92
+ - contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"
93
+ - contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"
94
+ - contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"
95
+ - check_bindir: avoid "test <cond> -a/-o <cond>"
96
+
97
+
98
+* jc/revision-dash-count-parsing (2014-06-09) 1 commit
99
+ (merged to 'next' on 2014-06-10 at 1aeca19)
100
+ + revision: parse "git log -<count>" more carefully
101
+
102
+ "git log -2master" is a common typo that shows two commits starting
103
+ from whichever random branch that is not 'master' that happens to
104
+ be checked out currently.
105
164
-* jn/contrib-remove-diffall (2014-05-09) 1 commit
165
- (merged to 'next' on 2014-05-12 at 416009e)
166
- + contrib: remove git-diffall
106
+ Will merge to 'master'.
107
168
- Spring cleaning of contrib/.
108
109
+* jc/test-lazy-prereq (2014-06-09) 7 commits
110
+ - tests: drop GIT_*_TIMING_TESTS environment variable support
111
+ (merged to 'next' on 2014-06-10 at 4f774f7)
112
+ + t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
113
+ + t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
114
+ + t3302: do not chdir around in the primary test process
115
+ + t3302: coding style updates
116
+ + test: turn USR_BIN_TIME into a lazy prerequisite
117
+ + test: turn EXPENSIVE into a lazy prerequisite
118
+
119
+ Test-script clean-up. The last step might be controversial.
120
+
121
+ Will merge to 'master' except for the last one.
122
+
123
+
124
+* jk/commit-buffer-length (2014-06-10) 16 commits
125
+ - SQUASH to 12/15???
126
+ - commit: record buffer length in cache
127
+ - commit: convert commit->buffer to a slab
128
+ - commit-slab: provide a static initializer
129
+ - use get_commit_buffer everywhere
130
+ - convert logmsg_reencode to get_commit_buffer
131
+ - use get_commit_buffer to avoid duplicate code
132
+ - use get_cached_commit_buffer where appropriate
133
+ - provide helpers to access the commit buffer
134
+ - provide a helper to set the commit buffer
135
+ - provide a helper to free commit buffer
136
+ - sequencer: use logmsg_reencode in get_message
137
+ - logmsg_reencode: return const buffer
138
+ - do not create "struct commit" with xcalloc
139
+ - commit: push commit_index update into alloc_commit_node
140
+ - alloc: include any-object allocations in alloc_report
141
171
-* jn/contrib-remove-vim (2014-05-09) 1 commit
172
- (merged to 'next' on 2014-05-12 at 9e727c8)
173
- + contrib: remove vim support instructions
142
+ Expecting a reroll.
143
175
- Spring cleaning of contrib/.
144
145
+* jm/api-strbuf-doc (2014-06-09) 1 commit
146
+ (merged to 'next' on 2014-06-10 at 831aa30)
147
+ + api-strbuf.txt minor typos
148
178
-* jn/test-lint-unmoor (2014-05-23) 1 commit
179
- (merged to 'next' on 2014-05-23 at aa997bc)
180
- + test-lint: find unportable sed, echo, test, and export usage after &&
149
+ Will merge to 'master'.
150
151
183
-* mc/git-p4-prepare-p4-only (2014-05-27) 1 commit
184
- (merged to 'next' on 2014-05-27 at 71572fe)
185
- + git-p4: Do not include diff in spec file when just preparing p4
152
+* rs/more-starts-with (2014-06-09) 1 commit
153
+ (merged to 'next' on 2014-06-10 at efcd02e)
154
+ + Use starts_with() for C strings instead of memcmp()
155
156
+ Will merge to 'master'.
157
188
-* mk/show-s-no-extra-blank-line-for-merges (2014-05-15) 1 commit
189
- (merged to 'next' on 2014-05-21 at 3b98b35)
190
- + git-show: fix 'git show -s' to not add extra terminator after merge commit
158
192
- "git show -s" (i.e. show log message only) used to incorrectly emit
193
- an extra blank line after a merge commit.
159
+* sk/mingw-dirent (2014-06-09) 5 commits
160
+ - Win32 dirent: improve dirent implementation
161
+ - Win32 dirent: clarify #include directives
162
+ - Win32 dirent: change FILENAME_MAX to MAX_PATH
163
+ - Win32 dirent: remove unused dirent.d_reclen member
164
+ - Win32 dirent: remove unused dirent.d_ino member
165
166
196
-* mm/pager-less-sans-S (2014-05-07) 1 commit
197
- (merged to 'next' on 2014-05-07 at 66ce999)
198
- + pager: remove 'S' from $LESS by default
167
+* sk/mingw-main (2014-06-10) 2 commits
168
+ - mingw: avoid const warning
169
+ - Win32: move main macro to a function
170
+ (this branch is used by sk/mingw-uni-console; uses sk/windows-unc-path.)
171
200
- Since the very beginning of Git, we gave the LESS environment a
201
- default value "FRSX" when we spawn "less" as the pager. "S" (chop
202
- long lines instead of wrapping) has been removed from this default
203
- set of options, because it is more or less a personal taste thing,
204
- as opposed to others that have good justifications (i.e. "R" is
205
- very much justified because many kinds of output we produce are
206
- colored and "FX" is justified because output we produce is often
207
- shorter than a page).
172
173
+* sk/mingw-uni-console (2014-06-10) 6 commits
174
+ - Win32: fix broken pipe detection
175
+ - Win32: Thread-safe windows console output
176
+ - Win32: add Unicode conversion functions
177
+ - Win32: warn if the console font doesn't support Unicode
178
+ - Win32: detect console streams more reliably
179
+ - Win32: support Unicode console output
180
+ (this branch uses sk/mingw-main and sk/windows-unc-path.)
181
210
-* mt/rebase-i-keep-empty-test (2014-05-19) 1 commit
211
- (merged to 'next' on 2014-05-21 at d87d266)
212
- + rebase --keep-empty -i: add test
182
+ Could somebody from the mingw land double check that I queued the
183
+ right versions for the above three, as there were many iterations
184
+ and I wasn't paying attention.
185
186
+ After that will merge to 'next' and to 'master'.
187
215
-* nd/status-auto-comment-char (2014-05-19) 2 commits
216
- (merged to 'next' on 2014-05-21 at f762e62)
217
- + commit: allow core.commentChar=auto for character auto selection
218
- + config: be strict on core.commentChar
188
220
- The `core.commentChar` configuration variable is used to specify a
221
- custom comment character other than the default "#" to be used in
222
- the commit log editor. This can be set to `auto` to attempt to
223
- choose a different character that does not conflict with what
224
- already starts a line in the message being edited for cases like
225
- "git commit --amend".
189
+* tb/t5551-clone-notice-to-stderr (2014-06-09) 1 commit
190
+ (merged to 'next' on 2014-06-10 at 374082c)
191
+ + t5551: fix the 50,000 tag test
192
193
+ Will merge to 'master'.
194
228
-* rs/reflog-exists (2014-05-08) 2 commits
229
- (merged to 'next' on 2014-05-12 at 24a1d01)
230
- + checkout.c: use ref_exists instead of file_exist
231
- + refs.c: add new functions reflog_exists and delete_reflog
195
196
+* jk/repack-pack-keep-objects (2014-06-10) 3 commits
197
+ - repack: s/write_bitmap/&s/ in code
198
+ - repack: respect pack.writebitmaps
199
+ - repack: do not accidentally pack kept objects by default
200
+ (this branch is used by jk/repack-pack-writebitmaps-config.)
201
234
-* sk/spawn-less-case-insensitively-from-grep-O-i (2014-05-15) 1 commit
235
- (merged to 'next' on 2014-05-21 at eb28305)
236
- + git grep -O -i: if the pager is 'less', pass the '-I' option
202
+ Will merge to 'next'.
203
238
- "git grep -O" to show the lines that hit in the pager did not work
239
- well with case insensitive search. We now spawn "less" with its
240
- "-I" option when it is used as the pager (which is the default).
204
205
+* jk/repack-pack-writebitmaps-config (2014-06-10) 3 commits
206
+ - repack: introduce repack.writeBitmaps config option
207
+ - repack: simplify handling of --write-bitmap-index
208
+ - pack-objects: stop respecting pack.writebitmaps
209
+ (this branch uses jk/repack-pack-keep-objects.)
210
243
-* sk/submodules-absolute-path-on-windows (2014-05-08) 1 commit
244
- (merged to 'next' on 2014-05-14 at 83a05d9)
245
- + Revert "submodules: fix ambiguous absolute paths under Windows"
211
+ Will merge to 'next'.
212
213
248
-* ss/howto-manage-trunk (2014-05-28) 1 commit
249
- (merged to 'next' on 2014-05-28 at 5318336)
250
- + How to keep a project's canonical history correct.
214
+* mg/verify-commit (2014-06-10) 3 commits
215
+ - verify-commit: scriptable commit signature verification
216
+ - gpg-interface: provide access to the payload
217
+ - pretty: free the gpg status buf
218
219
+ Will merge to 'next'.
220
253
-* tb/unicode-6.3-zero-width (2014-05-12) 2 commits
254
- (merged to 'next' on 2014-05-14 at 08e0171)
255
- + utf8: make it easier to auto-update git_wcwidth()
256
- + utf8.c: use a table for double_width
221
258
- Update the logic to compute the display width needed for utf8
259
- strings and allow us to more easily maintain the tables used in
260
- that logic.
222
+* nd/init-restore-env (2014-06-10) 1 commit
223
+ - git potty: restore environments after alias expansion
224
262
- We may want to let the users choose if codepoints with ambiguous
263
- widths are treated as a double or single width in a follow-up patch.
225
+ Will merge to 'next'.
226
227
+--------------------------------------------------
228
+[Stalled]
229
266
-* tg/tag-state-tag-name-in-editor-hints (2014-05-07) 1 commit
267
- (merged to 'next' on 2014-05-12 at 0b7db32)
268
- + builtin/tag.c: show tag name to hint in the message editor
230
+* nd/split-index (2014-06-02) 34 commits
231
+ - fixup! read-cache: new API write_locked_index instead of write_index/write_cache
232
+ - SQUASH???
233
+ - t1700: new tests for split-index mode
234
+ - t2104: make sure split index mode is off for the version test
235
+ - read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
236
+ - read-tree: note about dropping split-index mode or index version
237
+ - read-tree: force split-index mode off on --index-output
238
+ - rev-parse: add --shared-index-path to get shared index path
239
+ - update-index --split-index: do not split if $GIT_DIR is read only
240
+ - update-index: new options to enable/disable split index mode
241
+ - split-index: strip pathname of on-disk replaced entries
242
+ - split-index: do not invalidate cache-tree at read time
243
+ - split-index: the reading part
244
+ - split-index: the writing part
245
+ - read-cache: mark updated entries for split index
246
+ - read-cache: save deleted entries in split index
247
+ - read-cache: mark new entries for split index
248
+ - read-cache: split-index mode
249
+ - read-cache: save index SHA-1 after reading
250
+ - entry.c: update cache_changed if refresh_cache is set in checkout_entry()
251
+ - cache-tree: mark istate->cache_changed on prime_cache_tree()
252
+ - cache-tree: mark istate->cache_changed on cache tree update
253
+ - cache-tree: mark istate->cache_changed on cache tree invalidation
254
+ - unpack-trees: be specific what part of the index has changed
255
+ - resolve-undo: be specific what part of the index has changed
256
+ - update-index: be specific what part of the index has changed
257
+ - read-cache: be specific what part of the index has changed
258
+ - read-cache: be strict about "changed" in remove_marked_cache_entries()
259
+ - read-cache: store in-memory flags in the first 12 bits of ce_flags
260
+ - read-cache: relocate and unexport commit_locked_index()
261
+ - read-cache: new API write_locked_index instead of write_index/write_cache
262
+ - sequencer: do not update/refresh index if the lock cannot be held
263
+ - ewah: delete unused ewah_read_mmap_native declaration
264
+ - ewah: fix constness of ewah_read_mmap
265
270
- "git tag" when editing the tag message shows the name of the tag
271
- being edited as a comment in the editor.
266
+ The tip two remind us the need for a minor reroll. If I find time
267
+ I could try to squash them myself, but it is low priority for me.
268
269
274
-* tl/relax-in-poll-emulation (2014-04-29) 1 commit
275
- (merged to 'next' on 2014-05-12 at 9369b08)
276
- + compat/poll: sleep 1 millisecond to avoid busy wait
270
+* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
271
+ - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
272
+ - git-add--interactive: Preserve diff heading when splitting hunks
273
274
+ Waiting for a reroll.
275
279
-* wg/svn-fe-style-fixes (2014-05-12) 1 commit
280
- (merged to 'next' on 2014-05-12 at 88c0e0d)
281
- + svn-fe: conform to pep8
276
277
+* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
278
+ - gitweb: Harden UTF-8 handling in generated links
279
284
-* wk/doc-clarify-upstream (2014-05-13) 1 commit
285
- (merged to 'next' on 2014-05-14 at 6c8fb52)
286
- + Documentation: mention config sources for @{upstream}
280
+ $gmane/250758?
281
288
---------------------------------------------------
289
-[New Topics]
282
291
-* jc/rev-parse-argh-dashed-multi-words (2014-06-04) 1 commit
292
- (merged to 'next' on 2014-06-06 at 8b04440)
293
- + update-index: fix segfault with missing --cacheinfo argument
283
+* rh/prompt-tests (2014-06-05) 11 commits
284
+ - t9904: new __git_ps1 tests for Zsh
285
+ - test-lib: make it possible to override how test code is eval'd
286
+ - lib-prompt-tests.sh: add variable for string that encodes percent in PS1
287
+ - lib-prompt-tests.sh: put all tests inside a function
288
+ - t9903: move prompt tests to a new lib-prompt-tests.sh file
289
+ - t9903: move PS1 color code variable definitions to lib-bash.sh
290
+ - t9903: include "Bash" in test names via new $shellname var
291
+ - t9903: run pc mode tests again with PS1 expansion disabled
292
+ - t9903: move test name prefix to a separate variable
293
+ - t9903: put the Bash pc mode prompt test cases in a function
294
+ - t9903: remove Zsh test from the suite of Bash prompt tests
295
295
- "update-index --cacheinfo" in 2.0 crashes on a malformed command line.
296
+ Expecting a reroll to limit the damage to test_eval_; also reported
297
+ to be broken with older zsh that are still in the field ($gmane/251231).
298
297
- Will merge to 'master'.
299
300
+* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
301
+ - userdiff: support Java try keyword
302
+ - userdiff: support C# async methods and correct C# keywords
303
300
-* sk/test-cmp-bin (2014-06-04) 1 commit
301
- (merged to 'next' on 2014-06-06 at 112ae4b)
302
- + t5000, t5003: do not use test_cmp to compare binary files
304
+ Reviews sent; waiting for a response.
305
304
- Will merge to 'master'.
306
307
+* cc/interpret-trailers (2014-05-28) 11 commits
308
+ - Documentation: add documentation for 'git interpret-trailers'
309
+ - trailer: add tests for commands in config file
310
+ - trailer: execute command from 'trailer.<name>.command'
311
+ - trailer: add tests for "git interpret-trailers"
312
+ - trailer: add interpret-trailers command
313
+ - trailer: put all the processing together and print
314
+ - trailer: parse trailers from file or stdin
315
+ - trailer: process command line trailer arguments
316
+ - trailer: read and process config information
317
+ - trailer: process trailers from input message and arguments
318
+ - trailer: add data structures and basic functions
319
307
-* dt/refs-check-refname-component-optim (2014-06-05) 1 commit
308
- (merged to 'next' on 2014-06-06 at e85fb57)
309
- + refs.c: optimize check_refname_component()
320
+ A new filter to programatically edit the tail end of the commit log
321
+ messages.
322
311
- Will merge to 'master'.
323
+ What is the status of this one? I think I saw reviews by Michael
324
+ but after that I do not recall seeing any updates.
325
326
314
-* jm/dedup-test-config (2014-06-05) 1 commit
315
- (merged to 'next' on 2014-06-06 at 443f096)
316
- + t/t7810-grep.sh: remove duplicate test_config()
327
+* jh/submodule-tests (2014-04-17) 1 commit
328
+ - t7410: 210 tests for various 'git submodule update' scenarios
329
318
- Will merge to 'master'.
330
+ More or less abandoned. Will drop.
331
320
---------------------------------------------------
321
-[Stalled]
332
333
* nd/multiple-work-trees (2014-03-25) 28 commits
334
- count-objects: report unused files in $GIT_DIR/repos/...
@@ -491,8 +501,6 @@ of the repositories listed at
501
rerolled not to squat on @{p} which @{push} and possibly @{pull}
502
may want to share.
503
494
- Ejected from 'pu' to unclutter.
495
-
504
505
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
506
- merge: drop unused arg from abort_commit method signature
@@ -563,11 +571,41 @@ of the repositories listed at
571
--------------------------------------------------
572
[Cooking]
573
574
+* sk/test-cmp-bin (2014-06-04) 1 commit
575
+ (merged to 'next' on 2014-06-10 at 020a475)
576
+ + t5000, t5003: do not use test_cmp to compare binary files
577
+
578
+ Originally merged to 'next' on 2014-06-06
579
+
580
+ Will merge to 'master'.
581
+
582
+
583
+* dt/refs-check-refname-component-optim (2014-06-05) 1 commit
584
+ (merged to 'next' on 2014-06-10 at 4560669)
585
+ + refs.c: optimize check_refname_component()
586
+ (this branch is used by dt/refs-check-refname-component-sse42.)
587
+
588
+ Originally merged to 'next' on 2014-06-06
589
+
590
+ Will merge to 'master'.
591
+
592
+
593
+* jm/dedup-test-config (2014-06-05) 1 commit
594
+ (merged to 'next' on 2014-06-10 at 8966f54)
595
+ + t/t7810-grep.sh: remove duplicate test_config()
596
+
597
+ Originally merged to 'next' on 2014-06-06
598
+
599
+ Will merge to 'master'.
600
+
601
+
602
* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
567
- (merged to 'next' on 2014-06-06 at a2d0105)
603
+ (merged to 'next' on 2014-06-10 at fc63847)
604
+ commit -m: commit staged submodules regardless of ignore config
605
+ status/commit: show staged submodules regardless of ignore config
606
607
+ Originally merged to 'next' on 2014-06-06
608
+
609
submodule.*.ignore and diff.ignoresubmodules are used to ignore all
610
submodule changes in "diff" output, but it can be confusing to
611
apply these configuration values to status and commit.
@@ -593,7 +631,7 @@ of the repositories listed at
631
632
633
* bg/xcalloc-nmemb-then-size (2014-05-27) 12 commits
596
- (merged to 'next' on 2014-06-06 at 7058fe5)
634
+ (merged to 'next' on 2014-06-10 at eddb5bc)
635
+ transport-helper.c: rearrange xcalloc arguments
636
+ remote.c: rearrange xcalloc arguments
637
+ reflog-walk.c: rearrange xcalloc arguments
@@ -607,16 +645,20 @@ of the repositories listed at
645
+ builtin/remote.c: rearrange xcalloc arguments
646
+ builtin/ls-remote.c: rearrange xcalloc arguments
647
648
+ Originally merged to 'next' on 2014-06-06
649
+
650
Like calloc(3), xcalloc() takes nmemb and then size.
651
652
Will merge to 'master'.
653
654
655
* jk/complete-merge-pull (2014-05-27) 2 commits
616
- (merged to 'next' on 2014-06-06 at f88b8e3)
656
+ (merged to 'next' on 2014-06-10 at d1524c5)
657
+ completion: add missing options for git-merge
658
+ completion: add a note that merge options are shared
659
660
+ Originally merged to 'next' on 2014-06-06
661
+
662
The completion code did not know about quite a few options that are
663
common between "git merge" and "git pull", and a couple of options
664
unique to "git merge".
@@ -625,11 +667,13 @@ of the repositories listed at
667
668
669
* jl/remote-rm-prune (2014-05-27) 3 commits
628
- (merged to 'next' on 2014-06-06 at d3bde27)
670
+ (merged to 'next' on 2014-06-10 at 13259ff)
671
+ remote prune: optimize "dangling symref" check/warning
672
+ remote: repack packed-refs once when deleting multiple refs
673
+ remote rm: delete remote configuration as the last
674
675
+ Originally merged to 'next' on 2014-06-06
676
+
677
"git remote rm" and "git remote prune" can involve removing many
678
refs at once, which is not a very efficient thing to do when very
679
many refs exist in the packed-refs file.
@@ -638,23 +682,29 @@ of the repositories listed at
682
683
684
* jm/instaweb-apache-24 (2014-05-27) 1 commit
641
- (merged to 'next' on 2014-06-06 at ab6e494)
685
+ (merged to 'next' on 2014-06-10 at ecf2048)
686
+ git-instaweb: add support for Apache 2.4
687
688
+ Originally merged to 'next' on 2014-06-06
689
+
690
Will merge to 'master'.
691
692
693
* jm/t9138-style-fix (2014-05-27) 1 commit
648
- (merged to 'next' on 2014-06-06 at 552098b)
694
+ (merged to 'next' on 2014-06-10 at 034f13d)
695
+ t9138-git-svn-authors-prog.sh fixups
696
697
+ Originally merged to 'next' on 2014-06-06
698
+
699
Will merge to 'master'.
700
701
702
* nd/daemonize-gc (2014-05-27) 1 commit
655
- (merged to 'next' on 2014-06-06 at 638c6ca)
703
+ (merged to 'next' on 2014-06-10 at 6fae7b0)
704
+ gc --auto: do not lock refs in the background
705
706
+ Originally merged to 'next' on 2014-06-06
707
+
708
"git gc --auto" was recently changed to run in the background to
709
give control back early to the end-user sitting in front of the
710
terminal, but it forgot that housekeeping involving reflogs should
@@ -664,173 +714,119 @@ of the repositories listed at
714
715
716
* ow/config-mailmap-pathname (2014-05-27) 1 commit
667
- (merged to 'next' on 2014-06-06 at a686803)
717
+ (merged to 'next' on 2014-06-10 at aba4ca2)
718
+ config: respect '~' and '~user' in mailmap.file
719
720
+ Originally merged to 'next' on 2014-06-06
721
+
722
mailmap.file configuration names a pathname, hence should honor
723
~/path and ~user/path as its value.
724
725
Will merge to 'master'.
726
727
676
-* rh/prompt-tests (2014-06-05) 11 commits
677
- - t9904: new __git_ps1 tests for Zsh
678
- - test-lib: make it possible to override how test code is eval'd
679
- - lib-prompt-tests.sh: add variable for string that encodes percent in PS1
680
- - lib-prompt-tests.sh: put all tests inside a function
681
- - t9903: move prompt tests to a new lib-prompt-tests.sh file
682
- - t9903: move PS1 color code variable definitions to lib-bash.sh
683
- - t9903: include "Bash" in test names via new $shellname var
684
- - t9903: run pc mode tests again with PS1 expansion disabled
685
- - t9903: move test name prefix to a separate variable
686
- - t9903: put the Bash pc mode prompt test cases in a function
687
- - t9903: remove Zsh test from the suite of Bash prompt tests
688
-
689
- Maybe a reroll to limit the damage to test_eval_ is coming?
690
-
691
-
728
* jm/doc-wording-tweaks (2014-05-28) 1 commit
693
- (merged to 'next' on 2014-06-06 at 4dca23e)
729
+ (merged to 'next' on 2014-06-10 at 5f2e094)
730
+ Documentation: wording fixes in the user manual and glossary
731
696
- Will merge to 'master'.
697
-
698
-
699
-* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
700
- - gitweb: Harden UTF-8 handling in generated links
701
-
702
- $gmane/250758?
703
-
704
-
705
-* mn/sideband-no-ansi (2014-06-02) 1 commit
706
- (merged to 'next' on 2014-06-06 at f61fc73)
707
- + sideband.c: do not use ANSI control sequence on non-terminal
732
+ Originally merged to 'next' on 2014-06-06
733
734
Will merge to 'master'.
735
736
737
* jc/fetch-push-refmap (2014-06-05) 9 commits
713
- - fetch: allow explicit --refmap to override configuration
714
- - fetch doc: add a section on configured remote-tracking branches
715
- - fetch doc: remove "short-cut" section
716
- - fetch doc: update refspec format description
717
- - fetch doc: on pulling multiple refspecs
718
- - fetch doc: remove notes on outdated "mixed layout"
719
- - fetch doc: update note on '+' in front of the refspec
720
- - fetch doc: move FETCH_HEAD material lower and add an example
721
- - fetch doc: update introductory part for clarity
722
-
723
- Will merge to 'next'.
724
-
725
-
726
-* jc/shortlog-ref-exclude (2014-06-04) 1 commit
727
- (merged to 'next' on 2014-06-06 at a358cbe)
728
- + shortlog: allow --exclude=<glob> to be passed
738
+ (merged to 'next' on 2014-06-10 at 13c13ae)
739
+ + fetch: allow explicit --refmap to override configuration
740
+ + fetch doc: add a section on configured remote-tracking branches
741
+ + fetch doc: remove "short-cut" section
742
+ + fetch doc: update refspec format description
743
+ + fetch doc: on pulling multiple refspecs
744
+ + fetch doc: remove notes on outdated "mixed layout"
745
+ + fetch doc: update note on '+' in front of the refspec
746
+ + fetch doc: move FETCH_HEAD material lower and add an example
747
+ + fetch doc: update introductory part for clarity
748
749
Will merge to 'master'.
750
751
752
* lt/log-auto-decorate (2014-05-30) 1 commit
734
- (merged to 'next' on 2014-06-06 at d451fc1)
753
+ (merged to 'next' on 2014-06-10 at f149f4a)
754
+ git log: support "auto" decorations
755
737
- Will merge to 'master'.
738
-
739
-
740
-* lt/request-pull (2014-06-02) 1 commit
741
- (merged to 'next' on 2014-06-06 at ad4d79d)
742
- + fix brown paper bag breakage in t5150-request-pull.sh
743
-
744
- Will merge to 'master'.
745
-
746
-
747
-* na/no-http-test-in-the-middle (2014-05-30) 1 commit
748
- (merged to 'next' on 2014-06-06 at e195615)
749
- + t5538: move http push tests out to t5542
750
-
751
- Will merge to 'master'.
752
-
753
-
754
-* pb/trim-trailing-spaces (2014-06-02) 1 commit
755
- (merged to 'next' on 2014-06-06 at 741efc2)
756
- + dir.c:trim_trailing_spaces(): fix for " \ " sequence
757
-
758
- Fix an error in parsing of .gitignore files that use a trailing
759
- "\ " to mark pathnames that end with a SP.
760
-
761
- Will merge to 'master'.
762
-
763
-
764
-* rs/mailinfo-header-cmp (2014-06-02) 1 commit
765
- (merged to 'next' on 2014-06-06 at 5e856f4)
766
- + mailinfo: use strcmp() for string comparison
767
-
768
- Avoid running over the end of header string while parsing an
769
- incoming e-mail message to extract the patch.
756
+ Originally merged to 'next' on 2014-06-06
757
758
Will merge to 'master'.
759
760
761
* rs/pack-objects-no-unnecessary-realloc (2014-06-02) 1 commit
775
- (merged to 'next' on 2014-06-06 at a39f7ad)
762
+ (merged to 'next' on 2014-06-10 at abae695)
763
+ pack-objects: use free()+xcalloc() instead of xrealloc()+memset()
764
765
+ Originally merged to 'next' on 2014-06-06
766
+
767
Avoid unnecessary copy of previous contents when extending the
768
hashtable used in pack-objects.
769
770
Will merge to 'master'.
771
772
784
-* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
785
- - userdiff: support Java try keyword
786
- - userdiff: support C# async methods and correct C# keywords
787
-
788
-
773
* jk/error-resolve-conflict-advice (2014-06-03) 2 commits
790
- (merged to 'next' on 2014-06-06 at f2e7bbf)
774
+ (merged to 'next' on 2014-06-10 at 713ebe0)
775
+ error_resolve_conflict: drop quotations around operation
776
+ error_resolve_conflict: rewrap advice message
777
778
+ Originally merged to 'next' on 2014-06-06
779
+
780
Will merge to 'master'.
781
782
783
* rs/read-ref-at (2014-06-03) 1 commit
798
- (merged to 'next' on 2014-06-06 at 30f9896)
784
+ (merged to 'next' on 2014-06-10 at f58f2fc)
785
+ refs.c: change read_ref_at to use the reflog iterators
786
787
+ Originally merged to 'next' on 2014-06-06
788
+
789
Will merge to 'master'.
790
791
792
* sh/enable-preloadindex (2014-06-03) 1 commit
805
- (merged to 'next' on 2014-06-06 at 0f0d7da)
793
+ (merged to 'next' on 2014-06-10 at 7cedf2d)
794
+ environment.c: enable core.preloadindex by default
795
796
+ Originally merged to 'next' on 2014-06-06
797
+
798
Will merge to 'master'.
799
800
801
* ta/string-list-init (2014-06-06) 1 commit
812
- (merged to 'next' on 2014-06-06 at f0f2abc)
802
+ (merged to 'next' on 2014-06-10 at bf209ff)
803
+ string-list: spell all values out that are given to a string_list initializer
804
805
+ Originally merged to 'next' on 2014-06-06
806
+
807
Will merge to 'master'.
808
809
810
* jk/daemon-tolower (2014-05-23) 1 commit
819
- (merged to 'next' on 2014-05-23 at 23c796d)
811
+ (merged to 'next' on 2014-06-10 at f3c549d)
812
+ daemon/config: factor out duplicate xstrdup_tolower
813
814
+ Originally merged to 'next' on 2014-05-23
815
+
816
Will merge to 'master'.
817
818
819
* jk/strbuf-tolower (2014-05-23) 1 commit
826
- (merged to 'next' on 2014-05-23 at b172137)
820
+ (merged to 'next' on 2014-06-10 at 01e6983)
821
+ strbuf: add strbuf_tolower function
822
823
+ Originally merged to 'next' on 2014-05-23
824
+
825
Will merge to 'master'.
826
827
828
* jk/http-errors (2014-05-27) 8 commits
833
- (merged to 'next' on 2014-06-06 at 1004dae)
829
+ (merged to 'next' on 2014-06-10 at 30e9212)
830
+ http: default text charset to iso-8859-1
831
+ remote-curl: reencode http error messages
832
+ strbuf: add strbuf_reencode helper
@@ -840,6 +836,8 @@ of the repositories listed at
836
+ t/lib-httpd: use write_script to copy CGI scripts
837
+ test-lib: preserve GIT_CURL_VERBOSE from the environment
838
839
+ Originally merged to 'next' on 2014-06-06
840
+
841
Propagate the error messages from the webserver better to the
842
client coming over the HTTP transport.
843
@@ -847,42 +845,52 @@ of the repositories listed at
845
846
847
* jm/format-patch-mail-sig (2014-05-27) 2 commits
850
- (merged to 'next' on 2014-06-06 at 0c8d703)
848
+ (merged to 'next' on 2014-06-10 at 310f59e)
849
+ format-patch: add "--signature-file=<file>" option
850
+ format-patch: make newline after signature conditional
851
852
+ Originally merged to 'next' on 2014-06-06
853
+
854
Will merge to 'master'.
855
856
857
* sk/wincred (2014-05-14) 2 commits
858
- (merged to 'next' on 2014-05-21 at a3b9ca3)
858
+ (merged to 'next' on 2014-06-10 at 8d03e5a)
859
+ wincred: avoid overwriting configured variables
860
+ wincred: add install target
861
862
+ Originally merged to 'next' on 2014-05-21
863
+
864
Will merge to 'master'.
865
866
867
* as/pretty-truncate (2014-05-21) 5 commits
866
- (merged to 'next' on 2014-05-23 at 94d4c51)
868
+ (merged to 'next' on 2014-06-10 at d8147a2)
869
+ pretty.c: format string with truncate respects logOutputEncoding
870
+ t4205, t6006: add tests that fail with i18n.logOutputEncoding set
871
+ t4205 (log-pretty-format): use `tformat` rather than `format`
872
+ t4041, t4205, t6006, t7102: don't hardcode tested encoding value
873
+ t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
874
875
+ Originally merged to 'next' on 2014-05-23
876
+
877
Will merge to 'master'.
878
879
876
-* cc/replace-graft (2014-06-05) 4 commits
880
+* cc/replace-graft (2014-06-09) 5 commits
881
+ - DONTMERGE: wise to wait for peff's commit->buffer length series
882
- contrib: add convert-grafts-to-replace-refs.sh
883
- Documentation: replace: add --graft option
884
- replace: add test for --graft
885
- replace: add --graft option
886
(this branch uses cc/replace-edit.)
887
888
+ "git replace" learned a "--graft" option to rewrite parents of a
889
+ commit.
890
+
891
892
* jk/argv-array-for-child-process (2014-05-15) 7 commits
885
- (merged to 'next' on 2014-05-21 at 5b2fa64)
893
+ (merged to 'next' on 2014-06-10 at 07a167b)
894
+ argv-array: drop "detach" code
895
+ get_importer: use run-command's internal argv_array
896
+ get_exporter: use argv_array
@@ -891,148 +899,121 @@ of the repositories listed at
899
+ run_column_filter: use argv_array
900
+ run-command: store an optional argv_array
901
902
+ Originally merged to 'next' on 2014-05-21
903
+
904
Will merge to 'master'.
905
906
907
* jk/diff-files-assume-unchanged (2014-05-15) 1 commit
898
- (merged to 'next' on 2014-05-21 at 142d2c8)
908
+ (merged to 'next' on 2014-06-10 at 984862b)
909
+ run_diff_files: do not look at uninitialized stat data
910
911
+ Originally merged to 'next' on 2014-05-21
912
+
913
Will merge to 'master'.
914
915
916
* jk/report-fail-to-read-objects-better (2014-05-15) 1 commit
905
- (merged to 'next' on 2014-05-21 at 77c89fe)
917
+ (merged to 'next' on 2014-06-10 at 299ea28)
918
+ open_sha1_file: report "most interesting" errno
919
920
+ Originally merged to 'next' on 2014-05-21
921
+
922
Will merge to 'master'.
923
924
925
* rr/rebase-autostash-fix (2014-05-20) 2 commits
912
- (merged to 'next' on 2014-05-21 at ca4aa40)
926
+ (merged to 'next' on 2014-06-10 at afd0c29)
927
+ rebase -i: test "Nothing to do" case with autostash
928
+ rebase -i: handle "Nothing to do" case with autostash
929
930
+ Originally merged to 'next' on 2014-05-21
931
+
932
Will merge to 'master'.
933
934
919
-* sk/windows-unc-path (2014-05-20) 1 commit
920
- (merged to 'next' on 2014-05-21 at d1f1350)
921
- + Windows: Allow using UNC path for git repository
935
+* sk/windows-unc-path (2014-06-10) 1 commit
936
+ (merged to 'next' on 2014-06-10 at 3598cc6)
937
+ + Windows: allow using UNC path for git repository
938
+ (this branch is used by sk/mingw-main and sk/mingw-uni-console.)
939
+
940
+ Originally merged to 'next' on 2014-05-21
941
942
Will merge to 'master'.
943
944
945
* jk/diff-follow-must-take-one-pathspec (2014-05-20) 1 commit
927
- (merged to 'next' on 2014-05-23 at 4653133)
946
+ (merged to 'next' on 2014-06-10 at 0cd28d7)
947
+ move "--follow needs one pathspec" rule to diff_setup_done
948
930
- Will merge to 'master'.
931
-
949
+ Originally merged to 'next' on 2014-05-23
950
933
-* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
934
- - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
935
- - git-add--interactive: Preserve diff heading when splitting hunks
936
-
937
- Waiting for a reroll.
951
+ Will merge to 'master'.
952
953
954
* jk/do-not-run-httpd-tests-as-root (2014-05-12) 1 commit
941
- (merged to 'next' on 2014-05-21 at 676392b)
955
+ (merged to 'next' on 2014-06-10 at 745b05c)
956
+ t/lib-httpd: require SANITY prereq
957
958
+ Originally merged to 'next' on 2014-05-21
959
+
960
Will merge to 'master'.
961
962
963
* cb/byte-order (2014-05-30) 3 commits
948
- (merged to 'next' on 2014-05-30 at 857617e)
964
+ (merged to 'next' on 2014-06-10 at 63db8ee)
965
+ compat/bswap.h: fix endianness detection
950
- (merged to 'next' on 2014-05-07 at f55c040)
966
+ compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
967
+ compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER
968
969
+ Originally merged to 'next' on 2014-05-30
970
+
971
Compatibility enhancement for Solaris.
972
973
Will merge to 'master'.
974
975
976
* cc/replace-edit (2014-05-19) 10 commits
960
- (merged to 'next' on 2014-05-19 at fcdd83f)
977
+ (merged to 'next' on 2014-06-10 at ff69722)
978
+ Documentation: replace: describe new --edit option
979
+ replace: add --edit to usage string
980
+ replace: add tests for --edit
981
+ replace: die early if replace ref already exists
982
+ replace: refactor checking ref validity
983
+ replace: make sure --edit results in a different object
967
- (merged to 'next' on 2014-05-12 at 71449bf)
984
+ replace: add --edit option
985
+ replace: factor object resolution out of replace_object
986
+ replace: use OPT_CMDMODE to handle modes
987
+ replace: refactor command-mode determination
988
(this branch is used by cc/replace-graft.)
989
990
+ Originally merged to 'next' on 2014-05-19
991
+
992
"git replace" learns a new "--edit" option.
993
994
Will merge to 'master'.
995
996
979
-* mt/send-email-cover-to-cc (2014-06-04) 3 commits
980
- (merged to 'next' on 2014-06-06 at 583f5fc)
997
+* mt/send-email-cover-to-cc (2014-06-10) 3 commits
998
+ (merged to 'next' on 2014-06-10 at 6bb1465)
999
+ t9001: avoid non-portable '\n' with sed
982
- (merged to 'next' on 2014-05-12 at b696006)
1000
+ test/send-email: to-cover, cc-cover tests
1001
+ git-send-email: two new options: to-cover, cc-cover
1002
986
- Will merge to 'master'.
987
-
1003
+ Originally merged to 'next' on 2014-06-10
1004
989
-* nd/split-index (2014-06-02) 34 commits
990
- - fixup! read-cache: new API write_locked_index instead of write_index/write_cache
991
- - SQUASH???
992
- - t1700: new tests for split-index mode
993
- - t2104: make sure split index mode is off for the version test
994
- - read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
995
- - read-tree: note about dropping split-index mode or index version
996
- - read-tree: force split-index mode off on --index-output
997
- - rev-parse: add --shared-index-path to get shared index path
998
- - update-index --split-index: do not split if $GIT_DIR is read only
999
- - update-index: new options to enable/disable split index mode
1000
- - split-index: strip pathname of on-disk replaced entries
1001
- - split-index: do not invalidate cache-tree at read time
1002
- - split-index: the reading part
1003
- - split-index: the writing part
1004
- - read-cache: mark updated entries for split index
1005
- - read-cache: save deleted entries in split index
1006
- - read-cache: mark new entries for split index
1007
- - read-cache: split-index mode
1008
- - read-cache: save index SHA-1 after reading
1009
- - entry.c: update cache_changed if refresh_cache is set in checkout_entry()
1010
- - cache-tree: mark istate->cache_changed on prime_cache_tree()
1011
- - cache-tree: mark istate->cache_changed on cache tree update
1012
- - cache-tree: mark istate->cache_changed on cache tree invalidation
1013
- - unpack-trees: be specific what part of the index has changed
1014
- - resolve-undo: be specific what part of the index has changed
1015
- - update-index: be specific what part of the index has changed
1016
- - read-cache: be specific what part of the index has changed
1017
- - read-cache: be strict about "changed" in remove_marked_cache_entries()
1018
- - read-cache: store in-memory flags in the first 12 bits of ce_flags
1019
- - read-cache: relocate and unexport commit_locked_index()
1020
- - read-cache: new API write_locked_index instead of write_index/write_cache
1021
- - sequencer: do not update/refresh index if the lock cannot be held
1022
- - ewah: delete unused ewah_read_mmap_native declaration
1023
- - ewah: fix constness of ewah_read_mmap
1024
-
1025
- The tip two remind us the need for a minor reroll. If I find time
1026
- I could try to squash them myself, but it is low priority for me.
1005
+ Will merge to 'master'.
1006
1007
1008
* ib/test-selectively-run (2014-06-06) 4 commits
1030
- (merged to 'next' on 2014-06-06 at d894205)
1009
+ (merged to 'next' on 2014-06-10 at 1235570)
1010
+ t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests
1011
+ test-lib: '--run' to run only specific tests
1012
+ test-lib: tests skipped by GIT_SKIP_TESTS say so
1013
+ test-lib: document short options in t/README
1014
1015
+ Originally merged to 'next' on 2014-06-06
1016
+
1017
Allow specifying only certain individual test pieces to be run
1018
using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").
1019
@@ -1040,7 +1021,7 @@ of the repositories listed at
1021
1022
1023
* fc/remote-helper-refmap (2014-04-21) 8 commits
1043
- (merged to 'next' on 2014-04-22 at fb5a4c2)
1024
+ (merged to 'next' on 2014-06-10 at 8cd8cf8)
1025
+ transport-helper: remove unnecessary strbuf resets
1026
+ transport-helper: add support to delete branches
1027
+ fast-export: add support to delete refs
@@ -1050,45 +1031,23 @@ of the repositories listed at
1031
+ fast-export: add new --refspec option
1032
+ fast-export: improve argument parsing
1033
1034
+ Originally merged to 'next' on 2014-04-22
1035
+
1036
Allow remote-helper/fast-import based transport to rename the refs
1037
while transferring the history.
1038
1039
1057
-* jh/submodule-tests (2014-04-17) 1 commit
1058
- - t7410: 210 tests for various 'git submodule update' scenarios
1059
-
1060
- What's the status of this one?
1061
-
1062
-
1063
-* mt/patch-id-stable (2014-05-06) 6 commits
1064
- (merged to 'next' on 2014-05-07 at 6ade68e)
1065
- + test doc: test_write_lines does not split its arguments
1066
- (merged to 'next' on 2014-05-02 at cfa251b)
1067
- + t4204-patch-id.sh: default is now stable
1068
- + patch-id: change default to stable
1069
- (merged to 'next' on 2014-05-02 at b69326a)
1040
+* mt/patch-id-stable (2014-06-10) 5 commits
1041
+ - patch-id: change default to stable
1042
+ (merged to 'next' on 2014-06-10 at b75e70f)
1043
+ patch-id-test: test stable and unstable behaviour
1071
- + test: add test_write_lines helper
1044
+ patch-id: make it stable against hunk reordering
1045
+ + test doc: test_write_lines does not split its arguments
1046
+ + test: add test_write_lines helper
1047
+
1048
+ Originally merged to 'next' on 2014-05-07
1049
1050
Introduce a new way to compute patch-id for a patch that is not
1051
affected by the order of the paths that appear in the input.
1052
1077
- Will merge to 'master'.
1078
-
1079
-
1080
-* cc/interpret-trailers (2014-05-28) 11 commits
1081
- - Documentation: add documentation for 'git interpret-trailers'
1082
- - trailer: add tests for commands in config file
1083
- - trailer: execute command from 'trailer.<name>.command'
1084
- - trailer: add tests for "git interpret-trailers"
1085
- - trailer: add interpret-trailers command
1086
- - trailer: put all the processing together and print
1087
- - trailer: parse trailers from file or stdin
1088
- - trailer: process command line trailer arguments
1089
- - trailer: read and process config information
1090
- - trailer: process trailers from input message and arguments
1091
- - trailer: add data structures and basic functions
1092
-
1093
- A new filter to programatically edit the tail end of the commit log
1094
- messages.
1053
+ Will merge to 'master' except for the last one.