1 To: git@vger.kernel.org
3 Subject: What's cooking in git.git (Jun 2015, #07; Mon, 29)
4 X-master-at: 912bd497e93f0235a5999a77f8d54f5ff80a3a03
5 X-next-at: d595659997efd86e238e50f97b9c8c811b229c4b
7 What's cooking in git.git (Jun 2015, #07; Mon, 29)
8 --------------------------------------------------
10 Here are the topics that have been cooking. Commits prefixed with
11 '-' are only in 'pu' (proposed updates) while commits prefixed with
14 Some of the topics in flight have overlaps with each other and have
15 been excluded from 'pu'; most notably, I think the remainder of
16 bc/object-id needs to wait until the for-each-ref topic from Karthik
17 settles and then rebased on it, or something.
19 A couple of "hotfix" topics that just went into 'next' should be
20 part of -rc1 early next month, but other than that there aren't
21 anything ultra-urgent cooking right now. Read those "Will merge to
22 'master'" as if they were suffixed with "soon after the upcoming
25 You can find the changes described here in the integration branches
26 of the repositories listed at
28 http://git-blame.blogspot.com/p/git-public-repositories.html
30 --------------------------------------------------
31 [Graduated to "master"]
33 * nd/diff-i-t-a (2015-06-23) 1 commit
34 + Revert "diff-lib.c: adjust position of i-t-a entries in diff"
36 The "let's show paths added with -N as 'new' in status output"
37 change was done without enough consideration on potential fallouts
38 on the codepaths that do not have anything to do with "status" and
39 caused regression to at least one widely used "wsadd" alias.
41 --------------------------------------------------
44 None of these is particularly urgent.
46 * dt/refs-backend-preamble (2015-06-29) 7 commits
47 - git-stash: use git-reflog instead of creating files
48 - git-reflog: add create and exists functions
49 - refs: new public ref function: safe_create_reflog
50 - refs: break out check for reflog autocreation
51 - bisect: treat BISECT_HEAD as a ref
52 - cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs
53 - refs.c: add err arguments to reflog functions
55 In preparation for allowing different "backends" to store the refs
56 in a way different from the traditional "one ref per file in $GIT_DIR
57 or in a $GIT_DIR/packed-refs file" filesystem storage, reduce
58 direct filesystem access to ref-like things like CHERRY_PICK_HEAD
59 from scripts and programs.
64 * et/http-proxyauth (2015-06-29) 1 commit
65 - http: always use any proxy auth method available
67 We used to ask libCURL to use the most secure authentication method
68 available when talking to an HTTP proxy only when we were told to
69 talk to one via configuration variables. We now ask libCURL to
70 always use the most secure authentication method, because the user
71 can tell libCURL to use an HTTP proxy via an environment variable
72 without using configuration variables.
74 Looked sensible. An extra set of eyes appreciated, but I think
80 * jc/fsck-retire-require-eoh (2015-06-28) 1 commit
81 - fsck: it is OK for a tag and a commit to lack the body
83 A fix to a minor regression to "git fsck" in v2.2 era that started
84 complaining about a body-less tag object when it lacks a separator
85 empty line after its header to separate it with a non-existent body.
90 * jk/date-mode-format (2015-06-29) 3 commits
91 - introduce "format" date-mode
92 - convert "enum date_mode" into a struct
93 - show-branch: use DATE_RELATIVE instead of magic number
95 Teach "git log" and friends a new "--date=format:..." option to
96 format timestamps using system's strftime(3).
101 * jk/still-interesting (2015-06-29) 1 commit
102 - revision.c: remove unneeded check for NULL
106 Will merge to 'next'.
109 * nd/export-worktree (2015-06-26) 1 commit
110 - setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR
112 Running an aliased command from a subdirectory when the .git thing
113 in the working tree is a gitfile pointing elsewhere did not work.
115 Will merge to 'next'.
118 * sb/p5310-and-chain (2015-06-26) 1 commit
119 - p5310: Fix broken && chain in performance test
123 Will merge to 'next'.
126 * jc/rerere (2015-06-28) 5 commits
127 - rerere: report autoupdated paths only after actually updating them
128 - rerere: write out each record of MERGE_RR in one go
129 - rerere: lift PATH_MAX limitation
130 - t4200: rerere a merge with two identical conflicts
131 - rerere: fix an off-by-one non-bug
133 Code clean-up (so far).
135 --------------------------------------------------
138 * sg/config-name-only (2015-05-28) 3 commits
139 - completion: use new 'git config' options to reliably list variable names
141 - config: add options to list only variable names
143 "git config --list" output was hard to parse when values consist of
144 multiple lines. Introduce a way to show only the keys.
146 Adding a single --name-only option may be a better way to go than
147 adding two new options.
152 * kb/i18n-doc (2015-06-15) 1 commit
153 - Documentation/i18n.txt: clarify character encoding support
155 Comments (other than $gmane/271657)?
158 * kb/use-nsec-doc (2015-06-15) 1 commit
159 - Makefile / racy-git.txt: clarify USE_NSEC prerequisites
161 Comments (other than $gmane/271656)?
164 * kk/log-merges-config (2015-04-21) 5 commits
165 - bash-completion: add support for git-log --merges= and log.merges
166 - t4202-log: add tests for --merges=
167 - Documentation: add git-log --merges= option and log.merges config. var
168 - log: honor log.merges= option
169 - revision: add --merges={show|only|hide} option
171 "git log" (but not other commands in the "log" family) learned to
172 pay attention to the log.merges configuration variable that can be
173 set to "show" (the normal behaviour), "only" (hide non-merge
174 commits), or "hide" (hide merge commits). --merges=(show|only|hide)
175 can be used to override the setting from the command line.
177 The documentation may need to be updated once more ($gmane/267250).
178 Waiting for a reroll.
181 * mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
182 - t/lib-git-svn: check same httpd module dirs as lib-httpd
183 - t/lib-httpd: load mod_unixd
185 This is the first two commits in a three-patch series $gmane/266962
187 with updated log message ($gmane/268061).
190 * mh/numparse (2015-03-19) 14 commits
191 - diff_opt_parse(): use convert_i() when handling --abbrev=<num>
192 - diff_opt_parse(): use convert_i() when handling "-l<num>"
193 - opt_arg(): simplify pointer handling
194 - opt_arg(): report errors parsing option values
195 - opt_arg(): use convert_i() in implementation
196 - opt_arg(): val is always non-NULL
197 - builtin_diff(): detect errors when parsing --unified argument
198 - handle_revision_opt(): use convert_ui() when handling "--abbrev="
199 - strtoul_ui(), strtol_i(): remove functions
200 - handle_revision_opt(): use convert_i() when handling "-<digit>"
201 - handle_revision_opt(): use skip_prefix() in many places
202 - write_subdirectory(): use convert_ui() for parsing mode
203 - cacheinfo_callback(): use convert_ui() when handling "--cacheinfo"
204 - numparse: new module for parsing integral numbers
206 Many codepaths use unchecked use of strtol() and friends (or even
207 worse, atoi()). Introduce a set of wrappers that try to be more
214 * tf/gitweb-project-listing (2015-03-19) 5 commits
215 - gitweb: make category headings into links when they are directories
216 - gitweb: optionally set project category from its pathname
217 - gitweb: add a link under the search box to clear a project filter
218 - gitweb: if the PATH_INFO is incomplete, use it as a project_filter
219 - gitweb: fix typo in man page
221 Update gitweb to make it more pleasant to deal with a hierarchical
222 forest of repositories.
224 Any comments from those who use or have their own code in Gitweb?
227 * jc/a-lone-dash-stands-for-previous-branch (2015-03-16) 1 commit
228 - "-" and "@{-1}" on various programs
230 Lose special case code to make a lone dash "-" mean the previous
231 branch aka "@{-1}" from a handful subcommands, and instead support
232 the notation throughout the system by reimplementing it at the
235 Needs tests, documentation updates, etc. Also does only a half-way
236 job dealing with range notation, which needs to be fixed before the
237 series goes anywhere.
240 * nd/list-files (2015-02-09) 21 commits
241 - t3080: tests for git-list-files
242 - list-files: -M aka diff-cached
243 - list-files -F: show submodules with the new indicator '&'
244 - list-files: add -F/--classify
245 - list-files: show directories as well as files
246 - list-files: do not show duplicate cached entries
247 - list-files: sort output and remove duplicates
248 - list-files: add -t back
249 - list-files: add -1 short for --no-column
250 - list-files: add -R/--recursive short for --max-depth=-1
251 - list-files: -u does not imply showing stages
252 - list-files: make alias 'ls' default to 'list-files'
253 - list-files: a user friendly version of ls-files and more
254 - ls-files: support --max-depth
255 - ls-files: add --column
256 - ls-files: add --color to highlight file names
257 - ls-files: buffer full item in strbuf before printing
258 - ls_colors.c: highlight submodules like directories
259 - ls_colors.c: add a function to color a file name
260 - ls_colors.c: parse color.ls.* from config file
261 - ls_colors.c: add $LS_COLORS parsing code
263 A new "git list-files" Porcelain command, "ls-files" with bells and
266 Reroll to base on wt-status work ($gmane/265142) has seen some
267 positive discussions.
269 Waiting for a further polished reroll ($gmane/265534).
272 * nd/pathspec-strip-fix (2015-04-18) 1 commit
273 - pathspec: adjust prefixlen after striping trailing slash
275 Does not quite fix ($gmane/267614).
279 * jc/diff-b-m (2015-02-23) 5 commits
282 - diffcore-rename: allow easier debugging
283 - diffcore-rename.c: add locate_rename_src()
284 - diffcore-break: allow debugging
286 "git diff -B -M" produced incorrect patch when the postimage of a
287 completely rewritten file is similar to the preimage of a removed
288 file; such a resulting file must not be expressed as a rename from
291 The fix in this patch is broken, unfortunately.
294 * pw/remote-set-url-fetch (2014-11-26) 1 commit
295 - remote: add --fetch and --both options to set-url
300 * tr/remerge-diff (2014-11-10) 9 commits
301 - t4213: avoid "|" in sed regexp
302 - log --remerge-diff: show what the conflict resolution changed
303 - name-hash: allow dir hashing even when !ignore_case
304 - merge-recursive: allow storing conflict hunks in index
305 - merge_diff_mode: fold all merge diff variants into an enum
306 - combine-diff: do not pass revs->dense_combined_merges redundantly
307 - merge-recursive: -Xindex-only to leave worktree unchanged
308 - merge-recursive: internal flag to avoid touching the worktree
309 - merge-recursive: remove dead conditional in update_stages()
311 "log -p" output learns a new way to let users inspect a merge
312 commit by showing the differences between the automerged result
313 with conflicts the person who recorded the merge would have seen
314 and the final conflict resolution that was recorded in the merge.
316 Waiting for a reroll.
320 * tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
321 - perf-lib: add test_perf_cleanup target
322 - perf-lib: split starting the test from the execution
324 Add test_perf_cleanup shell function to the perf suite, that allows
325 the script writers to define a test with a clean-up action.
330 * jc/show-branch (2014-03-24) 5 commits
331 - show-branch: use commit slab to represent bitflags of arbitrary width
332 - show-branch.c: remove "all_mask"
333 - show-branch.c: abstract out "flags" operation
334 - show-branch.c: lift all_mask/all_revs to a global static
335 - show-branch.c: update comment style
337 Waiting for the final step to lift the hard-limit.
339 --------------------------------------------------
342 * ad/bisect-terms (2015-06-29) 10 commits
343 - bisect: allow setting any user-specified in 'git bisect start'
344 - bisect: add 'git bisect terms' to view the current terms
345 - bisect: add the terms old/new
346 - bisect: sanity check on terms
347 - bisect: don't mix option parsing and non-trivial code
348 - bisect: simplify the addition of new bisect terms
349 - bisect: replace hardcoded "bad|good" by variables
350 - Documentation/bisect: revise overall content
351 - Documentation/bisect: move getting help section to the end
352 - bisect: correction of typo
354 The use of 'good/bad' in "git bisect" made it confusing to use when
355 hunting for a state change that is not a regression (e.g. bugfix).
356 The command learned 'old/new' and then allows the end user to
357 say e.g. "bisect start --term-old=fast --term=new=slow" to find a
358 performance regression.
361 * mh/tempfile (2015-06-10) 14 commits
362 - credential-cache--daemon: use tempfile module
363 - credential-cache--daemon: delete socket from main()
364 - gc: use tempfile module to handle gc.pid file
365 - lock_repo_for_gc(): compute the path to "gc.pid" only once
366 - diff: use tempfile module
367 - setup_temporary_shallow(): use tempfile module
368 - write_shared_index(): use tempfile module
369 - register_tempfile(): new function to handle an existing temporary file
370 - tempfile: add several functions for creating temporary files
371 - register_tempfile_object(): new function, extracted from create_tempfile()
372 - commit_lock_file(): use get_locked_file_path()
373 - lockfile: remove some redundant functions
374 - tempfile: a new module for handling temporary files
375 - Move lockfile API documentation to lockfile.h
377 Rebuild "lockfile" API on top of a new "tempfile" API.
378 This needs rerolling, to include "tempfile.h" in "lockfile.h", at
385 * js/fsck-opt (2015-06-23) 19 commits
386 - fsck: support ignoring objects in `git fsck` via fsck.skiplist
387 - fsck: git receive-pack: support excluding objects from fsck'ing
388 - fsck: introduce `git fsck --connectivity-only`
389 - fsck: support demoting errors to warnings
390 - fsck: document the new receive.fsck.<msg-id> options
391 - fsck: allow upgrading fsck warnings to errors
392 - fsck: optionally ignore specific fsck issues completely
393 - fsck: disallow demoting grave fsck errors to warnings
394 - fsck: add a simple test for receive.fsck.<msg-id>
395 - fsck: make fsck_tag() warn-friendly
396 - fsck: handle multiple authors in commits specially
397 - fsck: make fsck_commit() warn-friendly
398 - fsck: make fsck_ident() warn-friendly
399 - fsck: report the ID of the error/warning
400 - fsck (receive-pack): allow demoting errors to warnings
401 - fsck: offer a function to demote fsck errors to warnings
402 - fsck: provide a function to parse fsck message IDs
403 - fsck: introduce identifiers for fsck messages
404 - fsck: introduce fsck options
406 Allow ignoring fsck errors on specific set of known-to-be-bad
407 objects, and also tweaking warning level of various kinds of non
408 critical breakages reported.
410 Will merge to 'next'.
413 * js/rebase-i-clean-up-upon-continue-to-skip (2015-06-29) 2 commits
414 - rebase -i: do not leave a CHERRY_PICK_HEAD file behind
415 - t3404: demonstrate CHERRY_PICK_HEAD bug
417 Abandoning an already applied change in "git rebase -i" with
418 "--continue" left CHERRY_PICK_HEAD and confused later steps.
420 Will merge to 'next'.
423 * me/fetch-into-shallow-safety (2015-06-17) 1 commit
424 (merged to 'next' on 2015-06-24 at 8ecc19a)
425 + fetch-pack: check for shallow if depth given
427 "git fetch --depth=<depth>" and "git clone --depth=<depth>" issued
428 a shallow transfer request even to an upload-pack that does not
429 support the capability.
431 Will merge to 'master'.
434 * mm/describe-doc (2015-06-16) 1 commit
435 (merged to 'next' on 2015-06-24 at 75e34cc)
436 + Documentation/describe: improve one-line summary
440 Will merge to 'master'.
443 * rh/test-color-avoid-terminfo-in-original-home (2015-06-17) 2 commits
444 (merged to 'next' on 2015-06-24 at 6af5fa7)
445 + test-lib.sh: fix color support when tput needs ~/.terminfo
446 + Revert "test-lib.sh: do tests for color support after changing HOME"
448 An ancient test framework enhancement to allow color was not
449 entirely correct; this makes it work even when tput needs to read
450 from the ~/.terminfo under the user's real HOME directory.
452 Will merge to 'master'.
455 * tb/checkout-doc (2015-06-17) 1 commit
456 - git-checkout.txt: document "git checkout <pathspec>" better
460 Will merge to 'next'.
463 * jk/pretty-encoding-doc (2015-06-17) 1 commit
464 - docs: clarify that --encoding can produce invalid sequences
468 Will merge to 'next'.
471 * ak/format-patch-odir-config (2015-06-19) 1 commit
472 - format-patch: introduce format.outputDirectory configuration
474 Reroll exists but didn't pick it up as it seems to be still
475 collecting review comments.
481 * bc/gpg-verify-raw (2015-06-22) 7 commits
482 (merged to 'next' on 2015-06-24 at 08a1164)
483 + verify-tag: add option to print raw gpg status information
484 + verify-commit: add option to print raw gpg status information
485 + gpg: centralize printing signature buffers
486 + gpg: centralize signature check
487 + verify-commit: add test for exit status on untrusted signature
488 + verify-tag: share code with verify-commit
489 + verify-tag: add tests
491 "git verify-tag" and "git verify-commit" have been taught to share
492 more code, and then learned to optionally show the verification
493 message from the underlying GPG implementation.
495 Will merge to 'master'.
498 * cb/parse-magnitude (2015-06-22) 2 commits
499 (merged to 'next' on 2015-06-24 at 2fd7205)
500 + parse-options: move unsigned long option parsing out of pack-objects.c
501 + test-parse-options: update to handle negative ints
503 Move machinery to parse human-readable scaled numbers like 1k, 4M,
504 and 2G as an option parameter's value from pack-objects to
505 parse-options API, to make it available to other codepaths.
507 Will merge to 'master'.
510 * cb/subtree-tests-update (2015-06-22) 3 commits
511 (merged to 'next' on 2015-06-24 at 31a2938)
512 + contrib/subtree: small tidy-up to test
513 + contrib/subtree: fix broken &&-chains and revealed test error
514 + contrib/subtree: use tabs consitently for indentation in tests
516 Tests update in contrib/subtree.
518 Will merge to 'master'.
521 * da/mergetool-winmerge (2015-06-19) 1 commit
522 (merged to 'next' on 2015-06-24 at 2fb10c4)
523 + mergetool-lib: fix default tool selection
525 Hotfix for an earlier change already in 'master' that broke the
526 default tool selection for mergetool.
528 Will merge to 'master'.
531 * jk/cat-file-batch-all (2015-06-26) 8 commits
532 - cat-file: sort and de-dup output of --batch-all-objects
533 - cat-file: add --batch-all-objects option
534 - cat-file: split batch_one_object into two stages
535 - cat-file: stop returning value from batch_one_object
536 - cat-file: add --buffer option
537 - cat-file: move batch_options definition to top of file
538 - cat-file: minor style fix in options list
539 - Merge branch 'jk/maint-for-each-packed-object' into jk/cat-file-batch-all
540 (this branch uses jk/maint-for-each-packed-object.)
542 "cat-file" learned "--batch-all-objects" option to enumerate all
543 available objects in the repository more quickly than "rev-list
544 --all --objects" (the output includes unreachable objects, though).
546 Will merge to 'next'.
549 * jk/maint-for-each-packed-object (2015-06-22) 1 commit
550 (merged to 'next' on 2015-06-24 at 162e134)
551 + for_each_packed_object: automatically open pack index
552 (this branch is used by jk/cat-file-batch-all.)
554 The for_each_packed_object() API function did not iterate over
555 objects in a packfile that hasn't been used yet.
557 Will merge to 'master'.
560 * jk/pkt-log-pack (2015-06-16) 3 commits
561 - pkt-line: support tracing verbatim pack contents
562 - pkt-line: tighten sideband PACK check when tracing
563 - pkt-line: simplify starts_with checks in packet tracing
565 Enhance packet tracing machinery to allow capturing an incoming
566 pack data to a file for debugging.
568 Will merge to 'next'.
571 * kn/for-each-ref (2015-06-15) 11 commits
572 (merged to 'next' on 2015-06-24 at 1a3a734)
573 + ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname
574 + for-each-ref: introduce filter_refs()
575 + ref-filter: move code from 'for-each-ref'
576 + ref-filter: add 'ref-filter.h'
577 + for-each-ref: rename variables called sort to sorting
578 + for-each-ref: rename some functions and make them public
579 + for-each-ref: introduce 'ref_array_clear()'
580 + for-each-ref: introduce new structures for better organisation
581 + for-each-ref: rename 'refinfo' to 'ref_array_item'
582 + for-each-ref: clean up code
583 + for-each-ref: extract helper functions out of grab_single_ref()
584 (this branch is used by kn/for-each-tag-branch.)
586 GSoC project to rebuild ref listing by branch and tag based on the
587 for-each-ref machinery. This is its first part.
590 * mh/init-delete-refs-api (2015-06-22) 19 commits
591 - delete_ref(): use the usual convention for old_sha1
592 - cmd_update_ref(): make logic more straightforward
593 - update_ref(): don't read old reference value before delete
594 - check_branch_commit(): make first parameter const
595 - refs.h: add some parameter names to function declarations
596 - refs: move the remaining ref module declarations to refs.h
597 - initial_ref_transaction_commit(): check for ref D/F conflicts
598 - initial_ref_transaction_commit(): check for duplicate refs
599 - refs: remove some functions from the module's public interface
600 - initial_ref_transaction_commit(): function for initial ref creation
601 - repack_without_refs(): make function private
602 - prune_refs(): use delete_refs()
603 - prune_remote(): use delete_refs()
604 - delete_refs(): bail early if the packed-refs file cannot be rewritten
605 - delete_refs(): make error message more generic
606 - delete_refs(): new function for the refs API
607 - delete_ref(): handle special case more explicitly
608 - remove_branches(): remove temporary
609 - delete_ref(): move declaration to refs.h
611 Clean up refs API and make "git clone" less intimate with the
612 implementation detail.
614 Will merge to 'next'.
617 * mh/replace-refs (2015-06-12) 1 commit
618 (merged to 'next' on 2015-06-24 at cb13adf)
619 + Allow to control where the replace refs are looked for
621 Add an environment variable to tell Git to look into refs hierarchy
622 other than refs/replace/ for the object replacement data.
625 * nd/multiple-work-trees (2015-06-29) 2 commits
626 (merged to 'next' on 2015-06-29 at fd4eb60)
627 + worktree: new place for "git prune --worktrees"
628 (merged to 'next' on 2015-06-24 at 7c3f918)
629 + checkout: don't check worktrees when not necessary
631 "git checkout [<tree-ish>] <paths>" spent unnecessary cycles
632 checking if the current branch was checked out elsewhere, when we
633 know we are not switching the branches ourselves.
635 Will merge to 'master'.
638 * gp/status-rebase-i-info (2015-06-09) 5 commits
639 - SQUASH??? fix misindent
640 - status: add new tests for status during rebase -i
641 - status: give more information during rebase -i
642 - status: differentiate interactive from non-interactive rebases
643 - status: factor two rebase-related messages together
645 Teach "git status" to show a more detailed information regarding
646 the "rebase -i" session in progress.
651 * jc/prompt-document-ps1-state-separator (2015-06-10) 1 commit
652 (merged to 'next' on 2015-06-24 at e4d1bad)
653 + git-prompt.sh: document GIT_PS1_STATESEPARATOR
657 Will merge to 'master'.
660 * mk/utf8-no-iconv-warn (2015-06-08) 1 commit
661 - utf8.c: print warning about disabled iconv
663 Warn when a reencoding is requested in a build without iconv
664 support, as the end user is likely to get an unexpected result. I
665 think the same level of safety should be added to a build with
666 iconv support when the specified encoding is not available, but the
667 patch does not go there.
672 * mr/rebase-i-customize-insn-sheet (2015-06-15) 1 commit
673 - git-rebase--interactive.sh: add config option for custom instruction format
675 "git rebase -i"'s list of todo is made configurable.
677 Will merge to 'next'.
680 * pt/am-foreign (2015-06-15) 5 commits
681 (merged to 'next' on 2015-06-24 at 838c702)
682 + am: teach mercurial patch parser how to read from stdin
683 + am: use gmtime() to parse mercurial patch date
684 + t4150: test applying StGit series
685 + am: teach StGit patch parser how to read from stdin
686 + t4150: test applying StGit patch
688 Various enhancements around "git am" reading patches generated by
692 * pt/pull-builtin (2015-06-18) 19 commits
693 - pull: remove redirection to git-pull.sh
694 - pull --rebase: error on no merge candidate cases
695 - pull --rebase: exit early when the working directory is dirty
696 - pull: configure --rebase via branch.<name>.rebase or pull.rebase
697 - pull: teach git pull about --rebase
698 - pull: set reflog message
699 - pull: implement pulling into an unborn branch
700 - pull: fast-forward working tree if head is updated
701 - pull: check if in unresolved merge state
702 - pull: support pull.ff config
703 - pull: error on no merge candidates
704 - pull: pass git-fetch's options to git-fetch
705 - pull: pass git-merge's options to git-merge
706 - pull: pass verbosity, --progress flags to fetch and merge
707 - pull: implement fetch + merge
708 - pull: implement skeletal builtin pull
709 - argv-array: implement argv_array_pushv()
710 - parse-options-cb: implement parse_opt_passthru_argv()
711 - parse-options-cb: implement parse_opt_passthru()
713 Reimplement 'git pull' in C.
715 This is v4 ($gmane/271943).
716 Will merge to 'next'.
719 * rl/send-email-aliases (2015-06-17) 10 commits
720 - send-email: suppress meaningless whitespaces in from field
721 - send-email: allow multiple emails using --cc, --to and --bcc
722 - send-email: consider quote as delimiter instead of character
723 - send-email: reduce dependancies impact on parse_address_line
724 - send-email: minor code refactoring
725 - send-email: allow use of aliases in the From field of --compose mode
726 - send-email: refactor address list process
727 - t9001-send-email: refactor header variable fields replacement
728 - send-email: allow aliases in patch header and command script outputs
729 - t9001-send-email: move script creation in a setup test
731 "git send-email" now performs alias-expansion on names that are
732 given via --cccmd, etc.
734 This round comes with a lot more enhanced e-mail address parser,
735 which makes it a bit scary, but as long as it works as designed, it
736 makes it wonderful ;-).
738 This is a lot older version than the latest round ($gmane/272499).
743 * wp/sha1-name-negative-match (2015-06-08) 2 commits
744 - sha1_name.c: introduce '^{/!-<negative pattern>}' notation
745 - test for '!' handling in rev-parse's named commits
747 Introduce "branch^{/!-<pattern>}" notation to name a commit
748 reachable from branch that does not match the given pattern.
753 * bc/object-id (2015-06-17) 10 commits
754 . remote.c: use struct object_id in many functions
755 . object-id: use struct object_id in struct object
756 . remote.c: use struct object_id in ref_newer()
757 . transport-helper.c: use struct object_id in push_refs_with_export()
758 . connect.c: use struct object_id in get_remote_heads()
759 . remote-curl: use struct object_id in parse_fetch()
760 . fetch-pack: use struct object_id in add_sought_entry_mem()
761 . object_id: convert struct ref to use object_id.
762 . sha1_file: introduce has_object_file() helper
763 . refs: convert some internal functions to use object_id
765 More transition from "unsigned char[40]" to "struct object_id".
767 While GSoC and other topics are actively moving existing code
768 around, this cannot go in; ejected from 'pu'.
771 * jk/log-missing-default-HEAD (2015-06-03) 1 commit
772 - log: diagnose empty HEAD more clearly
774 "git init empty && git -C empty log" said "bad default revision 'HEAD'",
775 which was found to be a bit confusing to new users.
777 What's the status of this one?
780 * gr/rebase-i-drop-warn (2015-06-24) 3 commits
781 - git rebase -i: add static check for commands and SHA-1
782 - git rebase -i: warn about removed commits
783 - git-rebase -i: add command "drop" to remove a commit
785 Add "drop commit-object-name subject" command as another way to
786 skip replaying of a commit in "rebase -i", and then punish those
787 who do not use it (and instead just remove the lines) by throwing
790 Need to pick up the latest reroll ($gmane/273009).
793 * jh/strbuf-read-use-read-in-full (2015-06-01) 1 commit
794 - strbuf_read(): skip unnecessary strbuf_grow() at eof
796 Avoid one extra iteration and strbuf_grow() of 8kB in
799 Looked reasonable; perhaps a log message clarification is needed.
804 * mg/index-read-error-messages (2015-06-01) 2 commits
805 - messages: uniform error messages for index write
806 - show-index: uniform error messages for index read
812 * hv/submodule-config (2015-06-15) 4 commits
813 - do not die on error of parsing fetchrecursesubmodules option
814 - use new config API for worktree configurations of submodules
815 - extract functions for submodule config set and lookup
816 - implement submodule config API for lookup of .gitmodules values
818 The gitmodules API accessed from the C code learned to cache stuff
821 Looked reasonable from a cursory read.
823 Will merge to 'next'.
826 * jc/push-tags-also (2015-05-29) 1 commit
827 - push --tags: push tags *in addition to* other stuff
829 "git fetch --tags" learned to fetch tags in addition to other stuff
830 a few years ago, but "git push --tags" didn't. Now it does.
833 * jc/commit-slab (2015-05-22) 1 commit
834 - commit-slab: introduce slabname##_peek() function
836 Memory use reduction when commit-slab facility is used to annotate
837 sparsely (which is not recommended in the first place).
840 * jc/clone-bundle (2015-04-30) 1 commit
841 - repack: optionally create a clone.bundle
846 * ee/clean-remove-dirs (2015-06-26) 6 commits
847 (merged to 'next' on 2015-06-29 at d595659)
848 + read_gitfile_gently: fix use-after-free
849 (merged to 'next' on 2015-06-24 at 7c27821)
850 + clean: improve performance when removing lots of directories
851 + p7300: add performance tests for clean
852 + t7300: add tests to document behavior of clean and nested git
853 + setup: sanity check file size in read_gitfile_gently
854 + setup: add gentle version of read_gitfile
856 Replace "is this subdirectory a separate repository that should not
857 be touched?" check "git clean" does by checking if it has .git/HEAD
858 using the submodule-related code with a more optimized check.
860 Will merge to 'master'.
863 * jc/merge-drop-old-syntax (2015-04-29) 1 commit
864 (merged to 'next' on 2015-05-28 at 6bfd8b9)
865 + merge: drop 'git merge <message> HEAD <commit>' syntax
867 Stop supporting "git merge <message> HEAD <commit>" syntax that
868 has been deprecated since October 2007.
870 Will keep in 'next' during the 2.5 cycle.