1 To: git@vger.kernel.org
3 Subject: What's cooking in git.git (Jul 2015, #01; Wed, 1)
4 X-master-at: cbed29f37b690e0a497bd2b6ca9a5bdd7e6ea5aa
5 X-next-at: 417e6682ab1b640df833193fd7f33c19661721b2
7 What's cooking in git.git (Jul 2015, #01; Wed, 1)
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 You can find the changes described here in the integration branches
15 of the repositories listed at
17 http://git-blame.blogspot.com/p/git-public-repositories.html
19 --------------------------------------------------
20 [Graduated to "master"]
22 * da/mergetool-winmerge (2015-06-19) 1 commit
23 (merged to 'next' on 2015-06-24 at 2fb10c4)
24 + mergetool-lib: fix default tool selection
26 Hotfix for an earlier change already in 'master' that broke the
27 default tool selection for mergetool.
30 * jc/prompt-document-ps1-state-separator (2015-06-10) 1 commit
31 (merged to 'next' on 2015-06-24 at e4d1bad)
32 + git-prompt.sh: document GIT_PS1_STATESEPARATOR
37 * me/fetch-into-shallow-safety (2015-06-17) 1 commit
38 (merged to 'next' on 2015-06-24 at 8ecc19a)
39 + fetch-pack: check for shallow if depth given
41 "git fetch --depth=<depth>" and "git clone --depth=<depth>" issued
42 a shallow transfer request even to an upload-pack that does not
43 support the capability.
46 * mm/describe-doc (2015-06-16) 1 commit
47 (merged to 'next' on 2015-06-24 at 75e34cc)
48 + Documentation/describe: improve one-line summary
52 --------------------------------------------------
55 * jk/rev-list-no-bitmap-while-pruning (2015-07-01) 1 commit
56 - rev-list: disable --use-bitmap-index when pruning commits
58 A minor bugfix when pack bitmap was brought in.
63 * kb/config-unmap-before-renaming (2015-06-30) 1 commit
64 - config.c: fix writing config files on Windows network shares
69 * ls/hint-rev-list-count (2015-07-01) 1 commit
70 - rev-list: add --count to usage guide
75 * mh/fast-import-get-mark (2015-07-01) 1 commit
76 - fast-import: add a get-mark command
81 * nd/dwim-wildcards-as-pathspecs (2015-07-01) 1 commit
82 - Add tests for wildcard "path vs ref" disambiguation
84 Will merge to 'next' and then to 'master'.
86 --------------------------------------------------
89 * sg/config-name-only (2015-05-28) 3 commits
90 - completion: use new 'git config' options to reliably list variable names
92 - config: add options to list only variable names
94 "git config --list" output was hard to parse when values consist of
95 multiple lines. Introduce a way to show only the keys.
97 Adding a single --name-only option may be a better way to go than
98 adding two new options.
103 * kk/log-merges-config (2015-04-21) 5 commits
104 - bash-completion: add support for git-log --merges= and log.merges
105 - t4202-log: add tests for --merges=
106 - Documentation: add git-log --merges= option and log.merges config. var
107 - log: honor log.merges= option
108 - revision: add --merges={show|only|hide} option
110 "git log" (but not other commands in the "log" family) learned to
111 pay attention to the log.merges configuration variable that can be
112 set to "show" (the normal behaviour), "only" (hide non-merge
113 commits), or "hide" (hide merge commits). --merges=(show|only|hide)
114 can be used to override the setting from the command line.
116 The documentation may need to be updated once more ($gmane/267250).
117 Waiting for a reroll.
120 * mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
121 - t/lib-git-svn: check same httpd module dirs as lib-httpd
122 - t/lib-httpd: load mod_unixd
124 This is the first two commits in a three-patch series $gmane/266962
126 with updated log message ($gmane/268061).
129 * mh/numparse (2015-03-19) 14 commits
130 - diff_opt_parse(): use convert_i() when handling --abbrev=<num>
131 - diff_opt_parse(): use convert_i() when handling "-l<num>"
132 - opt_arg(): simplify pointer handling
133 - opt_arg(): report errors parsing option values
134 - opt_arg(): use convert_i() in implementation
135 - opt_arg(): val is always non-NULL
136 - builtin_diff(): detect errors when parsing --unified argument
137 - handle_revision_opt(): use convert_ui() when handling "--abbrev="
138 - strtoul_ui(), strtol_i(): remove functions
139 - handle_revision_opt(): use convert_i() when handling "-<digit>"
140 - handle_revision_opt(): use skip_prefix() in many places
141 - write_subdirectory(): use convert_ui() for parsing mode
142 - cacheinfo_callback(): use convert_ui() when handling "--cacheinfo"
143 - numparse: new module for parsing integral numbers
145 Many codepaths use unchecked use of strtol() and friends (or even
146 worse, atoi()). Introduce a set of wrappers that try to be more
153 * tf/gitweb-project-listing (2015-03-19) 5 commits
154 - gitweb: make category headings into links when they are directories
155 - gitweb: optionally set project category from its pathname
156 - gitweb: add a link under the search box to clear a project filter
157 - gitweb: if the PATH_INFO is incomplete, use it as a project_filter
158 - gitweb: fix typo in man page
160 Update gitweb to make it more pleasant to deal with a hierarchical
161 forest of repositories.
163 Any comments from those who use or have their own code in Gitweb?
166 * jc/a-lone-dash-stands-for-previous-branch (2015-03-16) 1 commit
167 - "-" and "@{-1}" on various programs
169 Lose special case code to make a lone dash "-" mean the previous
170 branch aka "@{-1}" from a handful subcommands, and instead support
171 the notation throughout the system by reimplementing it at the
174 Needs tests, documentation updates, etc. Also does only a half-way
175 job dealing with range notation, which needs to be fixed before the
176 series goes anywhere.
179 * nd/list-files (2015-02-09) 21 commits
180 - t3080: tests for git-list-files
181 - list-files: -M aka diff-cached
182 - list-files -F: show submodules with the new indicator '&'
183 - list-files: add -F/--classify
184 - list-files: show directories as well as files
185 - list-files: do not show duplicate cached entries
186 - list-files: sort output and remove duplicates
187 - list-files: add -t back
188 - list-files: add -1 short for --no-column
189 - list-files: add -R/--recursive short for --max-depth=-1
190 - list-files: -u does not imply showing stages
191 - list-files: make alias 'ls' default to 'list-files'
192 - list-files: a user friendly version of ls-files and more
193 - ls-files: support --max-depth
194 - ls-files: add --column
195 - ls-files: add --color to highlight file names
196 - ls-files: buffer full item in strbuf before printing
197 - ls_colors.c: highlight submodules like directories
198 - ls_colors.c: add a function to color a file name
199 - ls_colors.c: parse color.ls.* from config file
200 - ls_colors.c: add $LS_COLORS parsing code
202 A new "git list-files" Porcelain command, "ls-files" with bells and
205 Reroll to base on wt-status work ($gmane/265142) has seen some
206 positive discussions.
208 Waiting for a further polished reroll ($gmane/265534).
211 * nd/pathspec-strip-fix (2015-04-18) 1 commit
212 - pathspec: adjust prefixlen after striping trailing slash
214 Does not quite fix ($gmane/267614).
218 * jc/diff-b-m (2015-02-23) 5 commits
221 - diffcore-rename: allow easier debugging
222 - diffcore-rename.c: add locate_rename_src()
223 - diffcore-break: allow debugging
225 "git diff -B -M" produced incorrect patch when the postimage of a
226 completely rewritten file is similar to the preimage of a removed
227 file; such a resulting file must not be expressed as a rename from
230 The fix in this patch is broken, unfortunately.
233 * pw/remote-set-url-fetch (2014-11-26) 1 commit
234 - remote: add --fetch and --both options to set-url
239 * tr/remerge-diff (2014-11-10) 9 commits
240 - t4213: avoid "|" in sed regexp
241 - log --remerge-diff: show what the conflict resolution changed
242 - name-hash: allow dir hashing even when !ignore_case
243 - merge-recursive: allow storing conflict hunks in index
244 - merge_diff_mode: fold all merge diff variants into an enum
245 - combine-diff: do not pass revs->dense_combined_merges redundantly
246 - merge-recursive: -Xindex-only to leave worktree unchanged
247 - merge-recursive: internal flag to avoid touching the worktree
248 - merge-recursive: remove dead conditional in update_stages()
250 "log -p" output learns a new way to let users inspect a merge
251 commit by showing the differences between the automerged result
252 with conflicts the person who recorded the merge would have seen
253 and the final conflict resolution that was recorded in the merge.
255 Waiting for a reroll.
259 * tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
260 - perf-lib: add test_perf_cleanup target
261 - perf-lib: split starting the test from the execution
263 Add test_perf_cleanup shell function to the perf suite, that allows
264 the script writers to define a test with a clean-up action.
269 * jc/show-branch (2014-03-24) 5 commits
270 - show-branch: use commit slab to represent bitflags of arbitrary width
271 - show-branch.c: remove "all_mask"
272 - show-branch.c: abstract out "flags" operation
273 - show-branch.c: lift all_mask/all_revs to a global static
274 - show-branch.c: update comment style
276 Waiting for the final step to lift the hard-limit.
278 --------------------------------------------------
281 * kb/i18n-doc (2015-07-01) 1 commit
282 - Documentation/i18n.txt: clarify character encoding support
284 Will merge to 'next'.
287 * kb/use-nsec-doc (2015-07-01) 1 commit
288 - Makefile / racy-git.txt: clarify USE_NSEC prerequisites
290 Will merge to 'next'.
293 * dt/refs-backend-preamble (2015-06-30) 8 commits
294 - git-stash: use git-reflog instead of creating files
296 - git-reflog: add create and exists functions
297 - refs: new public ref function: safe_create_reflog
298 - refs: break out check for reflog autocreation
299 - bisect: treat BISECT_HEAD as a ref
300 - cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs
301 - refs.c: add err arguments to reflog functions
303 In preparation for allowing different "backends" to store the refs
304 in a way different from the traditional "one ref per file in $GIT_DIR
305 or in a $GIT_DIR/packed-refs file" filesystem storage, reduce
306 direct filesystem access to ref-like things like CHERRY_PICK_HEAD
307 from scripts and programs.
309 Will merge to 'next' after squashing the fix in.
312 * et/http-proxyauth (2015-06-29) 1 commit
313 - http: always use any proxy auth method available
315 We used to ask libCURL to use the most secure authentication method
316 available when talking to an HTTP proxy only when we were told to
317 talk to one via configuration variables. We now ask libCURL to
318 always use the most secure authentication method, because the user
319 can tell libCURL to use an HTTP proxy via an environment variable
320 without using configuration variables.
322 Looked sensible. An extra set of eyes appreciated, but I think
325 Will merge to 'next'.
328 * jc/fsck-retire-require-eoh (2015-06-28) 1 commit
329 - fsck: it is OK for a tag and a commit to lack the body
331 A fix to a minor regression to "git fsck" in v2.2 era that started
332 complaining about a body-less tag object when it lacks a separator
333 empty line after its header to separate it with a non-existent body.
335 Will merge to 'next'.
338 * jk/date-mode-format (2015-06-29) 3 commits
339 - introduce "format" date-mode
340 - convert "enum date_mode" into a struct
341 - show-branch: use DATE_RELATIVE instead of magic number
343 Teach "git log" and friends a new "--date=format:..." option to
344 format timestamps using system's strftime(3).
346 Will merge to 'next'.
349 * jk/still-interesting (2015-06-29) 1 commit
350 - revision.c: remove unneeded check for NULL
354 Will merge to 'next'.
357 * nd/export-worktree (2015-06-26) 1 commit
358 - setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR
360 Running an aliased command from a subdirectory when the .git thing
361 in the working tree is a gitfile pointing elsewhere did not work.
363 Will merge to 'next'.
366 * sb/p5310-and-chain (2015-06-26) 1 commit
367 - p5310: Fix broken && chain in performance test
371 Will merge to 'next'.
374 * jc/rerere (2015-06-30) 13 commits
375 - rerere: refactor "replay" part of do_plain_rerere()
376 - rerere: explain the remainder
377 - rerere: explain "rerere forget" codepath
378 - rerere: explain the primary codepath
379 - rerere: explain MERGE_RR management helpers
380 - rerere: explain the rerere I/O abstraction
381 - rerere: stop looping unnecessarily
382 - rerere: drop want_sp parameter from is_cmarker()
383 - rerere: report autoupdated paths only after actually updating them
384 - rerere: write out each record of MERGE_RR in one go
385 - rerere: lift PATH_MAX limitation
386 - rerere: plug conflict ID leaks
387 - rerere: fix an off-by-one non-bug
389 Code clean-up and minor fixes.
392 * ad/bisect-terms (2015-06-29) 10 commits
393 - bisect: allow setting any user-specified in 'git bisect start'
394 - bisect: add 'git bisect terms' to view the current terms
395 - bisect: add the terms old/new
396 - bisect: sanity check on terms
397 - bisect: don't mix option parsing and non-trivial code
398 - bisect: simplify the addition of new bisect terms
399 - bisect: replace hardcoded "bad|good" by variables
400 - Documentation/bisect: revise overall content
401 - Documentation/bisect: move getting help section to the end
402 - bisect: correction of typo
404 The use of 'good/bad' in "git bisect" made it confusing to use when
405 hunting for a state change that is not a regression (e.g. bugfix).
406 The command learned 'old/new' and then allows the end user to
407 say e.g. "bisect start --term-old=fast --term=new=slow" to find a
408 performance regression.
410 The bottom part has been quite well cooked. Perhaps split it into
411 two topisc and merge the earlier ones to 'next' before the rest
412 settles. Michael's idea to make 'good/bad' more intelligent does
413 have certain attractiveness ($gname/272867).
416 * mh/tempfile (2015-06-10) 14 commits
417 - credential-cache--daemon: use tempfile module
418 - credential-cache--daemon: delete socket from main()
419 - gc: use tempfile module to handle gc.pid file
420 - lock_repo_for_gc(): compute the path to "gc.pid" only once
421 - diff: use tempfile module
422 - setup_temporary_shallow(): use tempfile module
423 - write_shared_index(): use tempfile module
424 - register_tempfile(): new function to handle an existing temporary file
425 - tempfile: add several functions for creating temporary files
426 - register_tempfile_object(): new function, extracted from create_tempfile()
427 - commit_lock_file(): use get_locked_file_path()
428 - lockfile: remove some redundant functions
429 - tempfile: a new module for handling temporary files
430 - Move lockfile API documentation to lockfile.h
432 Rebuild "lockfile" API on top of a new "tempfile" API.
433 This needs rerolling, to include "tempfile.h" in "lockfile.h", at
440 * js/fsck-opt (2015-06-23) 19 commits
441 - fsck: support ignoring objects in `git fsck` via fsck.skiplist
442 - fsck: git receive-pack: support excluding objects from fsck'ing
443 - fsck: introduce `git fsck --connectivity-only`
444 - fsck: support demoting errors to warnings
445 - fsck: document the new receive.fsck.<msg-id> options
446 - fsck: allow upgrading fsck warnings to errors
447 - fsck: optionally ignore specific fsck issues completely
448 - fsck: disallow demoting grave fsck errors to warnings
449 - fsck: add a simple test for receive.fsck.<msg-id>
450 - fsck: make fsck_tag() warn-friendly
451 - fsck: handle multiple authors in commits specially
452 - fsck: make fsck_commit() warn-friendly
453 - fsck: make fsck_ident() warn-friendly
454 - fsck: report the ID of the error/warning
455 - fsck (receive-pack): allow demoting errors to warnings
456 - fsck: offer a function to demote fsck errors to warnings
457 - fsck: provide a function to parse fsck message IDs
458 - fsck: introduce identifiers for fsck messages
459 - fsck: introduce fsck options
461 Allow ignoring fsck errors on specific set of known-to-be-bad
462 objects, and also tweaking warning level of various kinds of non
463 critical breakages reported.
465 Will merge to 'next'.
468 * js/rebase-i-clean-up-upon-continue-to-skip (2015-06-29) 2 commits
469 - rebase -i: do not leave a CHERRY_PICK_HEAD file behind
470 - t3404: demonstrate CHERRY_PICK_HEAD bug
472 Abandoning an already applied change in "git rebase -i" with
473 "--continue" left CHERRY_PICK_HEAD and confused later steps.
475 Will merge to 'next'.
478 * rh/test-color-avoid-terminfo-in-original-home (2015-06-17) 2 commits
479 (merged to 'next' on 2015-06-24 at 6af5fa7)
480 + test-lib.sh: fix color support when tput needs ~/.terminfo
481 + Revert "test-lib.sh: do tests for color support after changing HOME"
483 An ancient test framework enhancement to allow color was not
484 entirely correct; this makes it work even when tput needs to read
485 from the ~/.terminfo under the user's real HOME directory.
487 Will merge to 'master'.
490 * tb/checkout-doc (2015-06-17) 1 commit
491 - git-checkout.txt: document "git checkout <pathspec>" better
495 Will merge to 'next'.
498 * jk/pretty-encoding-doc (2015-06-17) 1 commit
499 - docs: clarify that --encoding can produce invalid sequences
503 Will merge to 'next'.
506 * ak/format-patch-odir-config (2015-06-19) 1 commit
507 - format-patch: introduce format.outputDirectory configuration
509 Reroll exists but didn't pick it up as it seems to be still
510 collecting review comments.
516 * bc/gpg-verify-raw (2015-06-22) 7 commits
517 (merged to 'next' on 2015-06-24 at 08a1164)
518 + verify-tag: add option to print raw gpg status information
519 + verify-commit: add option to print raw gpg status information
520 + gpg: centralize printing signature buffers
521 + gpg: centralize signature check
522 + verify-commit: add test for exit status on untrusted signature
523 + verify-tag: share code with verify-commit
524 + verify-tag: add tests
526 "git verify-tag" and "git verify-commit" have been taught to share
527 more code, and then learned to optionally show the verification
528 message from the underlying GPG implementation.
530 Will merge to 'master'.
533 * cb/parse-magnitude (2015-06-22) 2 commits
534 (merged to 'next' on 2015-06-24 at 2fd7205)
535 + parse-options: move unsigned long option parsing out of pack-objects.c
536 + test-parse-options: update to handle negative ints
538 Move machinery to parse human-readable scaled numbers like 1k, 4M,
539 and 2G as an option parameter's value from pack-objects to
540 parse-options API, to make it available to other codepaths.
542 Will merge to 'master'.
545 * cb/subtree-tests-update (2015-06-22) 3 commits
546 (merged to 'next' on 2015-06-24 at 31a2938)
547 + contrib/subtree: small tidy-up to test
548 + contrib/subtree: fix broken &&-chains and revealed test error
549 + contrib/subtree: use tabs consitently for indentation in tests
551 Tests update in contrib/subtree.
553 Will merge to 'master'.
556 * jk/cat-file-batch-all (2015-06-26) 8 commits
557 - cat-file: sort and de-dup output of --batch-all-objects
558 - cat-file: add --batch-all-objects option
559 - cat-file: split batch_one_object into two stages
560 - cat-file: stop returning value from batch_one_object
561 - cat-file: add --buffer option
562 - cat-file: move batch_options definition to top of file
563 - cat-file: minor style fix in options list
564 - Merge branch 'jk/maint-for-each-packed-object' into jk/cat-file-batch-all
565 (this branch uses jk/maint-for-each-packed-object.)
567 "cat-file" learned "--batch-all-objects" option to enumerate all
568 available objects in the repository more quickly than "rev-list
569 --all --objects" (the output includes unreachable objects, though).
571 Will merge to 'next'.
574 * jk/maint-for-each-packed-object (2015-06-22) 1 commit
575 (merged to 'next' on 2015-06-24 at 162e134)
576 + for_each_packed_object: automatically open pack index
577 (this branch is used by jk/cat-file-batch-all.)
579 The for_each_packed_object() API function did not iterate over
580 objects in a packfile that hasn't been used yet.
582 Will merge to 'master'.
585 * jk/pkt-log-pack (2015-06-16) 3 commits
586 - pkt-line: support tracing verbatim pack contents
587 - pkt-line: tighten sideband PACK check when tracing
588 - pkt-line: simplify starts_with checks in packet tracing
590 Enhance packet tracing machinery to allow capturing an incoming
591 pack data to a file for debugging.
593 Will merge to 'next'.
596 * kn/for-each-ref (2015-06-15) 11 commits
597 (merged to 'next' on 2015-06-24 at 1a3a734)
598 + ref-filter: make 'ref_array_item' use a FLEX_ARRAY for refname
599 + for-each-ref: introduce filter_refs()
600 + ref-filter: move code from 'for-each-ref'
601 + ref-filter: add 'ref-filter.h'
602 + for-each-ref: rename variables called sort to sorting
603 + for-each-ref: rename some functions and make them public
604 + for-each-ref: introduce 'ref_array_clear()'
605 + for-each-ref: introduce new structures for better organisation
606 + for-each-ref: rename 'refinfo' to 'ref_array_item'
607 + for-each-ref: clean up code
608 + for-each-ref: extract helper functions out of grab_single_ref()
609 (this branch is used by kn/for-each-tag-branch.)
611 GSoC project to rebuild ref listing by branch and tag based on the
612 for-each-ref machinery. This is its first part.
615 * mh/init-delete-refs-api (2015-06-22) 19 commits
616 - delete_ref(): use the usual convention for old_sha1
617 - cmd_update_ref(): make logic more straightforward
618 - update_ref(): don't read old reference value before delete
619 - check_branch_commit(): make first parameter const
620 - refs.h: add some parameter names to function declarations
621 - refs: move the remaining ref module declarations to refs.h
622 - initial_ref_transaction_commit(): check for ref D/F conflicts
623 - initial_ref_transaction_commit(): check for duplicate refs
624 - refs: remove some functions from the module's public interface
625 - initial_ref_transaction_commit(): function for initial ref creation
626 - repack_without_refs(): make function private
627 - prune_refs(): use delete_refs()
628 - prune_remote(): use delete_refs()
629 - delete_refs(): bail early if the packed-refs file cannot be rewritten
630 - delete_refs(): make error message more generic
631 - delete_refs(): new function for the refs API
632 - delete_ref(): handle special case more explicitly
633 - remove_branches(): remove temporary
634 - delete_ref(): move declaration to refs.h
636 Clean up refs API and make "git clone" less intimate with the
637 implementation detail.
639 Will merge to 'next'.
642 * mh/replace-refs (2015-06-12) 1 commit
643 (merged to 'next' on 2015-06-24 at cb13adf)
644 + Allow to control where the replace refs are looked for
646 Add an environment variable to tell Git to look into refs hierarchy
647 other than refs/replace/ for the object replacement data.
650 * nd/multiple-work-trees (2015-07-01) 3 commits
651 - worktree: replace "checkout --to" with "worktree add"
652 (merged to 'next' on 2015-06-29 at fd4eb60)
653 + worktree: new place for "git prune --worktrees"
654 (merged to 'next' on 2015-06-24 at 7c3f918)
655 + checkout: don't check worktrees when not necessary
657 "git checkout [<tree-ish>] <paths>" spent unnecessary cycles
658 checking if the current branch was checked out elsewhere, when we
659 know we are not switching the branches ourselves.
661 Waiting for a reroll to transition to "worktree add".
664 * gp/status-rebase-i-info (2015-07-01) 5 commits
665 - status: add new tests for status during rebase -i
667 - status: give more information during rebase -i
668 - status: differentiate interactive from non-interactive rebases
669 - status: factor two rebase-related messages together
671 Teach "git status" to show a more detailed information regarding
672 the "rebase -i" session in progress.
674 Reroll exists; not picked up yet.
677 * mk/utf8-no-iconv-warn (2015-06-08) 1 commit
678 - utf8.c: print warning about disabled iconv
680 Warn when a reencoding is requested in a build without iconv
681 support, as the end user is likely to get an unexpected result. I
682 think the same level of safety should be added to a build with
683 iconv support when the specified encoding is not available, but the
684 patch does not go there.
689 * mr/rebase-i-customize-insn-sheet (2015-06-15) 1 commit
690 - git-rebase--interactive.sh: add config option for custom instruction format
692 "git rebase -i"'s list of todo is made configurable.
694 Will merge to 'next'.
697 * pt/am-foreign (2015-06-15) 5 commits
698 (merged to 'next' on 2015-06-24 at 838c702)
699 + am: teach mercurial patch parser how to read from stdin
700 + am: use gmtime() to parse mercurial patch date
701 + t4150: test applying StGit series
702 + am: teach StGit patch parser how to read from stdin
703 + t4150: test applying StGit patch
705 Various enhancements around "git am" reading patches generated by
709 * pt/pull-builtin (2015-06-18) 19 commits
710 - pull: remove redirection to git-pull.sh
711 - pull --rebase: error on no merge candidate cases
712 - pull --rebase: exit early when the working directory is dirty
713 - pull: configure --rebase via branch.<name>.rebase or pull.rebase
714 - pull: teach git pull about --rebase
715 - pull: set reflog message
716 - pull: implement pulling into an unborn branch
717 - pull: fast-forward working tree if head is updated
718 - pull: check if in unresolved merge state
719 - pull: support pull.ff config
720 - pull: error on no merge candidates
721 - pull: pass git-fetch's options to git-fetch
722 - pull: pass git-merge's options to git-merge
723 - pull: pass verbosity, --progress flags to fetch and merge
724 - pull: implement fetch + merge
725 - pull: implement skeletal builtin pull
726 - argv-array: implement argv_array_pushv()
727 - parse-options-cb: implement parse_opt_passthru_argv()
728 - parse-options-cb: implement parse_opt_passthru()
730 Reimplement 'git pull' in C.
732 This is v4 ($gmane/271943).
733 Will merge to 'next'.
736 * rl/send-email-aliases (2015-07-01) 10 commits
737 - send-email: suppress meaningless whitespaces in from field
738 - send-email: allow multiple emails using --cc, --to and --bcc
739 - send-email: consider quote as delimiter instead of character
740 - send-email: reduce dependencies impact on parse_address_line
741 - send-email: minor code refactoring
742 - send-email: allow use of aliases in the From field of --compose mode
743 - send-email: refactor address list process
744 - t9001-send-email: refactor header variable fields replacement
745 - send-email: allow aliases in patch header and command script outputs
746 - t9001-send-email: move script creation in a setup test
748 "git send-email" now performs alias-expansion on names that are
749 given via --cccmd, etc.
751 This round comes with a lot more enhanced e-mail address parser,
752 which makes it a bit scary, but as long as it works as designed, it
753 makes it wonderful ;-).
755 Will merge to 'next'.
758 * wp/sha1-name-negative-match (2015-06-08) 2 commits
759 - sha1_name.c: introduce '^{/!-<negative pattern>}' notation
760 - test for '!' handling in rev-parse's named commits
762 Introduce "branch^{/!-<pattern>}" notation to name a commit
763 reachable from branch that does not match the given pattern.
768 * bc/object-id (2015-06-17) 10 commits
769 . remote.c: use struct object_id in many functions
770 . object-id: use struct object_id in struct object
771 . remote.c: use struct object_id in ref_newer()
772 . transport-helper.c: use struct object_id in push_refs_with_export()
773 . connect.c: use struct object_id in get_remote_heads()
774 . remote-curl: use struct object_id in parse_fetch()
775 . fetch-pack: use struct object_id in add_sought_entry_mem()
776 . object_id: convert struct ref to use object_id.
777 . sha1_file: introduce has_object_file() helper
778 . refs: convert some internal functions to use object_id
780 More transition from "unsigned char[40]" to "struct object_id".
782 While GSoC and other topics are actively moving existing code
783 around, this cannot go in; ejected from 'pu'.
786 * jk/log-missing-default-HEAD (2015-06-03) 1 commit
787 - log: diagnose empty HEAD more clearly
789 "git init empty && git -C empty log" said "bad default revision 'HEAD'",
790 which was found to be a bit confusing to new users.
792 What's the status of this one?
795 * gr/rebase-i-drop-warn (2015-06-30) 3 commits
796 - git rebase -i: add static check for commands and SHA-1
797 - git rebase -i: warn about removed commits
798 - git-rebase -i: add command "drop" to remove a commit
800 Add "drop commit-object-name subject" command as another way to
801 skip replaying of a commit in "rebase -i", and then punish those
802 who do not use it (and instead just remove the lines) by throwing
805 Will merge to 'next'.
808 * jh/strbuf-read-use-read-in-full (2015-06-01) 1 commit
809 - strbuf_read(): skip unnecessary strbuf_grow() at eof
811 Avoid one extra iteration and strbuf_grow() of 8kB in
814 Looked reasonable; perhaps a log message clarification is needed.
819 * mg/index-read-error-messages (2015-06-01) 2 commits
820 - messages: uniform error messages for index write
821 - show-index: uniform error messages for index read
827 * hv/submodule-config (2015-06-15) 4 commits
828 - do not die on error of parsing fetchrecursesubmodules option
829 - use new config API for worktree configurations of submodules
830 - extract functions for submodule config set and lookup
831 - implement submodule config API for lookup of .gitmodules values
833 The gitmodules API accessed from the C code learned to cache stuff
836 Looked reasonable from a cursory read.
838 Will merge to 'next'.
841 * jc/push-tags-also (2015-05-29) 1 commit
842 - push --tags: push tags *in addition to* other stuff
844 "git fetch --tags" learned to fetch tags in addition to other stuff
845 a few years ago, but "git push --tags" didn't. Now it does.
847 A change to push out more than before always invites "what if the
848 user makes a mistake" worries.
853 * jc/commit-slab (2015-05-22) 1 commit
854 - commit-slab: introduce slabname##_peek() function
856 Memory use reduction when commit-slab facility is used to annotate
857 sparsely (which is not recommended in the first place).
859 Will merge to 'next'.
862 * jc/clone-bundle (2015-04-30) 1 commit
863 - repack: optionally create a clone.bundle
865 Waiting for further work.
869 * ee/clean-remove-dirs (2015-06-26) 6 commits
870 (merged to 'next' on 2015-06-29 at d595659)
871 + read_gitfile_gently: fix use-after-free
872 (merged to 'next' on 2015-06-24 at 7c27821)
873 + clean: improve performance when removing lots of directories
874 + p7300: add performance tests for clean
875 + t7300: add tests to document behavior of clean and nested git
876 + setup: sanity check file size in read_gitfile_gently
877 + setup: add gentle version of read_gitfile
879 Replace "is this subdirectory a separate repository that should not
880 be touched?" check "git clean" does by checking if it has .git/HEAD
881 using the submodule-related code with a more optimized check.
883 Will merge to 'master'.
886 * jc/merge-drop-old-syntax (2015-04-29) 1 commit
887 (merged to 'next' on 2015-05-28 at 6bfd8b9)
888 + merge: drop 'git merge <message> HEAD <commit>' syntax
890 Stop supporting "git merge <message> HEAD <commit>" syntax that
891 has been deprecated since October 2007.
893 Will keep in 'next' during the 2.5 cycle.