@matheusbsbs / matheus-bagliano / commits / 57b4780329

What's cooking (2014/05 #02)

Junio C Hamano committed Mar 11, 2014 at 15:10 UTC 57b47803292f83ee0715ab91ae6b805a5fee95fc
1 file changed +495 -676
whats-cooking.txt
+495 -676
@@ -1,18 +1,19 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Mar 2014, #01; Tue, 4)
4 -X-master-at: 2de34784dfcbb4fe0febe9ab98e0b99138040109
5 -X-next-at: d464cb7a99e56a69dc347cdeb1620023efc8669a
3 +Subject: What's cooking in git.git (Mar 2014, #02; Tue, 11)
4 +X-master-at: 384364b5f1aa0c3b7610a1b3c9eca2c210e61b41
5 +X-next-at: d838d6f000d8078a1e28d6780f767cb925fb2632
6
7 -What's cooking in git.git (Mar 2014, #01; Tue, 4)
7 +What's cooking in git.git (Mar 2014, #02; Tue, 11)
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 -A handful of "GSoC warm-up microprojects" have been queued on 'pu'.
15 -Thanks for reviewing them.
14 +Topics that have been cooking in 'next' for 2.0 have been merged to
15 +'master', which means we are committed to make the next one a big
16 +release. Kind of scary, isn't it?
17
18 You can find the changes described here in the integration branches
19 of the repositories listed at
@@ -22,489 +23,249 @@ of the repositories listed at
23 --------------------------------------------------
24 [Graduated to "master"]
25
25 -* al/docs (2014-02-11) 4 commits
26 - (merged to 'next' on 2014-02-25 at 0c1a734)
27 - + docs/git-blame: explain more clearly the example pickaxe use
28 - + docs/git-clone: clarify use of --no-hardlinks option
29 - + docs/git-remote: capitalize first word of initial blurb
30 - + docs/merge-strategies: remove hyphen from mis-merges
31 -
32 - Originally merged to 'next' on 2014-02-13
33 -
34 - A handful of documentation updates, all trivially harmless.
35 -
36 -
37 -* bc/gpg-sign-everywhere (2014-02-11) 9 commits
38 - (merged to 'next' on 2014-02-25 at 7db014c)
39 - + pull: add the --gpg-sign option.
40 - + rebase: add the --gpg-sign option
41 - + rebase: parse options in stuck-long mode
42 - + rebase: don't try to match -M option
43 - + rebase: remove useless arguments check
44 - + am: add the --gpg-sign option
45 - + am: parse options in stuck-long mode
46 - + git-sh-setup.sh: add variable to use the stuck-long mode
47 - + cherry-pick, revert: add the --gpg-sign option
48 -
49 - Originally merged to 'next' on 2014-02-13
50 -
51 - Teach "--gpg-sign" option to many commands that create commits.
52 -
53 -
54 -* bk/refresh-missing-ok-in-merge-recursive (2014-02-24) 4 commits
55 - (merged to 'next' on 2014-02-25 at 2651cb0)
56 - + merge-recursive.c: tolerate missing files while refreshing index
57 - + read-cache.c: extend make_cache_entry refresh flag with options
58 - + read-cache.c: refactor --ignore-missing implementation
59 - + t3030-merge-recursive: test known breakage with empty work tree
60 -
61 - Originally merged to 'next' on 2014-01-29
62 -
63 - Allow "merge-recursive" to work in an empty (temporary) working
64 - tree again when there are renames involved, correcting an old
65 - regression in 1.7.7 era.
66 -
67 -
68 -* bs/stdio-undef-before-redef (2014-01-31) 1 commit
69 - (merged to 'next' on 2014-02-25 at 77c4b5f)
70 - + git-compat-util.h: #undef (v)snprintf before #define them
71 -
72 - Originally merged to 'next' on 2014-01-31
73 -
74 - When we replace broken macros from stdio.h in git-compat-util.h,
75 - #undef them to avoid re-definition warnings from the C
76 - preprocessor.
77 -
78 -
79 -* da/pull-ff-configuration (2014-01-15) 2 commits
80 - (merged to 'next' on 2014-02-25 at b9e4f61)
81 - + pull: add --ff-only to the help text
82 - + pull: add pull.ff configuration
26 +* cc/starts-n-ends-with-endgame (2013-12-05) 1 commit
27 + (merged to 'next' on 2014-02-25 at 473e143)
28 + + strbuf: remove prefixcmp() and suffixcmp()
29
84 - Originally merged to 'next' on 2014-01-22
30 + Originally merged to 'next' on 2014-01-07
31
86 - "git pull" learned to pay attention to pull.ff configuration
87 - variable.
32 + Endgame for the cc/starts-n-ends-with topic; this needs to be
33 + evil-merged with other topics that introduce new uses of
34 + prefix/suffix-cmp functions.
35
36
90 -* dk/blame-janitorial (2014-02-25) 5 commits
91 - (merged to 'next' on 2014-02-25 at d5faeb2)
92 - + builtin/blame.c::find_copy_in_blob: no need to scan for region end
93 - + blame.c: prepare_lines should not call xrealloc for every line
94 - + builtin/blame.c::prepare_lines: fix allocation size of sb->lineno
95 - + builtin/blame.c: eliminate same_suspect()
96 - + builtin/blame.c: struct blame_entry does not need a prev link
37 +* gj/push-more-verbose-advice (2013-11-13) 1 commit
38 + (merged to 'next' on 2014-02-25 at 1cd10b0)
39 + + push: switch default from "matching" to "simple"
40
98 - Originally merged to 'next' on 2014-02-13
41 + Originally merged to 'next' on 2013-11-21
42
100 - Code clean-up.
43 + Explain 'simple' and 'matching' in "git push" advice message; the
44 + topmost patch is a rebase of jc/push-2.0-default-to-simple on top
45 + of it.
46
47
103 -* ds/rev-parse-required-args (2014-01-28) 1 commit
104 - (merged to 'next' on 2014-02-25 at bba6e79)
105 - + rev-parse: check i before using argv[i] against argc
106 -
107 - Originally merged to 'next' on 2014-01-31
108 -
109 - "git rev-parse --default" without the required option argument did
110 - not diagnose it as an error.
48 +* jc/add-2.0-ignore-removal (2013-04-22) 1 commit
49 + (merged to 'next' on 2014-02-25 at a0d018a)
50 + + git add <pathspec>... defaults to "-A"
51
52 + Originally merged to 'next' on 2013-12-06
53
113 -* ep/varscope (2014-01-31) 7 commits
114 - (merged to 'next' on 2014-02-25 at e967c7e)
115 - + builtin/gc.c: reduce scope of variables
116 - + builtin/fetch.c: reduce scope of variable
117 - + builtin/commit.c: reduce scope of variables
118 - + builtin/clean.c: reduce scope of variable
119 - + builtin/blame.c: reduce scope of variables
120 - + builtin/apply.c: reduce scope of variables
121 - + bisect.c: reduce scope of variable
54 + Updated endgame for "git add <pathspec>" that defaults to "--all"
55 + aka "--no-ignore-removal".
56
123 - Originally merged to 'next' on 2014-01-31
124 -
125 - Shrink lifetime of variables by moving their definitions to an
126 - inner scope where appropriate.
57
58 +* jc/core-checkstat-2.0 (2013-05-06) 1 commit
59 + (merged to 'next' on 2014-02-25 at 62f6aeb)
60 + + core.statinfo: remove as promised in Git 2.0
61
129 -* jk/config-path-include-fix (2014-01-28) 2 commits
130 - (merged to 'next' on 2014-02-25 at 3604f75)
131 - + handle_path_include: don't look at NULL value
132 - + expand_user_path: do not look at NULL path
62 + Originally merged to 'next' on 2013-12-06
63
134 - Originally merged to 'next' on 2014-01-31
135 -
136 - include.path variable (or any variable that expects a path that can
137 - use ~username expansion) in the configuration file is not a
138 - boolean, but the code failed to check it.
139 -
140 -
141 -* jk/pack-bitmap (2014-02-12) 26 commits
142 - (merged to 'next' on 2014-02-25 at 5f65d26)
143 - + ewah: unconditionally ntohll ewah data
144 - + ewah: support platforms that require aligned reads
145 - + read-cache: use get_be32 instead of hand-rolled ntoh_l
146 - + block-sha1: factor out get_be and put_be wrappers
147 - + do not discard revindex when re-preparing packfiles
148 - + pack-bitmap: implement optional name_hash cache
149 - + t/perf: add tests for pack bitmaps
150 - + t: add basic bitmap functionality tests
151 - + count-objects: recognize .bitmap in garbage-checking
152 - + repack: consider bitmaps when performing repacks
153 - + repack: handle optional files created by pack-objects
154 - + repack: turn exts array into array-of-struct
155 - + repack: stop using magic number for ARRAY_SIZE(exts)
156 - + pack-objects: implement bitmap writing
157 - + rev-list: add bitmap mode to speed up object lists
158 - + pack-objects: use bitmaps when packing objects
159 - + pack-objects: split add_object_entry
160 - + pack-bitmap: add support for bitmap indexes
161 - + documentation: add documentation for the bitmap format
162 - + ewah: compressed bitmap implementation
163 - + compat: add endianness helpers
164 - + sha1_file: export `git_open_noatime`
165 - + revision: allow setting custom limiter function
166 - + pack-objects: factor out name_hash
167 - + pack-objects: refactor the packing list
168 - + revindex: export new APIs
169 - (this branch is used by jk/repack-pack-keep-objects.)
170 -
171 - Originally merged to 'next' on 2014-02-13
172 -
173 - Borrow the bitmap index into packfiles from JGit to speed up
174 - enumeration of objects involved in a commit range without having to
175 - fully traverse the history.
176 -
177 -
178 -* jk/test-ports (2014-02-10) 2 commits
179 - (merged to 'next' on 2014-02-25 at 86ce2e4)
180 - + tests: auto-set git-daemon port
181 - + tests: auto-set LIB_HTTPD_PORT from test name
182 - (this branch is tangled with nd/http-fetch-shallow-fix.)
64
184 - Originally merged to 'next' on 2014-02-13
185 -
186 - Avoid having to assign port number to be used in tests manually.
187 -
188 -
189 -* kb/fast-hashmap (2014-02-24) 18 commits
190 - (merged to 'next' on 2014-02-25 at 88a98e6)
191 - + name-hash: retire unused index_name_exists()
192 - + hashmap.h: use 'unsigned int' for hash-codes everywhere
193 - + test-hashmap.c: drop unnecessary #includes
194 - + .gitignore: test-hashmap is a generated file
195 - + read-cache.c: fix memory leaks caused by removed cache entries
196 - + builtin/update-index.c: cleanup update_one
197 - + fix 'git update-index --verbose --again' output
198 - + remove old hash.[ch] implementation
199 - + name-hash.c: remove cache entries instead of marking them CE_UNHASHED
200 - + name-hash.c: use new hash map implementation for cache entries
201 - + name-hash.c: remove unreferenced directory entries
202 - + name-hash.c: use new hash map implementation for directories
203 - + diffcore-rename.c: use new hash map implementation
204 - + diffcore-rename.c: simplify finding exact renames
205 - + diffcore-rename.c: move code around to prepare for the next patch
206 - + buitin/describe.c: use new hash map implementation
207 - + add a hashtable implementation that supports O(1) removal
208 - + submodule: don't access the .gitmodules cache entry after removing it
209 - (this branch is used by kb/fast-hashmap-pack-struct.)
210 -
211 - Originally merged to 'next' on 2014-01-03
212 -
213 - Improvements to our hash table to get it to meet the needs of the
214 - msysgit fscache project, with some nice performance improvements.
215 -
216 -
217 -* ks/tree-diff-walk (2014-02-24) 5 commits
218 - (merged to 'next' on 2014-02-25 at 17e594f)
219 - + tree-walk: finally switch over tree descriptors to contain a pre-parsed entry
220 - + revision: convert to using diff_tree_sha1()
221 - + line-log: convert to using diff_tree_sha1()
222 - + tree-diff: convert diff_root_tree_sha1() to just call diff_tree_sha1 with old=NULL
223 - + tree-diff: allow diff_tree_sha1 to accept NULL sha1
224 - (this branch is used by ks/combine-diff, ks/tree-diff-more and ks/tree-diff-nway.)
225 -
226 - Originally merged to 'next' on 2014-02-06
227 -
228 -
229 -* mw/symlinks (2014-02-04) 6 commits
230 - (merged to 'next' on 2014-02-25 at 15dc036)
231 - + setup: don't dereference in-tree symlinks for absolute paths
232 - + setup: add abspath_part_inside_repo() function
233 - + t0060: add tests for prefix_path when path begins with work tree
234 - + t0060: add test for prefix_path when path == work tree
235 - + t0060: add test for prefix_path on symlinks via absolute paths
236 - + t3004: add test for ls-files on symlinks via absolute paths
237 -
238 - Originally merged to 'next' on 2014-02-06
239 -
240 - All subcommands that take pathspecs mishandled an in-tree symbolic
241 - link when given it as a full path from the root (which arguably is
242 - a sick way to use pathspecs). "git ls-files -s $(pwd)/RelNotes" in
243 - our tree is an easy reproduction recipe.
244 -
245 -
246 -* nd/diff-quiet-stat-dirty (2014-02-24) 2 commits
247 - (merged to 'next' on 2014-02-25 at 7cad1d3)
248 - + diff: do not quit early on stat-dirty files
249 - + diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later
250 -
251 - Originally merged to 'next' on 2014-01-31
252 -
253 - "git diff --quiet -- pathspec1 pathspec2" sometimes did not return
254 - correct status value.
255 -
256 -
257 -* nd/http-fetch-shallow-fix (2014-02-13) 7 commits
258 - (merged to 'next' on 2014-02-25 at ad4e9c9)
259 - + t5537: move http tests out to t5539
260 - + fetch-pack: fix deepen shallow over smart http with no-done cap
261 - + protocol-capabilities.txt: document no-done
262 - + protocol-capabilities.txt: refer multi_ack_detailed back to pack-protocol.txt
263 - + pack-protocol.txt: clarify 'obj-id' in the last ACK after 'done'
264 - + test: rename http fetch and push test files
265 - + tests: auto-set LIB_HTTPD_PORT from test name
266 - (this branch is tangled with jk/test-ports.)
65 +* jc/hold-diff-remove-q-synonym-for-no-deletion (2013-07-19) 1 commit
66 + (merged to 'next' on 2014-02-25 at ccfff88)
67 + + diff: remove "diff-files -q" in a version of Git in a distant future
68
268 - Originally merged to 'next' on 2014-02-13
69 + Originally merged to 'next' on 2013-12-06
70
270 - Attempting to deepen a shallow repository by fetching over smart
271 - HTTP transport failed in the protocol exchange, when no-done
272 - extension was used. The fetching side waited for the list of
273 - shallow boundary commits after the sending end stopped talking to
274 - it.
71 + Remove deprecated "-q" option "git diff-files".
72
73
277 -* nd/reset-intent-to-add (2014-02-05) 1 commit
278 - (merged to 'next' on 2014-02-25 at 0c48245)
279 - + reset: support "--mixed --intent-to-add" mode
74 +* jc/push-2.0-default-to-simple (2013-06-18) 1 commit
75 + (merged to 'next' on 2014-02-25 at 1f0e178)
76 + + push: switch default from "matching" to "simple"
77
281 - Originally merged to 'next' on 2014-02-07
78 + Originally merged to 'next' on 2013-12-06
79
80
284 -* nd/submodule-pathspec-ending-with-slash (2014-02-24) 8 commits
285 - (merged to 'next' on 2014-02-25 at 954b7a2)
286 - + clean: use cache_name_is_other()
287 - + clean: replace match_pathspec() with dir_path_match()
288 - + pathspec: pass directory indicator to match_pathspec_item()
289 - + match_pathspec: match pathspec "foo/" against directory "foo"
290 - + dir.c: prepare match_pathspec_item for taking more flags
291 - + pathspec: rename match_pathspec_depth() to match_pathspec()
292 - + pathspec: convert some match_pathspec_depth() to dir_path_match()
293 - + pathspec: convert some match_pathspec_depth() to ce_path_match()
81 +* jk/run-network-tests-by-default (2014-02-14) 1 commit
82 + (merged to 'next' on 2014-02-25 at 62a8ad0)
83 + + tests: turn on network daemon tests by default
84
295 - Originally merged to 'next' on 2014-01-31
85 + Originally merged to 'next' on 2014-02-20
86
297 - Allow "git cmd path/", when the 'path' is where a submodule is
298 - bound to the top-level working tree, to match 'path', despite the
299 - extra and unnecessary trailing slash.
87 + Teach "make test" to run networking tests when possible by default.
88
89
302 -* nd/test-rename-reset (2014-02-04) 1 commit
303 - (merged to 'next' on 2014-02-25 at 7b25711)
304 - + t7101, t7014: rename test files to indicate what that file is for
90 +* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit
91 + (merged to 'next' on 2014-02-25 at 9e5c0d2)
92 + + git add: -u/-A now affects the entire working tree
93
306 - Originally merged to 'next' on 2014-02-06
94 + Originally merged to 'next' on 2013-12-06
95
96
309 -* nv/commit-gpgsign-config (2014-02-24) 3 commits
310 - (merged to 'next' on 2014-02-25 at 0baefa2)
311 - + test the commit.gpgsign config option
312 - + commit-tree: add and document --no-gpg-sign
313 - + commit-tree: add the commit.gpgsign option to sign all commits
97 +* ks/combine-diff (2014-02-24) 6 commits
98 + (merged to 'next' on 2014-02-25 at 69e5a87)
99 + + tests: add checking that combine-diff emits only correct paths
100 + + combine-diff: simplify intersect_paths() further
101 + + combine-diff: combine_diff_path.len is not needed anymore
102 + + combine-diff: optimize combine_diff_path sets intersection
103 + + diff test: add tests for combine-diff with orderfile
104 + + diffcore-order: export generic ordering interface
105 + (this branch is used by ks/tree-diff-nway.)
106
315 - Originally merged to 'next' on 2014-01-03
107 + Originally merged to 'next' on 2014-02-20
108
317 - Introduce commit.gpgsign configuration variable to force every
318 - commit to be GPG signed. The variable cannot be overriden from the
319 - command line of some of the commands that create commits except for
320 - "git commit" and "git commit-tree", but I am not convinced that it
321 - is a good idea to sprinkle support for --no-gpg-sign everywhere,
322 - which in turn means that this configuration variable may not be
323 - such a good idea.
109 + Teach combine-diff to honour the path-output-order imposed by
110 + diffcore-order, and optimize how matching paths are found in
111 + the N-way diffs made with parents.
112
113
326 -* wk/submodule-on-branch (2014-02-24) 4 commits
327 - (merged to 'next' on 2014-02-25 at c6d9fef)
328 - + Documentation: describe 'submodule update --remote' use case
329 - + submodule: explicit local branch creation in module_clone
330 - + submodule: document module_clone arguments in comments
331 - + submodule: make 'checkout' update_module mode more explicit
114 +* nd/daemonize-gc (2014-02-10) 2 commits
115 + (merged to 'next' on 2014-02-25 at f592335)
116 + + gc: config option for running --auto in background
117 + + daemon: move daemonize() to libgit.a
118
333 - Originally merged to 'next' on 2014-02-06
119 + Originally merged to 'next' on 2014-02-20
120
335 - Make sure 'submodule update' modes that do not detach HEADs can
336 - be used more pleasantly by checking out a concrete branch when
337 - cloning them to prime the well.
121 + Allow running "gc --auto" in the background.
122
123 --------------------------------------------------
124 [New Topics]
125
342 -* jc/stash-pop-not-popped (2014-02-26) 1 commit
343 - - stash pop: mention we did not drop the stash upon failing to apply
344 -
345 - "stash pop", upon failing to apply the stash, refrains from
346 - discarding the stash to avoid information loss. Be more explicit
347 - in the error message.
348 -
349 - The wording may want to get a bit more bikeshedding, but otherwise
350 - it should be OK for 'next'.
351 -
126 +* jk/detect-push-typo-early (2014-03-05) 3 commits
127 + - push: detect local refspec errors early
128 + - match_explicit_lhs: allow a "verify only" mode
129 + - match_explicit: hoist refspec lhs checks into their own function
130
353 -* bg/install-branch-config-skip-prefix (2014-02-28) 2 commits
354 - - branch: use skip_prefix() in install_branch_config()
355 - - t3200-branch: test setting branch as own upstream
131 + Catch "git push $there no-such-branch" early.
132
357 - The new test probably wants the longer-term effect of the rejected
358 - operation, not just the rejection warning message.
133 + Will merge to 'next'.
134
135
361 -* cn/fetch-prune-overlapping-destination (2014-02-28) 2 commits
362 - - fetch: handle overlaping refspecs on --prune
363 - - fetch: add a failing test for prunning with overlapping refspecs
136 +* jk/diff-funcname-cpp-regex (2014-03-05) 1 commit
137 + - diff: simplify cpp funcname regex
138
365 - Protect refs in a hierarchy that can come from more than one remote
366 - hierarcies from incorrect removal by "git fetch --prune".
139 + Has the discussion settled on this?
140
368 - Comments?
141
142 +* jk/doc-deprecate-grafts (2014-03-05) 1 commit
143 + - docs: mark info/grafts as outdated
144
371 -* dd/find-graft-with-sha1-pos (2014-02-27) 1 commit
372 - - commit.c: use the generic "sha1_pos" function for lookup
373 -
374 - Replace a hand-rolled binary search with a call to our generic
375 - binary search helper function.
376 -
145 + Will merge to 'next'.
146
378 -* dd/use-alloc-grow (2014-03-03) 14 commits
379 - - sha1_file.c: use ALLOC_GROW() in pretend_sha1_file()
380 - - read-cache.c: use ALLOC_GROW() in add_index_entry()
381 - - builtin/mktree.c: use ALLOC_GROW() in append_to_tree()
382 - - attr.c: use ALLOC_GROW() in handle_attr_line()
383 - - dir.c: use ALLOC_GROW() in create_simplify()
384 - - reflog-walk.c: use ALLOC_GROW()
385 - - replace_object.c: use ALLOC_GROW() in register_replace_object()
386 - - patch-ids.c: use ALLOC_GROW() in add_commit()
387 - - diffcore-rename.c: use ALLOC_GROW()
388 - - diff.c: use ALLOC_GROW()
389 - - commit.c: use ALLOC_GROW() in register_commit_graft()
390 - - cache-tree.c: use ALLOC_GROW() in find_subtree()
391 - - bundle.c: use ALLOC_GROW() in add_to_ref_list()
392 - - builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()
147
394 - Replace open-coded reallocation with ALLOC_GROW() macro.
148 +* rm/strchrnul-not-strlen (2014-03-10) 1 commit
149 + - use strchrnul() in place of strchr() and strlen()
150
151 + Will merge to 'next'.
152
397 -* dk/skip-prefix-scan-only-once (2014-03-03) 1 commit
398 - - skip_prefix(): scan prefix only once
153
400 - Updaste implementation of skip_prefix() to scan only once; given
401 - that most "prefix" arguments to the inline function are constant
402 - strings whose strlen() can be determined at the compile time, this
403 - might actually make things worse with a compiler with sufficient
404 - intelligence.
154 +* sh/use-hashcpy (2014-03-06) 1 commit
155 + - Use hashcpy() when copying object names
156
157 + Will merge to 'next'.
158
407 -* jk/doc-coding-guideline (2014-02-28) 1 commit
408 - - CodingGuidelines: mention C whitespace rules
159
410 - Elaborate on a style niggle that has been part of "mimic existing
411 - code".
160 +* jc/no-need-for-env-in-sh-scripts (2014-03-06) 1 commit
161 + - *.sh: drop useless use of "env"
162
163 Will merge to 'next'.
164
165
416 -* jk/shallow-update-fix (2014-02-27) 2 commits
417 - - shallow: automatically clean up shallow tempfiles
418 - - shallow: use stat_validity to check for up-to-date file
419 -
420 - Serving objects from a shallow repository needs to write a
421 - temporary file to be used, but the serving upload-pack may not have
422 - write access to the repository which is meant to be read-only.
423 -
166 +* jc/tag-contains-with (2014-03-07) 1 commit
167 + - tag: grok "--with" as synonym to "--contains"
168
425 -* jl/doc-submodule-update-checkout (2014-02-28) 1 commit
426 - - submodule update: consistently document the '--checkout' option
169 + Will merge to 'next'.
170
428 - Add missing documentation for "submodule update --checkout".
171
430 - Will merge to 'next'.
172 +* bp/commit-p-editor (2014-03-11) 8 commits
173 + - run-command: mark run_hook_with_custom_index as deprecated
174 + - merge hook tests: fix and update tests
175 + - merge: fix GIT_EDITOR override for commit hook
176 + - commit: fix patch hunk editing with "commit -p -m"
177 + - SQUASH???
178 + - test patch hunk editing with "commit -p -m"
179 + - merge hook tests: use 'test_must_fail' instead of '!'
180 + - merge hook tests: fix missing '&&' in test
181
182
433 -* jn/bisect-coding-style (2014-03-03) 1 commit
434 - - git-bisect.sh: fix a few style issues
183 +* cp/am-patch-format-doc (2014-03-11) 1 commit
184 + - Documentation/git-am: Document supported --patch-format options
185
186 Will merge to 'next'.
187
188
439 -* jn/branch-lift-unnecessary-name-length-limit (2014-02-28) 1 commit
440 - - branch.c: delete size check of newly tracked branch names
189 +* dm/configure-iconv-locale-charset (2014-03-11) 1 commit
190 + - configure.ac: link with -liconv for locale_charset()
191
192
443 -* mh/simplify-cache-tree-find (2014-03-04) 2 commits
444 - - SQUASH??? use strchrnul
445 - - cache_tree_find(): remove redundant checks
446 -
193 +* jk/clean-d-pathspec (2014-03-11) 2 commits
194 + - clean: simplify dir/not-dir logic
195 + - clean: respect pathspecs with "-d"
196
448 -* nd/strbuf-inline-styles (2014-03-03) 1 commit
449 - - strbuf: style fix -- top opening bracket on a separate line
197 + "git clean -d pathspec" did not use pathspec correctly.
198
451 - Will merge to 'next'.
199 + Will merge to 'next' and later down to 'maint'.
200
201
454 -* nd/tag-version-sort (2014-02-27) 1 commit
455 - - tag: support --sort=<spec>
202 +* jk/mv-submodules-fix (2014-03-11) 2 commits
203 + - mv: prevent mismatched data when ignoring errors.
204 + - builtin/mv: fix out of bounds write
205
457 - Allow v1.9.0 sorted before v1.10.0 in "git tag --list" output.
206 + Needs tests.
207
208
460 -* rt/help-pretty-prints-cmd-names (2014-02-28) 1 commit
461 - - help.c: rename function "pretty_print_string_list"
209 +* nd/upload-pack-shallow (2014-03-11) 1 commit
210 + - upload-pack: send shallow info over stdin to pack-objects
211
212 Will merge to 'next'.
213
214
466 -* sg/archive-restrict-remote (2014-02-28) 2 commits
467 - - add uploadarchive.allowUnreachable option
468 - - docs: clarify remote restrictions for git-upload-archive
215 +* rs/grep-h-c (2014-03-11) 2 commits
216 + - grep: support -h (no header) with --count
217 + - t7810: add missing variables to tests in loop
218
470 - Allow loosening remote "git archive" invocation security check that
471 - refuses to serve tree-ish not at the tip of any ref.
219 + "git grep" learns to handle combination of "-h (no header)" and "-c
220 + (counts)".
221
222 Will merge to 'next'.
223
224 +--------------------------------------------------
225 +[Stalled]
226
227 +* ap/remote-hg-skip-null-bookmarks (2014-01-02) 1 commit
228 + - remote-hg: do not fail on invalid bookmarks
229
477 -* sh/finish-tmp-packfile (2014-03-03) 2 commits
478 - - finish_tmp_packfile():use strbuf for pathname construction
479 - - Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-packfile
480 - (this branch uses sh/write-pack-file-warning-message-fix.)
481 -
482 -
483 -* sh/write-pack-file-warning-message-fix (2014-03-03) 1 commit
484 - - write_pack_file: use correct variable in diagnostic
485 - (this branch is used by sh/finish-tmp-packfile.)
486 -
487 - A warning from "git pack-objects" were generated by referring to an
488 - incorrect variable when forming the filename that we had trouble
489 - with.
230 + Reported to break tests ($gmane/240005)
231 + Expecting a reroll.
232
491 - Will merge to 'next'.
233
234 +* jk/warn-on-object-refname-ambiguity (2014-01-09) 6 commits
235 + - get_sha1: drop object/refname ambiguity flag
236 + - get_sha1: speed up ambiguous 40-hex test
237 + - FIXUP: teach DO_FOR_EACH_NO_RECURSE to prime_ref_dir()
238 + - refs: teach for_each_ref a flag to avoid recursion
239 + - cat-file: fix a minor memory leak in batch_objects
240 + - cat-file: refactor error handling of batch_objects
241
494 -* sr/add--interactive-term-readkey (2014-03-03) 2 commits
495 - - git-add--interactive: warn if module for interactive.singlekey is missing
496 - - git-config: document interactive.singlekey requires Term::ReadKey
242 + Expecting a reroll.
243
498 - Will merge to 'next'.
244
245 +* jk/makefile (2014-02-05) 16 commits
246 + - FIXUP
247 + - move LESS/LV pager environment to Makefile
248 + - Makefile: teach scripts to include make variables
249 + - FIXUP
250 + - Makefile: auto-build C strings from make variables
251 + - Makefile: drop *_SQ variables
252 + - FIXUP
253 + - Makefile: add c-quote helper function
254 + - Makefile: introduce sq function for shell-quoting
255 + - Makefile: always create files via make-var
256 + - Makefile: store GIT-* sentinel files in MAKE/
257 + - Makefile: prefer printf to echo for GIT-*
258 + - Makefile: use tempfile/mv strategy for GIT-*
259 + - Makefile: introduce make-var helper function
260 + - Makefile: fix git-instaweb dependency on gitweb
261 + - Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
262
501 -* ta/parse-commit-with-skip-prefix (2014-03-04) 1 commit
502 - - commit.c: use skip_prefix() instead of starts_with()
263 + Simplify the Makefile rules and macros that exist primarily for
264 + quoting purposes, and make it easier to robustly express the
265 + dependency rules.
266
504 - Will merge to 'next'.
267 + Expecting a reroll.
268
506 ---------------------------------------------------
507 -[Stalled]
269
270 * kb/fast-hashmap-pack-struct (2014-02-24) 1 commit
271 - hashmap.h: make sure map entries are tightly packed
@@ -704,79 +465,274 @@ of the repositories listed at
465 - pack-refs.c: Add missing call to git_config()
466 - show-ref.c: Add missing call to git_config()
467
707 - The changes themselves are probably good, but it is unclear what
708 - basic setting needs to be read for which exact operation.
468 + The changes themselves are probably good, but it is unclear what
469 + basic setting needs to be read for which exact operation.
470 +
471 + Will discard, tired of waiting for clarification.
472 + $gmane/228294
473 +
474 +
475 +* jc/format-patch (2013-04-22) 2 commits
476 + - format-patch: --inline-single
477 + - format-patch: rename "no_inline" field
478 +
479 + A new option to send a single patch to the standard output to be
480 + appended at the bottom of a message. I personally have no need for
481 + this, but it was easy enough to cobble together. Tests, docs and
482 + stripping out more MIMEy stuff are left as exercises to interested
483 + parties.
484 +
485 +
486 +* jk/gitweb-utf8 (2013-04-08) 4 commits
487 + - gitweb: Fix broken blob action parameters on blob/commitdiff pages
488 + - gitweb: Don't append ';js=(0|1)' to external links
489 + - gitweb: Make feed title valid utf8
490 + - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
491 +
492 + Various fixes to gitweb.
493 +
494 + Drew Northup volunteered to take a look into this ($gmane/226216)
495 + but nothing seems to have happened since then.
496 +
497 + Will discard.
498 +
499 +
500 +* jc/show-branch (2013-06-07) 5 commits
501 + - show-branch: use commit slab to represent bitflags of arbitrary width
502 + - show-branch.c: remove "all_mask"
503 + - show-branch.c: abstract out "flags" operation
504 + - show-branch.c: lift all_mask/all_revs to a global static
505 + - show-branch.c: update comment style
506 +
507 + Waiting for the final step to lift the hard-limit before sending it out.
508 +
509 +--------------------------------------------------
510 +[Cooking]
511 +
512 +* jc/stash-pop-not-popped (2014-02-26) 1 commit
513 + - stash pop: mention we did not drop the stash upon failing to apply
514 +
515 + "stash pop", upon failing to apply the stash, refrains from
516 + discarding the stash to avoid information loss. Be more explicit
517 + in the error message.
518 +
519 + The wording may want to get a bit more bikeshedding, but otherwise
520 + it should be OK for 'next'.
521 +
522 +
523 +* bg/install-branch-config-skip-prefix (2014-03-06) 2 commits
524 + - branch: use skip_prefix() in install_branch_config()
525 + - t3200-branch: test setting branch as own upstream
526 +
527 + Will merge to 'next'.
528 +
529 +
530 +* cn/fetch-prune-overlapping-destination (2014-02-28) 2 commits
531 + - fetch: handle overlaping refspecs on --prune
532 + - fetch: add a failing test for prunning with overlapping refspecs
533 +
534 + Protect refs in a hierarchy that can come from more than one remote
535 + hierarcies from incorrect removal by "git fetch --prune".
536 +
537 + Comments?
538 +
539 +
540 +* dd/find-graft-with-sha1-pos (2014-02-27) 1 commit
541 + - commit.c: use the generic "sha1_pos" function for lookup
542 +
543 + Replace a hand-rolled binary search with a call to our generic
544 + binary search helper function.
545 +
546 + Will merge to 'next'.
547 +
548 +
549 +* dd/use-alloc-grow (2014-03-03) 14 commits
550 + - sha1_file.c: use ALLOC_GROW() in pretend_sha1_file()
551 + - read-cache.c: use ALLOC_GROW() in add_index_entry()
552 + - builtin/mktree.c: use ALLOC_GROW() in append_to_tree()
553 + - attr.c: use ALLOC_GROW() in handle_attr_line()
554 + - dir.c: use ALLOC_GROW() in create_simplify()
555 + - reflog-walk.c: use ALLOC_GROW()
556 + - replace_object.c: use ALLOC_GROW() in register_replace_object()
557 + - patch-ids.c: use ALLOC_GROW() in add_commit()
558 + - diffcore-rename.c: use ALLOC_GROW()
559 + - diff.c: use ALLOC_GROW()
560 + - commit.c: use ALLOC_GROW() in register_commit_graft()
561 + - cache-tree.c: use ALLOC_GROW() in find_subtree()
562 + - bundle.c: use ALLOC_GROW() in add_to_ref_list()
563 + - builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()
564 +
565 + Replace open-coded reallocation with ALLOC_GROW() macro.
566 +
567 + Will merge to 'next'.
568 +
569 +
570 +* dk/skip-prefix-scan-only-once (2014-03-03) 1 commit
571 + - skip_prefix(): scan prefix only once
572 +
573 + Updaste implementation of skip_prefix() to scan only once; given
574 + that most "prefix" arguments to the inline function are constant
575 + strings whose strlen() can be determined at the compile time, this
576 + might actually make things worse with a compiler with sufficient
577 + intelligence.
578 +
579 +
580 +* jk/doc-coding-guideline (2014-02-28) 1 commit
581 + (merged to 'next' on 2014-03-06 at c33101d)
582 + + CodingGuidelines: mention C whitespace rules
583 +
584 + Elaborate on a style niggle that has been part of "mimic existing
585 + code".
586 +
587 + Will merge to 'master'.
588 +
589 +
590 +* jk/shallow-update-fix (2014-02-27) 2 commits
591 + - shallow: automatically clean up shallow tempfiles
592 + - shallow: use stat_validity to check for up-to-date file
593 +
594 + Serving objects from a shallow repository needs to write a
595 + temporary file to be used, but the serving upload-pack may not have
596 + write access to the repository which is meant to be read-only.
597 +
598 + Will merge to 'next'.
599 +
600 +
601 +* jl/doc-submodule-update-checkout (2014-02-28) 1 commit
602 + (merged to 'next' on 2014-03-06 at 8cdf5cb)
603 + + submodule update: consistently document the '--checkout' option
604 +
605 + Add missing documentation for "submodule update --checkout".
606 +
607 + Will merge to 'master'.
608 +
609 +
610 +* jn/bisect-coding-style (2014-03-03) 1 commit
611 + (merged to 'next' on 2014-03-06 at e1de2a5)
612 + + git-bisect.sh: fix a few style issues
613 +
614 + Will merge to 'master'.
615 +
616 +
617 +* jn/branch-lift-unnecessary-name-length-limit (2014-03-05) 1 commit
618 + - branch.c: delete size check of newly tracked branch names
619 +
620 + Will merge to 'next'.
621 +
622 +
623 +* mh/simplify-cache-tree-find (2014-03-05) 6 commits
624 + - cache_tree_find(): use path variable when passing over slashes
625 + - cache_tree_find(): remove early return
626 + - cache_tree_find(): remove redundant check
627 + - cache_tree_find(): fix comment formatting
628 + - cache_tree_find(): find the end of path component using strchrnul()
629 + - cache_tree_find(): remove redundant checks
630 +
631 + Will merge to 'next'.
632 +
633 +
634 +* nd/strbuf-inline-styles (2014-03-03) 1 commit
635 + (merged to 'next' on 2014-03-06 at 70b5e56)
636 + + strbuf: style fix -- top opening bracket on a separate line
637 +
638 + Will merge to 'master'.
639 +
640 +
641 +* nd/tag-version-sort (2014-02-27) 1 commit
642 + - tag: support --sort=<spec>
643 +
644 + Allow v1.9.0 sorted before v1.10.0 in "git tag --list" output.
645 +
646 + Will merge to 'next'.
647 +
648 +
649 +* rt/help-pretty-prints-cmd-names (2014-02-28) 1 commit
650 + (merged to 'next' on 2014-03-06 at fc607dc)
651 + + help.c: rename function "pretty_print_string_list"
652 +
653 + Will merge to 'master'.
654 +
655 +
656 +* sg/archive-restrict-remote (2014-02-28) 2 commits
657 + (merged to 'next' on 2014-03-06 at 5fe8998)
658 + + add uploadarchive.allowUnreachable option
659 + + docs: clarify remote restrictions for git-upload-archive
660 +
661 + Allow loosening remote "git archive" invocation security check that
662 + refuses to serve tree-ish not at the tip of any ref.
663 +
664 + Will merge to 'master'.
665
710 - Will discard, tired of waiting for clarification.
711 - $gmane/228294
666
667 +* sh/finish-tmp-packfile (2014-03-03) 2 commits
668 + - finish_tmp_packfile():use strbuf for pathname construction
669 + - Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-packfile
670 + (this branch uses sh/write-pack-file-warning-message-fix.)
671
714 -* jc/format-patch (2013-04-22) 2 commits
715 - - format-patch: --inline-single
716 - - format-patch: rename "no_inline" field
672 + Will merge to 'next'.
673
718 - A new option to send a single patch to the standard output to be
719 - appended at the bottom of a message. I personally have no need for
720 - this, but it was easy enough to cobble together. Tests, docs and
721 - stripping out more MIMEy stuff are left as exercises to interested
722 - parties.
674
675 +* sh/write-pack-file-warning-message-fix (2014-03-03) 1 commit
676 + (merged to 'next' on 2014-03-06 at 1470b0a)
677 + + write_pack_file: use correct variable in diagnostic
678 + (this branch is used by sh/finish-tmp-packfile.)
679
725 -* jk/gitweb-utf8 (2013-04-08) 4 commits
726 - - gitweb: Fix broken blob action parameters on blob/commitdiff pages
727 - - gitweb: Don't append ';js=(0|1)' to external links
728 - - gitweb: Make feed title valid utf8
729 - - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch
680 + A warning from "git pack-objects" were generated by referring to an
681 + incorrect variable when forming the filename that we had trouble
682 + with.
683
731 - Various fixes to gitweb.
684 + Will merge to 'master'.
685
733 - Drew Northup volunteered to take a look into this ($gmane/226216)
734 - but nothing seems to have happened since then.
686
736 - Will discard.
687 +* sr/add--interactive-term-readkey (2014-03-03) 2 commits
688 + (merged to 'next' on 2014-03-06 at 9ca7af8)
689 + + git-add--interactive: warn if module for interactive.singlekey is missing
690 + + git-config: document interactive.singlekey requires Term::ReadKey
691
692 + Will merge to 'master'.
693
739 -* jc/show-branch (2013-06-07) 5 commits
740 - - show-branch: use commit slab to represent bitflags of arbitrary width
741 - - show-branch.c: remove "all_mask"
742 - - show-branch.c: abstract out "flags" operation
743 - - show-branch.c: lift all_mask/all_revs to a global static
744 - - show-branch.c: update comment style
694
746 - Waiting for the final step to lift the hard-limit before sending it out.
695 +* ta/parse-commit-with-skip-prefix (2014-03-04) 1 commit
696 + (merged to 'next' on 2014-03-06 at 0244988)
697 + + commit.c: use skip_prefix() instead of starts_with()
698 +
699 + Will merge to 'master'.
700
748 ---------------------------------------------------
749 -[Cooking]
701
702 * ak/gitweb-fit-image (2014-02-20) 1 commit
752 - - gitweb: Avoid overflowing page body frame with large images
703 + (merged to 'next' on 2014-03-06 at ba8cb50)
704 + + gitweb: Avoid overflowing page body frame with large images
705
706 Instead of allowing an <img> to be shown in whatever size, force
707 scaling it to fit on the page with max-height/max-width css style
708 attributes.
709
758 - Will merge to 'next'.
710 + Will merge to 'master'.
711
712
761 -* da/difftool-git-files (2014-02-25) 2 commits
762 - - WIP: test to protect the previous fix
763 - - difftool: support repositories with .git-files
713 +* da/difftool-git-files (2014-03-05) 2 commits
714 + (merged to 'next' on 2014-03-06 at a563ec1)
715 + + t7800: add a difftool test for .git-files
716 + + difftool: support repositories with .git-files
717
718 "git difftool" misbehaved when the repository is bound to the
719 working tree with the ".git file" mechanism, where a textual
720 file ".git" tells us where it is.
721
769 - Will merge to 'next'.
722 + Will merge to 'master'.
723
724
772 -* jk/commit-dates-parsing-fix (2014-02-24) 5 commits
773 - - log: do not segfault on gmtime errors
774 - - log: handle integer overflow in timestamps
775 - - date: check date overflow against time_t
776 - - fsck: report integer overflow in author timestamps
777 - - t4212: test bogus timestamps with git-log
725 +* jk/commit-dates-parsing-fix (2014-03-07) 6 commits
726 + (merged to 'next' on 2014-03-07 at 01e9d92)
727 + + show_ident_date: fix tz range check
728 + (merged to 'next' on 2014-03-06 at dd641e2)
729 + + log: do not segfault on gmtime errors
730 + + log: handle integer overflow in timestamps
731 + + date: check date overflow against time_t
732 + + fsck: report integer overflow in author timestamps
733 + + t4212: test bogus timestamps with git-log
734
779 - Will merge to 'next'.
735 + Will merge to 'master'.
736
737
738 * jk/diff-filespec-cleanup (2014-02-24) 1 commit
@@ -786,40 +742,47 @@ of the repositories listed at
742
743
744 * jk/remote-pushremote-config-reading (2014-02-24) 1 commit
789 - - remote: handle pushremote config in any order
745 + (merged to 'next' on 2014-03-06 at 9e71ecb)
746 + + remote: handle pushremote config in any order
747
791 - Will merge to 'next'.
748 + Will merge to 'master'.
749
750
751 * jk/repack-pack-keep-objects (2014-03-03) 1 commit
752 - repack: add `repack.packKeptObjects` config var
753
754 + Will merge to 'next'.
755 +
756
757 * jm/stash-doc-k-for-keep (2014-02-24) 1 commit
799 - - stash doc: mention short form -k in save description
758 + (merged to 'next' on 2014-03-06 at ddd8e48)
759 + + stash doc: mention short form -k in save description
760
801 - Will merge to 'next'.
761 + Will merge to 'master'.
762
763
764 * jn/am-doc-hooks (2014-02-24) 1 commit
805 - - am doc: add a pointer to relevant hooks
765 + (merged to 'next' on 2014-03-06 at 5c1c372)
766 + + am doc: add a pointer to relevant hooks
767
807 - Will merge to 'next'.
768 + Will merge to 'master'.
769
770
771 * mh/object-code-cleanup (2014-02-24) 4 commits
811 - - sha1_file.c: document a bunch of functions defined in the file
812 - - sha1_file_name(): declare to return a const string
813 - - find_pack_entry(): document last_found_pack
814 - - replace_object: use struct members instead of an array
772 + (merged to 'next' on 2014-03-06 at d6b3867)
773 + + sha1_file.c: document a bunch of functions defined in the file
774 + + sha1_file_name(): declare to return a const string
775 + + find_pack_entry(): document last_found_pack
776 + + replace_object: use struct members instead of an array
777
816 - Will merge to 'next'.
778 + Will merge to 'master'.
779
780
781 * nd/i18n-progress (2014-02-24) 1 commit
820 - - i18n: mark all progress lines for translation
782 + (merged to 'next' on 2014-03-06 at 600fd3e)
783 + + i18n: mark all progress lines for translation
784
822 - Will merge to 'next'.
785 + Will merge to 'master'.
786
787
788 * nd/sha1-file-delta-stack-leakage-fix (2014-02-24) 1 commit
@@ -831,6 +794,8 @@ of the repositories listed at
794 * tc/commit-dry-run-exit-status-tests (2014-02-24) 1 commit
795 - demonstrate git-commit --dry-run exit code behaviour
796
797 + Will merge to 'next'.
798 +
799
800 * fc/transport-helper-fixes (2014-02-24) 7 commits
801 - remote-bzr: support the new 'force' option
@@ -858,45 +823,50 @@ of the repositories listed at
823
824
825 * jk/http-no-curl-easy (2014-02-18) 1 commit
861 - - http: never use curl_easy_perform
826 + (merged to 'next' on 2014-03-06 at 56d3f6f)
827 + + http: never use curl_easy_perform
828
829 Avoid use of the curl-easy family of functions, which interferes
830 with connection reuse in a negative way.
831
866 - Will merge to 'next'.
832 + Will merge to 'master' and then to 'maint'.
833
834
835 * jk/janitorial-fixes (2014-02-18) 5 commits
870 - - open_istream(): do not dereference NULL in the error case
871 - - builtin/mv: don't use memory after free
872 - - utf8: use correct type for values in interval table
873 - - utf8: fix iconv error detection
874 - - notes-utils: handle boolean notes.rewritemode correctly
836 + (merged to 'next' on 2014-03-06 at dac2de6)
837 + + open_istream(): do not dereference NULL in the error case
838 + + builtin/mv: don't use memory after free
839 + + utf8: use correct type for values in interval table
840 + + utf8: fix iconv error detection
841 + + notes-utils: handle boolean notes.rewritemode correctly
842
876 - Will merge to 'next'.
843 + Will merge to 'master'.
844
845
846 * ks/config-file-stdin (2014-02-18) 4 commits
880 - - config: teach "git config --file -" to read from the standard input
881 - - config: change git_config_with_options() interface
882 - - builtin/config.c: rename check_blob_write() -> check_write()
883 - - config: disallow relative include paths from blobs
847 + (merged to 'next' on 2014-03-06 at 3e77313)
848 + + config: teach "git config --file -" to read from the standard input
849 + + config: change git_config_with_options() interface
850 + + builtin/config.c: rename check_blob_write() -> check_write()
851 + + config: disallow relative include paths from blobs
852
885 - Will merge to 'next'.
853 + Will merge to 'master'.
854
855
856 * lb/contrib-contacts-looser-diff-parsing (2014-02-18) 1 commit
889 - - git-contacts: do not fail parsing of good diffs
857 + (merged to 'next' on 2014-03-06 at 1cc4ffe)
858 + + git-contacts: do not fail parsing of good diffs
859
891 - Will merge to 'next'.
860 + Will merge to 'master'.
861
862
863 * mh/replace-refs-variable-rename (2014-02-28) 3 commits
895 - - Document some functions defined in object.c
896 - - Add docstrings for lookup_replace_object() and do_lookup_replace_object()
897 - - rename read_replace_refs to check_replace_refs
864 + (merged to 'next' on 2014-03-06 at 70bf89b)
865 + + Document some functions defined in object.c
866 + + Add docstrings for lookup_replace_object() and do_lookup_replace_object()
867 + + rename read_replace_refs to check_replace_refs
868
899 - Will merge to 'next'.
869 + Will merge to 'master'.
870
871
872 * nd/commit-editor-cleanup (2014-02-25) 3 commits
@@ -906,28 +876,32 @@ of the repositories listed at
876
877 "git commit --cleanup=<mode>" learned a new mode, scissors.
878
879 + Will merge to 'next'.
880 +
881
882 * nd/no-more-fnmatch (2014-02-20) 4 commits
911 - - actually remove compat fnmatch source code
912 - - stop using fnmatch (either native or compat)
913 - - Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch"
914 - - use wildmatch() directly without fnmatch() wrapper
883 + (merged to 'next' on 2014-03-06 at f0b8f12)
884 + + actually remove compat fnmatch source code
885 + + stop using fnmatch (either native or compat)
886 + + Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch"
887 + + use wildmatch() directly without fnmatch() wrapper
888
889 We started using wildmatch() in place of fnmatch(3); complete the
890 process and stop using fnmatch(3).
891
919 - Will merge to 'next'.
892 + Will merge to 'master'.
893
894
895 * nd/reset-setup-worktree (2014-02-18) 1 commit
923 - - reset: optionally setup worktree and refresh index on --mixed
896 + (merged to 'next' on 2014-03-06 at d93f20a)
897 + + reset: optionally setup worktree and refresh index on --mixed
898
899 "git reset" needs to refresh the index when working in a working
900 tree (it can also be used to match the index to the HEAD in an
901 otherwise bare repository), but it failed to set up the working
902 tree properly, causing GIT_WORK_TREE to be ignored.
903
930 - Will merge to 'next'.
904 + Will merge to 'master'.
905
906
907 * po/git-help-user-manual (2014-02-18) 1 commit
@@ -935,34 +909,41 @@ of the repositories listed at
909
910 I am not sure if this is even needed.
911
912 + Will discard.
913 +
914
915 * rt/links-for-asciidoctor (2014-02-20) 1 commit
940 - - Documentation: fix documentation AsciiDoc links for external urls
916 + (merged to 'next' on 2014-03-06 at 547f13d)
917 + + Documentation: fix documentation AsciiDoc links for external urls
918
942 - Will merge to 'next'.
919 + Will merge to 'master'.
920
921
922 * tg/index-v4-format (2014-02-24) 3 commits
946 - - read-cache: add index.version config variable
947 - - test-lib: allow setting the index format version
948 - - introduce GIT_INDEX_VERSION environment variable
923 + (merged to 'next' on 2014-03-06 at d4ca5a8)
924 + + read-cache: add index.version config variable
925 + + test-lib: allow setting the index format version
926 + + introduce GIT_INDEX_VERSION environment variable
927
950 - Will merge to 'next'.
928 + Will merge to 'master'.
929
930
931 * tr/diff-submodule-no-reuse-worktree (2014-02-18) 1 commit
954 - - diff: do not reuse_worktree_file for submodules
932 + (merged to 'next' on 2014-03-06 at ac8008f)
933 + + diff: do not reuse_worktree_file for submodules
934
935 "git diff --external-diff" incorrectly fed the submodule directory
936 in the working tree to the external diff driver when it knew it is
937 the same as one of the versions being compared.
938
960 - Will merge to 'next'.
939 + Will merge to 'master'.
940
941
963 -* nd/multiple-work-trees (2014-02-19) 26 commits
964 - - FIXUP???
942 +* nd/multiple-work-trees (2014-03-06) 28 commits
943 + - FIXUP: minimum compilation fix
944 + - count-objects: report unused files in $GIT_DIR/repos/...
945 - gc: support prune --repos
946 + - gc: style change -- no SP before closing bracket
947 - prune: strategies for linked checkouts
948 - checkout: detach if the branch is already checked out elsewhere
949 - checkout: clean up half-prepared directories in --to mode
@@ -988,7 +969,7 @@ of the repositories listed at
969 - Convert git_snpath() to strbuf_git_path()
970 - path.c: make get_pathname() return strbuf instead of static buffer
971
991 - The tip commit needs to be dropped; the series needs a serious review.
972 + The series needs a serious review.
973
974
975 * ks/tree-diff-nway (2014-03-04) 19 commits
@@ -1011,7 +992,6 @@ of the repositories listed at
992 - tree-diff: no need to manually verify that there is no mode change for a path
993 - combine-diff: move changed-paths scanning logic into its own function
994 - combine-diff: move show_log_first logic/action out of paths scanning
1014 - (this branch uses ks/combine-diff.)
995
996 Instead of running N pair-wise diff-trees when inspecting a
997 N-parent merge, find the set of paths that were touched by walking
@@ -1021,26 +1001,17 @@ of the repositories listed at
1001 2-way diff-tree, which is very nice.
1002
1003
1024 -* nd/daemonize-gc (2014-02-10) 2 commits
1025 - (merged to 'next' on 2014-02-25 at f592335)
1026 - + gc: config option for running --auto in background
1027 - + daemon: move daemonize() to libgit.a
1028 -
1029 - Originally merged to 'next' on 2014-02-20
1030 -
1031 - Allow running "gc --auto" in the background.
1032 -
1033 - Will merge to 'master'.
1034 -
1035 -
1036 -* nd/gitignore-trailing-whitespace (2014-02-10) 2 commits
1037 - - dir: ignore trailing spaces in exclude patterns
1038 - - dir: warn about trailing spaces in exclude patterns
1004 +* nd/gitignore-trailing-whitespace (2014-03-11) 3 commits
1005 + (merged to 'next' on 2014-03-11 at ccdba51)
1006 + + t0008: skip trailing space test on Windows
1007 + (merged to 'next' on 2014-03-06 at f649a34)
1008 + + dir: ignore trailing spaces in exclude patterns
1009 + + dir: warn about trailing spaces in exclude patterns
1010
1011 Warn and then ignore trailing whitespaces in .gitignore files,
1012 unless they are quoted for fnmatch(3), e.g. "path\ ".
1013
1043 - Will merge to 'next'.
1014 + Will merge to 'master'.
1015
1016
1017 * nd/log-show-linear-break (2014-02-10) 1 commit
@@ -1049,38 +1020,29 @@ of the repositories listed at
1020 Attempts to show where a single-strand-of-pearls break in "git log"
1021 output.
1022
1052 - "git log --no-merges --show-linear-break" does not seem to work
1053 - well (tried on range "pu~10..pu" or something like that).
1023 + Will merge to 'next'.
1024
1025
1026 * ss/completion-rec-sub-fetch-push (2014-02-11) 1 commit
1057 - - completion: teach --recurse-submodules to fetch, pull and push
1027 + (merged to 'next' on 2014-03-06 at b5bf463)
1028 + + completion: teach --recurse-submodules to fetch, pull and push
1029
1059 - Will merge to 'next'.
1030 + Will merge to 'master'.
1031
1032
1033 * jh/note-trees-record-blobs (2014-02-20) 1 commit
1063 - - notes: disallow reusing non-blob as a note object
1034 + (merged to 'next' on 2014-03-06 at f46852d)
1035 + + notes: disallow reusing non-blob as a note object
1036
1037 "git notes -C <blob>" should not take an object that is not a blob.
1038
1067 - Will merge to 'next'.
1068 -
1069 -
1070 -* jk/run-network-tests-by-default (2014-02-14) 1 commit
1071 - (merged to 'next' on 2014-02-25 at 62a8ad0)
1072 - + tests: turn on network daemon tests by default
1073 -
1074 - Originally merged to 'next' on 2014-02-20
1075 -
1076 - Teach "make test" to run networking tests when possible by default.
1077 -
1039 Will merge to 'master'.
1040
1041
1042 * jc/check-attr-honor-working-tree (2014-02-06) 2 commits
1082 - - check-attr: move to the top of working tree when in non-bare repository
1083 - - t0003: do not chdir the whole test process
1043 + (merged to 'next' on 2014-03-06 at 960d679)
1044 + + check-attr: move to the top of working tree when in non-bare repository
1045 + + t0003: do not chdir the whole test process
1046
1047 "git check-attr" when (trying to) work on a repository with a
1048 working tree did not work well when the working tree was specified
@@ -1089,36 +1051,11 @@ of the repositories listed at
1051 The command also works in a bare repository but it reads from the
1052 (possibly stale, irrelevant and/or nonexistent) index, which may
1053 need to be fixed to read from HEAD, but that is a completely
1092 - separate issue. As a related tangentto this separate issue, we may
1093 - want to also fix "check-ignore", which refuses to work in a bare
1094 - repository, to also operate in a bare one.
1095 -
1096 - Will merge to 'next'.
1097 -
1098 -
1099 -* jk/makefile (2014-02-05) 16 commits
1100 - - FIXUP
1101 - - move LESS/LV pager environment to Makefile
1102 - - Makefile: teach scripts to include make variables
1103 - - FIXUP
1104 - - Makefile: auto-build C strings from make variables
1105 - - Makefile: drop *_SQ variables
1106 - - FIXUP
1107 - - Makefile: add c-quote helper function
1108 - - Makefile: introduce sq function for shell-quoting
1109 - - Makefile: always create files via make-var
1110 - - Makefile: store GIT-* sentinel files in MAKE/
1111 - - Makefile: prefer printf to echo for GIT-*
1112 - - Makefile: use tempfile/mv strategy for GIT-*
1113 - - Makefile: introduce make-var helper function
1114 - - Makefile: fix git-instaweb dependency on gitweb
1115 - - Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
1116 -
1117 - Simplify the Makefile rules and macros that exist primarily for
1118 - quoting purposes, and make it easier to robustly express the
1119 - dependency rules.
1054 + separate issue. As a related tangent to this separate issue, we
1055 + may want to also fix "check-ignore", which refuses to work in a
1056 + bare repository, to also operate in a bare one.
1057
1121 - Expecting a reroll.
1058 + Will merge to 'master'.
1059
1060
1061 * tr/remerge-diff (2014-02-26) 5 commits
@@ -1138,25 +1075,6 @@ of the repositories listed at
1075 'master'.
1076
1077
1141 -* ks/combine-diff (2014-02-24) 6 commits
1142 - (merged to 'next' on 2014-02-25 at 69e5a87)
1143 - + tests: add checking that combine-diff emits only correct paths
1144 - + combine-diff: simplify intersect_paths() further
1145 - + combine-diff: combine_diff_path.len is not needed anymore
1146 - + combine-diff: optimize combine_diff_path sets intersection
1147 - + diff test: add tests for combine-diff with orderfile
1148 - + diffcore-order: export generic ordering interface
1149 - (this branch is used by ks/tree-diff-nway.)
1150 -
1151 - Originally merged to 'next' on 2014-02-20
1152 -
1153 - Teach combine-diff to honour the path-output-order imposed by
1154 - diffcore-order, and optimize how matching paths are found in
1155 - the N-way diffs made with parents.
1156 -
1157 - Will merge to 'master'.
1158 -
1159 -
1078 * lt/request-pull (2014-02-25) 5 commits
1079 - request-pull: resurrect "pretty refname" feature
1080 - request-pull: test updates
@@ -1167,23 +1085,21 @@ of the repositories listed at
1085 Needs doc update but otherwise it should be ready for 'next'.
1086
1087
1170 -* cc/interpret-trailers (2014-02-20) 14 commits
1088 +* cc/interpret-trailers (2014-03-07) 11 commits
1089 - Documentation: add documentation for 'git interpret-trailers'
1172 - - trailer: add tests for commands using env variables
1173 - - trailer: set author and committer env variables
1174 - - trailer: add tests for trailer command
1090 + - trailer: add tests for commands in config file
1091 - trailer: execute command from 'trailer.<name>.command'
1176 - - trailer: if no input file is passed, read from stdin
1092 - trailer: add tests for "git interpret-trailers"
1093 - trailer: add interpret-trailers command
1094 - trailer: put all the processing together and print
1180 - - trailer: parse trailers from input file
1095 + - trailer: parse trailers from stdin
1096 - trailer: process command line trailer arguments
1097 - trailer: read and process config information
1183 - - trailer: process trailers from file and arguments
1184 - - trailer: add data structures and basic functions for commit trailers
1098 + - trailer: process trailers from stdin and arguments
1099 + - trailers: add data structures and basic functions
1100
1186 - Will pick up the reroll but not today.
1101 + A new filter to programatically edit the tail end of the commit log
1102 + messages.
1103
1104
1105 * bl/blame-full-history (2014-01-14) 1 commit
@@ -1202,50 +1118,6 @@ of the repositories listed at
1118 Will discard.
1119
1120
1205 -* jk/warn-on-object-refname-ambiguity (2014-01-09) 6 commits
1206 - - get_sha1: drop object/refname ambiguity flag
1207 - - get_sha1: speed up ambiguous 40-hex test
1208 - - FIXUP: teach DO_FOR_EACH_NO_RECURSE to prime_ref_dir()
1209 - - refs: teach for_each_ref a flag to avoid recursion
1210 - - cat-file: fix a minor memory leak in batch_objects
1211 - - cat-file: refactor error handling of batch_objects
1212 -
1213 - Expecting a reroll.
1214 -
1215 -
1216 -* ap/remote-hg-skip-null-bookmarks (2014-01-02) 1 commit
1217 - - remote-hg: do not fail on invalid bookmarks
1218 -
1219 - Reported to break tests ($gmane/240005)
1220 - Expecting a reroll.
1221 -
1222 -
1223 -* cc/starts-n-ends-with-endgame (2013-12-05) 1 commit
1224 - (merged to 'next' on 2014-02-25 at 473e143)
1225 - + strbuf: remove prefixcmp() and suffixcmp()
1226 -
1227 - Originally merged to 'next' on 2014-01-07
1228 -
1229 - Endgame for the cc/starts-n-ends-with topic; this needs to be
1230 - evil-merged with other topics that introduce new uses of
1231 - prefix/suffix-cmp functions.
1232 -
1233 - Will merge to 'master' for 2.0.0
1234 -
1235 -
1236 -* gj/push-more-verbose-advice (2013-11-13) 1 commit
1237 - (merged to 'next' on 2014-02-25 at 1cd10b0)
1238 - + push: switch default from "matching" to "simple"
1239 -
1240 - Originally merged to 'next' on 2013-11-21
1241 -
1242 - Explain 'simple' and 'matching' in "git push" advice message; the
1243 - topmost patch is a rebase of jc/push-2.0-default-to-simple on top
1244 - of it.
1245 -
1246 - Will merge to 'master' for 2.0.0
1247 -
1248 -
1121 * tr/merge-recursive-index-only (2014-02-05) 3 commits
1122 - merge-recursive: -Xindex-only to leave worktree unchanged
1123 - merge-recursive: internal flag to avoid touching the worktree
@@ -1254,56 +1126,6 @@ of the repositories listed at
1126
1127 Will hold.
1128
1257 -
1258 -* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit
1259 - (merged to 'next' on 2014-02-25 at 9e5c0d2)
1260 - + git add: -u/-A now affects the entire working tree
1261 -
1262 - Originally merged to 'next' on 2013-12-06
1263 -
1264 - Will merge to 'master' for 2.0.0
1265 -
1266 -
1267 -* jc/core-checkstat-2.0 (2013-05-06) 1 commit
1268 - (merged to 'next' on 2014-02-25 at 62f6aeb)
1269 - + core.statinfo: remove as promised in Git 2.0
1270 -
1271 - Originally merged to 'next' on 2013-12-06
1272 -
1273 - Will merge to 'master' for 2.0.0
1274 -
1275 -
1276 -* jc/push-2.0-default-to-simple (2013-06-18) 1 commit
1277 - (merged to 'next' on 2014-02-25 at 1f0e178)
1278 - + push: switch default from "matching" to "simple"
1279 -
1280 - Originally merged to 'next' on 2013-12-06
1281 -
1282 - Will merge to 'master' for 2.0.0
1283 -
1284 -
1285 -* jc/add-2.0-ignore-removal (2013-04-22) 1 commit
1286 - (merged to 'next' on 2014-02-25 at a0d018a)
1287 - + git add <pathspec>... defaults to "-A"
1288 -
1289 - Originally merged to 'next' on 2013-12-06
1290 -
1291 - Updated endgame for "git add <pathspec>" that defaults to "--all"
1292 - aka "--no-ignore-removal".
1293 -
1294 - Will merge to 'master' for 2.0.0
1295 -
1296 -
1297 -* jc/hold-diff-remove-q-synonym-for-no-deletion (2013-07-19) 1 commit
1298 - (merged to 'next' on 2014-02-25 at ccfff88)
1299 - + diff: remove "diff-files -q" in a version of Git in a distant future
1300 -
1301 - Originally merged to 'next' on 2013-12-06
1302 -
1303 - Remove deprecated "-q" option "git diff-files".
1304 -
1305 - Will cook in 'next' until a distant future.
1306 -
1129 --------------------------------------------------
1130 [Discarded]
1131
@@ -1345,6 +1167,3 @@ of the repositories listed at
1167 Code refactoring.
1168
1169 Now part of ks/tree-diff-nway.
1348 -
1349 -
1350 -