What's cooking (2013/07 #02)

Junio C Hamano committed Jul 5, 2013 at 01:55 UTC 5b867dd99b61b32239ce00b557e5fc3a0b5c648d
1 file changed +162 -314
whats-cooking.txt
+162 -314
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Jul 2013, #01; Mon, 1)
4 -X-master-at: 8c4e4ec3ff053331c845331645a437b01b1f0de6
5 -X-next-at: 27cfd277767dfcdf40973f837d71a02664df5d01
3 +Subject: What's cooking in git.git (Jul 2013, #02; Fri, 5)
4 +X-master-at: f8abaebab3fe1a1b873f9636ea410ac4007c8fa8
5 +X-next-at: 0346b8459f4201954d9ada6dccc8e6ff9f59269c
6
7 -What's cooking in git.git (Jul 2013, #01; Mon, 1)
7 +What's cooking in git.git (Jul 2013, #02; Fri, 5)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking. Commits prefixed with
@@ -24,256 +24,91 @@ of the repositories listed at
24 --------------------------------------------------
25 [Graduated to "master"]
26
27 -* ap/diff-ignore-blank-lines (2013-06-19) 1 commit
28 - (merged to 'next' on 2013-06-23 at 9cf8e03)
29 - + diff: add --ignore-blank-lines option
30 -
31 - "git diff" learned a mode that ignores hunks whose change consists
32 - only of additions and removals of blank lines, which is the same as
33 - "diff -B" (ignore blank lines) of GNU diff.
34 -
35 -
36 -* ap/rebase-multiple-fixups (2013-06-27) 1 commit
37 - (merged to 'next' on 2013-06-28 at c3d1b1e)
38 - + rebase -i: handle fixup! fixup! in --autosquash
39 -
40 - Having multiple "fixup!" on a line in the rebase instruction sheet
41 - did not work very well with "git rebase -i --autosquash".
42 -
43 -
44 -* ed/color-prompt (2013-06-26) 5 commits
45 - (merged to 'next' on 2013-06-28 at 334892c)
46 - + git-prompt.sh: add missing information in comments
47 - + git-prompt.sh: do not print duplicate clean color code
48 - + t9903: remove redundant tests
49 - + git-prompt.sh: refactor colored prompt code
50 - + t9903: add tests for git-prompt pcmode
51 -
52 - Code clean-up for in-prompt status script (in contrib/).
53 -
27 +* tr/test-v-and-v-subtest-only (2013-06-29) 9 commits
28 + (merged to 'next' on 2013-06-30 at 1c5fac1)
29 + + perf-lib: fix start/stop of perf tests
30 + (merged to 'next' on 2013-06-26 at 8ff4d84)
31 + + test-lib: support running tests under valgrind in parallel
32 + + test-lib: allow prefixing a custom string before "ok N" etc.
33 + + test-lib: valgrind for only tests matching a pattern
34 + + test-lib: verbose mode for only tests matching a pattern
35 + + test-lib: self-test that --verbose works
36 + + test-lib: rearrange start/end of test_expect_* and test_skip
37 + + test-lib: refactor $GIT_SKIP_TESTS matching
38 + + test-lib: enable MALLOC_* for the actual tests
39
55 -* ft/doc-git-transport (2013-06-26) 1 commit
56 - (merged to 'next' on 2013-06-27 at 4a7d248)
57 - + documentation: add git:// transport security notice
40 + Allows N instances of tests run in parallel, each running 1/N parts
41 + of the test suite under Valgrind, to speed things up.
42
43 +--------------------------------------------------
44 +[New Topics]
45
60 -* jc/topo-author-date-sort (2013-06-21) 9 commits
61 - (merged to 'next' on 2013-06-26 at 9283719)
62 - + t6003: add --author-date-order test
63 - + topology tests: teach a helper to set author dates as well
64 - + t6003: add --date-order test
65 - + topology tests: teach a helper to take abbreviated timestamps
66 - + t/lib-t6000: style fixes
67 - (merged to 'next' on 2013-06-15 at ad4fb48)
68 - + log: --author-date-order
69 - + sort-in-topological-order: use prio-queue
70 - + prio-queue: priority queue of pointers to structs
71 - + toposort: rename "lifo" field
72 - (this branch uses jk/commit-info-slab; is tangled with jc/show-branch.)
73 -
74 - "git log" learned the "--author-date-order" option, with which the
75 - output is topologically sorted and commits in parallel histories
76 - are shown intermixed together based on the author timestamp.
46 +* jc/t1512-fix (2013-07-01) 2 commits
47 + - get_short_sha1(): correctly disambiguate type-limited abbreviation
48 + - t1512: correct leftover constants from earlier edition
49
50 + A test that should have failed but didn't revealed a bug that needs
51 + to be corrected.
52
79 -* jk/commit-info-slab (2013-06-07) 3 commits
80 - (merged to 'next' on 2013-06-15 at 908ab93)
81 - + commit-slab: introduce a macro to define a slab for new type
82 - + commit-slab: avoid large realloc
83 - + commit: allow associating auxiliary info on-demand
84 - (this branch is used by jc/show-branch and jc/topo-author-date-sort.)
53 + Will merge to 'next'.
54
86 - Allow adding custom information to commit objects in order to
87 - represent unbound number of flag bits etc.
55
56 +* jk/fetch-pack-many-refs (2013-07-02) 3 commits
57 + - fetch-pack: avoid quadratic behavior in rev_list_push
58 + - commit.c: make compare_commits_by_commit_date global
59 + - fetch-pack: avoid quadratic list insertion in mark_complete
60
90 -* jk/submodule-subdirectory-ok (2013-06-17) 6 commits
91 - (merged to 'next' on 2013-06-23 at f17fb37)
92 - + submodule: drop the top-level requirement
93 - + rev-parse: add --prefix option
94 - + submodule: show full path in error message
95 - + t7403: add missing && chaining
96 - + t7403: modernize style
97 - + t7401: make indentation consistent
98 -
99 - Allow various subcommands of "git submodule" to be run not from the
100 - top of the working tree of the superproject.
101 -
102 -
103 -* kb/am-deprecate-resolved (2013-06-27) 1 commit
104 - (merged to 'next' on 2013-06-28 at 177f491)
105 - + am: replace uses of --resolved with --continue
106 -
107 - Promote "git am --continue" over "git am --resolved" for UI
108 - consistency.
109 -
110 -
111 -* mh/loose-refs-race-with-pack-ref (2013-06-19) 3 commits
112 - (merged to 'next' on 2013-06-23 at 2099d0b)
113 - + resolve_ref_unsafe(): close race condition reading loose refs
114 - + resolve_ref_unsafe(): handle the case of an SHA-1 within loop
115 - + resolve_ref_unsafe(): extract function handle_missing_loose_ref()
116 -
117 - We read loose and packed rerferences in two steps, but after
118 - deciding to read a loose ref but before actually opening it to read
119 - it, another process racing with us can unlink it, which would cause
120 - us to barf. Update the codepath to retry when such a race is
121 - detected.
122 -
123 -
124 -* mh/ref-races (2013-06-20) 11 commits
125 - (merged to 'next' on 2013-06-23 at 71f1a18)
126 - + for_each_ref: load all loose refs before packed refs
127 - + get_packed_ref_cache: reload packed-refs file when it changes
128 - + add a stat_validity struct
129 - + Extract a struct stat_data from cache_entry
130 - + packed_ref_cache: increment refcount when locked
131 - + do_for_each_entry(): increment the packed refs cache refcount
132 - + refs: manage lifetime of packed refs cache via reference counting
133 - + refs: implement simple transactions for the packed-refs file
134 - + refs: wrap the packed refs cache in a level of indirection
135 - + pack_refs(): split creation of packed refs and entry writing
136 - + repack_without_ref(): split list curation and entry writing
137 - (this branch is used by mh/ref-races-optim-invalidate-cached.)
138 -
139 - "git pack-refs" that races with new ref creation or deletion have
140 - been susceptible to lossage of refs under right conditions, which
141 - has been tightened up.
142 -
143 -
144 -* nk/name-rev-abbreviated-refs (2013-06-18) 1 commit
145 - (merged to 'next' on 2013-06-23 at 2ec9e05)
146 - + name-rev: allow to specify a subpath for --refs option
147 -
148 - "git name-rev --refs=tags/v*" were forbidden, which was a bit
149 - inconvenient (you had to give a pattern to match refs fully, like
150 - --refs=refs/tags/v*).
151 -
152 -
153 -* rr/column-doc (2013-06-26) 1 commit
154 - (merged to 'next' on 2013-06-27 at 99497e1)
155 - + column doc: rewrite documentation for column.ui
156 -
157 -
158 -* rr/remote-branch-config-refresh (2013-06-23) 9 commits
159 - (merged to 'next' on 2013-06-26 at 48746e1)
160 - + t/t5505-remote: test multiple push/pull in remotes-file
161 - + ls-remote doc: don't encourage use of branches-file
162 - + ls-remote doc: rewrite <repository> paragraph
163 - + ls-remote doc: fix example invocation on git.git
164 - + t/t5505-remote: test url-with-# in branches-file
165 - + remote: remove dead code in read_branches_file()
166 - + t/t5505-remote: use test_path_is_missing
167 - + t/t5505-remote: test push-refspec in branches-file
168 - + t/t5505-remote: modernize style
169 -
170 - The original way to specify remote repository using .git/branches/
171 - used to have a nifty feature. The code to support the feature was
172 - still in a function but the caller was changed not to call it 5
173 - years ago, breaking that feature and leaving the supporting code
174 - unreachable.
175 -
176 -
177 -* sb/mailmap-merijn-brand (2013-06-25) 1 commit
178 - (merged to 'next' on 2013-06-27 at 2dd247a)
179 - + .mailmap: Map "H.Merijn Brand" to "H. Merijn Brand"
180 -
181 -
182 -* sg/bash-prompt (2013-06-24) 16 commits
183 - (merged to 'next' on 2013-06-27 at 09fda6a)
184 - + bash prompt: mention that PROMPT_COMMAND mode is faster
185 - + bash prompt: avoid command substitution when finalizing gitstring
186 - + bash prompt: avoid command substitution when checking for untracked files
187 - + bash prompt: use bash builtins to check stash state
188 - + bash prompt: use bash builtins to check for unborn branch for dirty state
189 - + bash prompt: combine 'git rev-parse' for detached head
190 - + bash prompt: combine 'git rev-parse' executions in the main code path
191 - + bash prompt: use bash builtins to find out current branch
192 - + bash prompt: use bash builtins to find out rebase state
193 - + bash prompt: run 'git rev-parse --git-dir' directly instead of __gitdir()
194 - + bash prompt: return early from __git_ps1() when not in a git repository
195 - + bash prompt: print unique detached HEAD abbreviated object name
196 - + bash prompt: add a test for symbolic link symbolic refs
197 - + completion, bash prompt: move __gitdir() tests to completion test suite
198 - + bash prompt: use 'write_script' helper in interactive rebase test
199 - + bash prompt: fix redirection coding style in tests
200 -
201 -
202 -* wk/doc-in-linux-3.x-era (2013-06-22) 4 commits
203 - (merged to 'next' on 2013-06-26 at a24e9e6)
204 - + Documentation: Update 'linux-2.6.git' -> 'linux.git'
205 - + Documentation: Update the NFS remote examples to use the staging repo
206 - + doc/clone: Pick more compelling paths for the --reference example
207 - + doc/clone: Remove the '--bare -l -s' example
208 -
209 - Update documentation to match more recent realities.
210 -
211 ---------------------------------------------------
212 -[New Topics]
61 + Fetching between repositories with many refs employed O(n^2)
62 + algorithm to match up the common objects, which has been corrected.
63
214 -* pb/stash-refuse-to-kill (2013-07-01) 2 commits
215 - - git stash: avoid data loss when "git stash save" kills a directory
216 - - treat_directory(): do not declare submodules to be untracked
64 + Will merge to 'next'.
65
218 - "git stash save" is not just about "saving" the local changes, but
219 - also is to restore the working tree state to that of HEAD. If you
220 - changed a non-directory into a directory in the local change, you
221 - may have untracked files in that directory, which have to be killed
222 - while doing so, unless you run it with --include-untracked. Teach
223 - the command to detect and error out before spreading the damage.
66
225 - This needed a small fix to "ls-files --killed".
67 +* jk/format-patch-from (2013-07-03) 2 commits
68 + - teach format-patch to place other authors into in-body "From"
69 + - pretty.c: drop const-ness from pretty_print_context
70
227 - Will merge to 'next' after waiting for a few days.
71 + "git format-patch" learned "--from[=whom]" option, which sets the
72 + "From: " header to the specified person (or the person who runs the
73 + command, if "=whom" part is missing) and move the original author
74 + information to an in-body From: header as necessary.
75
76 + Will merge to 'next'.
77
230 -* es/contacts (2013-06-30) 4 commits
231 - - contrib: contacts: interpret committish akin to format-patch
232 - - contrib: contacts: add ability to parse from committish
233 - - contrib: contacts: add support for multiple patches
234 - - contrib: add git-contacts helper
78
236 - Waiting for more discussion.
79 +* ms/remote-tracking-branches-in-doc (2013-07-03) 1 commit
80 + - Change "remote tracking" to "remote-tracking"
81
82 + Will merge to 'next'.
83
239 -* jk/bash-completion (2013-06-30) 2 commits
240 - (merged to 'next' on 2013-07-01 at 6daca44)
241 - + completion: learn about --man-path
242 - + completion: handle unstuck form of base git options
84
244 - Will merge to 'master'.
85 +* tf/gitweb-extra-breadcrumbs (2013-07-04) 1 commit
86 + - gitweb: allow extra breadcrumbs to prefix the trail
87
88 + An Gitweb installation that is a part of larger site can optionally
89 + show extra links that point at the levels higher than the Gitweb
90 + pages itself in the link hierarchy of pages.
91
247 -* cp/submodule-custom-update (2013-07-01) 1 commit
248 - - submodule update: allow custom command to update submodule working tree
92 + Will merge to 'next'.
93
250 - In addition to the choice from "rebase, merge, or checkout-detach",
251 - allow a custom command to be used in "submodule update" to update
252 - the working tree of submodules.
94
254 - Needs to be reviewed.
95 +* bc/commit-invalid-utf8 (2013-07-04) 2 commits
96 + - commit: reject overlong UTF-8 sequences
97 + - commit: reject invalid UTF-8 codepoints
98
99 + Will merge to 'next'.
100
257 -* mv/merge-ff-tristate (2013-07-01) 1 commit
258 - - merge: handle --ff/--no-ff/--ff-only as a tri-state option
101
260 - The configuration variable "merge.ff" was cleary a tri-state to
261 - choose one from "favor fast-forward when possible", "always create
262 - a merge even when the history could fast-forward" and "do not
263 - create any merge, only update when the history fast-forwards", but
264 - the command line parser did not implement the usual convention of
265 - "last one wins, and command line overrides the configuration"
266 - correctly.
102 +* bc/send-email-use-port-as-separate-param (2013-07-04) 1 commit
103 + - send-email: provide port separately from hostname
104
268 - Needs to be reviewed.
105 + Will merge to 'next'.
106
107
271 -* rr/rebase-reflog-message-reword (2013-06-23) 2 commits
272 - - rebase -i: use a better reflog message
273 - - rebase: use a better reflog message
274 - (this branch uses rr/rebase-checkout-reflog.)
108 +* ml/cygwin-does-not-have-fifo (2013-07-05) 1 commit
109 + - test-lib.sh - cygwin does not have usable FIFOs
110
276 - Split from the other topic.
111 + Will merge to 'next'.
112
113 --------------------------------------------------
114 [Stalled]
@@ -407,23 +242,101 @@ of the repositories listed at
242 --------------------------------------------------
243 [Cooking]
244
410 -* bp/mediawiki-preview (2013-06-26) 5 commits
411 - - git-remote-mediawiki: Add preview subcommand into git mw.
245 +* pb/stash-refuse-to-kill (2013-07-01) 2 commits
246 + (merged to 'next' on 2013-07-05 at 78ecc59)
247 + + git stash: avoid data loss when "git stash save" kills a directory
248 + + treat_directory(): do not declare submodules to be untracked
249 +
250 + "git stash save" is not just about "saving" the local changes, but
251 + also is to restore the working tree state to that of HEAD. If you
252 + changed a non-directory into a directory in the local change, you
253 + may have untracked files in that directory, which have to be killed
254 + while doing so, unless you run it with --include-untracked. Teach
255 + the command to detect and error out before spreading the damage.
256 +
257 + This needed a small fix to "ls-files --killed".
258 +
259 + Will merge to 'next'.
260 +
261 +
262 +* es/contacts (2013-07-03) 3 commits
263 + - contrib: contacts: interpret committish akin to format-patch
264 + - contrib: contacts: add ability to parse from committish
265 + - contrib: add git-contacts helper
266 +
267 + A helper to read from a set of format-patch output files or a range
268 + of commits and find those who may have insights to the code that
269 + the changes touch by running a series of "git blame" commands.
270 +
271 + Still needs to add mailmap support and other niceties but the
272 + basics already look sound, and the enhancements can be done
273 + in-tree. Assuming that "git contact" is something we may want to
274 + have as a member of the official set of commands someday, that is.
275 +
276 + Will merge to 'next'.
277 +
278 +
279 +* jk/bash-completion (2013-06-30) 2 commits
280 + (merged to 'next' on 2013-07-01 at 6daca44)
281 + + completion: learn about --man-path
282 + + completion: handle unstuck form of base git options
283 +
284 + Will merge to 'master'.
285 +
286 +
287 +* cp/submodule-custom-update (2013-07-03) 1 commit
288 + - submodule update: allow custom command to update submodule working tree
289 +
290 + In addition to the choice from "rebase, merge, or checkout-detach",
291 + allow a custom command to be used in "submodule update" to update
292 + the working tree of submodules.
293 +
294 + Will merge to 'next'.
295 +
296 +
297 +* mv/merge-ff-tristate (2013-07-02) 1 commit
298 + - merge: handle --ff/--no-ff/--ff-only as a tri-state option
299 +
300 + The configuration variable "merge.ff" was cleary a tri-state to
301 + choose one from "favor fast-forward when possible", "always create
302 + a merge even when the history could fast-forward" and "do not
303 + create any merge, only update when the history fast-forwards", but
304 + the command line parser did not implement the usual convention of
305 + "last one wins, and command line overrides the configuration"
306 + correctly.
307 +
308 + Will merge to 'next'.
309 +
310 +
311 +* rr/rebase-reflog-message-reword (2013-06-23) 2 commits
312 + - rebase -i: use a better reflog message
313 + - rebase: use a better reflog message
314 + (this branch uses rr/rebase-checkout-reflog.)
315 +
316 + "git rebase [-i]" used to leave just "rebase" as its reflog message
317 + for some operations. This rewords them to be more informative.
318 +
319 + Will merge to 'next'.
320 +
321 +
322 +* bp/mediawiki-preview (2013-07-04) 7 commits
323 + - git-remote-mediawiki: Add preview subcommand into git mw
324 - git-remote-mediawiki: Adding git-mw command
413 - - git-remote-mediawiki: factoring code between git-remote-mediawiki and Git::Mediawiki
414 - - git-remote-mediawiki: new git bin-wrapper for developement
325 + - git-remote-mediawiki: Factoring code between git-remote-mediawiki and Git::Mediawiki
326 + - git-remote-mediawiki: Update tests to run with the new bin-wrapper
327 + - git-remote-mediawiki: New git bin-wrapper for developement
328 + - wrap-for-bin: Make bin-wrappers chainable
329 - git-remote-mediawiki: Introduction of Git::Mediawiki.pm
330
417 - Still under discussion?
331 + Looks like this is in a fairly good shape?
332
333
420 -* fg/submodule-clone-depth (2013-06-28) 1 commit
334 +* fg/submodule-clone-depth (2013-07-03) 1 commit
335 - Add --depth to submodule update/add
336
337 Allow shallow-cloning of submodules with "git submodule update".
338
425 - Waiting for a reroll.
426 - $gmane/229248
339 + Will merge to 'next'.
340
341
342 * jc/pull-training-wheel (2013-06-27) 1 commit
@@ -438,7 +351,9 @@ of the repositories listed at
351 logic with other people's support. Hint, hint...
352
353
441 -* as/log-output-encoding-in-user-format (2013-07-01) 6 commits
354 +* as/log-output-encoding-in-user-format (2013-07-05) 7 commits
355 + (merged to 'next' on 2013-07-05 at d2c99e5)
356 + + t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1
357 (merged to 'next' on 2013-07-01 at 3318aa8)
358 + t4205: replace .\+ with ..* in sed commands
359 (merged to 'next' on 2013-06-28 at 4063330)
@@ -455,13 +370,14 @@ of the repositories listed at
370
371
372 * jc/maint-diff-core-safecrlf (2013-06-25) 1 commit
458 - - diff: demote core.safecrlf=true to core.safecrlf=warn
373 + (merged to 'next' on 2013-07-03 at db8a2a6)
374 + + diff: demote core.safecrlf=true to core.safecrlf=warn
375
376 "git diff" refused to even show difference when core.safecrlf is
377 set to true (i.e. error out) and there are offending lines in the
378 working tree files.
379
464 - Will merge to 'next'.
380 + Will merge to 'master'.
381
382
383 * jk/fast-import-empty-ls (2013-06-23) 4 commits
@@ -474,14 +390,12 @@ of the repositories listed at
390 $gmane/228741
391
392
477 -* af/rebase-i-merge-options (2013-06-25) 2 commits
478 - - SQUASH???
393 +* af/rebase-i-merge-options (2013-07-02) 1 commit
394 - Do not ignore merge options in interactive rebase
395
396 "git rebase -i" now honors --strategy and -X options.
397
483 - Waiting for response to review comments.
484 - $gmane/228988
398 + Will merge to 'master'.
399
400
401 * rj/cygwin-remove-cheating-lstat (2013-06-25) 1 commit
@@ -529,12 +443,15 @@ of the repositories listed at
443 tentatively defines it as the same as 'current', but we may have
444 to tighten it to avoid surprises in some way.
445
446 + Will merge to 'master'.
447 +
448
449 * jg/status-config (2013-06-24) 4 commits
534 - - status/commit: make sure --porcelain is not affected by user-facing config
535 - - commit: make it work with status.short
536 - - status: introduce status.branch to enable --branch by default
537 - - status: introduce status.short to enable --short by default
450 + (merged to 'next' on 2013-07-03 at 6ac1ada)
451 + + status/commit: make sure --porcelain is not affected by user-facing config
452 + + commit: make it work with status.short
453 + + status: introduce status.branch to enable --branch by default
454 + + status: introduce status.short to enable --short by default
455
456 "git status" learned status.branch and status.short configuration
457 variables to use --branch and --short options by default (override
@@ -546,7 +463,7 @@ of the repositories listed at
463 is unfortunately overly complex in order not to introduce an
464 unnecessary regression.
465
549 - Will merge to 'next'.
466 + Will merge to 'master'.
467
468
469 * jc/reflog-doc (2013-06-19) 1 commit
@@ -613,25 +530,6 @@ of the repositories listed at
530 merged to 'next'.
531
532
616 -* tr/test-v-and-v-subtest-only (2013-06-29) 9 commits
617 - (merged to 'next' on 2013-06-30 at 1c5fac1)
618 - + perf-lib: fix start/stop of perf tests
619 - (merged to 'next' on 2013-06-26 at 8ff4d84)
620 - + test-lib: support running tests under valgrind in parallel
621 - + test-lib: allow prefixing a custom string before "ok N" etc.
622 - + test-lib: valgrind for only tests matching a pattern
623 - + test-lib: verbose mode for only tests matching a pattern
624 - + test-lib: self-test that --verbose works
625 - + test-lib: rearrange start/end of test_expect_* and test_skip
626 - + test-lib: refactor $GIT_SKIP_TESTS matching
627 - + test-lib: enable MALLOC_* for the actual tests
628 -
629 - Allows N instances of tests run in parallel, each running 1/N parts
630 - of the test suite under Valgrind, to speed things up.
631 -
632 - Will merge to 'master'.
633 -
634 -
533 * jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit
534 - git add: -u/-A now affects the entire working tree
535
@@ -657,53 +555,3 @@ of the repositories listed at
555 aka "--no-ignore-removal".
556
557 Will cook in 'next' until Git 2.0.
660 -
661 ---------------------------------------------------
662 -[Discarded]
663 -
664 -* rr/complete-difftool (2013-06-09) 3 commits
665 - (merged to 'next' on 2013-06-09 at 2ee40cb)
666 - + Revert 77c1305 and 3c3b46b
667 - (merged to 'next' on 2013-06-07 at 90e5f58)
668 - + completion: add deprecated __git_complete_file ()
669 - (merged to 'next' on 2013-06-04 at 01c7611)
670 - + completion: clarify ls-tree, archive, show completion
671 -
672 - Update command line completion (in contrib/) to use a better named
673 - completion helper function for commands that take revisions and
674 - paths.
675 -
676 - Reverted, to be replaced with rr/complete-difftool-fixup.
677 -
678 -
679 -* fc/remote-helpers-use-specified-python (2013-05-28) 4 commits
680 - - remote-helpers: add exec-path links
681 - - remote-helpers: allow direct test execution
682 - - remote-helpers: rename tests
683 - - remote-helpers: generate scripts
684 -
685 - Retracted.
686 -
687 -
688 -* jk/packed-refs-race (2013-05-06) 4 commits
689 - . for_each_ref: load all loose refs before packed refs
690 - . get_packed_refs: reload packed-refs file when it changes
691 - . add a stat_validity struct
692 - . resolve_ref: close race condition for packed refs
693 -
694 - Superseded by mh/ref-races topic, I think.
695 -
696 -
697 -* rr/triangle-push-fix (2013-06-20) 9 commits
698 - . push: honor branch.*.push
699 - . SQUASH??? fix git-config push.default description
700 - . SQUASH??? minimum "simple" safety fix-up
701 - . t/t5528-push-default: test pushdefault workflows
702 - . t/t5528-push-default: generalize test_push_*
703 - . push: remove dead code in setup_push_upstream()
704 - . push: change `simple` to accommodate triangular workflows
705 - . config doc: rewrite push.default section
706 - + t/t5528-push-default: remove redundant test_config lines
707 - (this branch is tangled with jc/triangle-push-fixup.)
708 -
709 - Superseded by jc/triangle-push-fixup.