Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Branch: master
Commits on Oct 12, 2015
  1. @moy

    git-multimail: update to release 1.2.0

    moy authored committed
    The changes are described in CHANGES.
    Contributions-by: Matthieu Moy <>
    Contributions-by: Elijah Newren <>
    Contributions-by: Edward d'Auvergne <>
    Contributions-by: Vadim Zeitlin <>
    Contributions-by: Paul Sokolovsky <>
    Contributions-by: Michael Haggerty <>
    Contributions-by: Elijah Newren <>
    Contributions-by: Richard Hansen <>
    Contributions-by: Job Snijders <>
    Signed-off-by: Matthieu Moy <>
    Signed-off-by: Junio C Hamano <>
Commits on Oct 7, 2015
  1. Second batch for 2.7

    Signed-off-by: Junio C Hamano <>
  2. Merge branch 'ls/p4-path-encoding'

    "git p4" learned to reencode the pathname it uses to communicate
    with the p4 depot with a new option.
    * ls/p4-path-encoding:
      git-p4: use replacement character for non UTF-8 characters in paths
      git-p4: improve path encoding verbose output
      git-p4: add config git-p4.pathEncoding
  3. Merge branch 'gb/filter-branch-progress'

    Give progress meter to "git filter-branch".
    * gb/filter-branch-progress:
      filter-branch: make report-progress more readable
      filter-branch: add passed/remaining seconds on progress
  4. Merge branch 'nd/ignore-then-not-ignore'

    Allow a later "!/abc/def" to override an earlier "/abc" that
    appears in the same .gitignore file to make it easier to express
    "everything in /abc directory is ignored, except for ...".
    * nd/ignore-then-not-ignore:
      dir.c: don't exclude whole dir prematurely if neg pattern may match
      dir.c: make last_exclude_matching_from_list() run til the end
  5. Merge branch 'ti/glibc-stdio-mutex-from-signal-handler'

    Allocation related functions and stdio are unsafe things to call
    inside a signal handler, and indeed killing the pager can cause
    glibc to deadlock waiting on allocation mutex as our signal handler
    tries to free() some data structures in wait_for_pager().  Reduce
    these unsafe calls.
    * ti/glibc-stdio-mutex-from-signal-handler:
      pager: don't use unsafe functions in signal handlers
Commits on Oct 5, 2015
  1. Start cycle toward 2.7

    Signed-off-by: Junio C Hamano <>
  2. Sync with 2.6.1

  3. Merge branch 'mm/keyid-docs'

    Very small number of options take a parameter that is optional
    (which is not a great UI element as they can only appear at the end
    of the command line).  Add notice to documentation of each and
    every one of them.
    * mm/keyid-docs:
      Documentation: explain optional arguments better
      Documentation/grep: fix documentation of -O
      Documentation: use 'keyid' consistently, not 'key-id'
  4. Merge branch 'bb/remote-get-url'

    "git remote" learned "get-url" subcommand to show the URL for a
    given remote name used for fetching and pushing.
    * bb/remote-get-url:
      remote: add get-url subcommand
  5. Merge branch 'jk/blame-first-parent'

    "git blame --first-parent v1.0..v2.0" was not rejected but did not
    limit the blame to commits on the first parent chain.
    * jk/blame-first-parent:
      blame: handle --first-parent
  6. Merge branch 'jw/make-arflags-customizable'

    The Makefile always runs the library archiver with hardcoded "crs"
    options, which was inconvenient for exotic platforms on which
    people want to use programs with totally different set of command
    line options.
    * jw/make-arflags-customizable:
      Makefile: allow $(ARFLAGS) specified from the command line
  7. Merge branch 'jk/rebase-no-autostash'

    There was no way to defeat a configured rebase.autostash variable
    from the command line, as "git rebase --no-autostash" was missing.
    * jk/rebase-no-autostash:
      Documentation/git-rebase: fix --no-autostash formatting
      rebase: support --no-autostash
  8. Merge branch 'jk/make-findstring-makeflags-fix'

    Customization to change the behaviour with "make -w" and "make -s"
    in our Makefile was broken when they were used together.
    * jk/make-findstring-makeflags-fix:
      Makefile: fix MAKEFLAGS tests with multiple flags
  9. Merge branch 'sb/submodule-helper'

    The infrastructure to rewrite "git submodule" in C is being built
    incrementally.  Let's polish these early parts well enough and make
    them graduate to 'next' and 'master', so that the more involved
    follow-up can start cooking on a solid ground.
    * sb/submodule-helper:
      submodule: rewrite `module_clone` shell function in C
      submodule: rewrite `module_name` shell function in C
      submodule: rewrite `module_list` shell function in C
  10. Merge branch 'kn/for-each-tag'

    The "ref-filter" code was taught about many parts of what "tag -l"
    does and then "tag -l" is being reimplemented in terms of "ref-filter".
    * kn/for-each-tag:
      tag.c: implement '--merged' and '--no-merged' options
      tag.c: implement '--format' option
      tag.c: use 'ref-filter' APIs
      tag.c: use 'ref-filter' data structures
      ref-filter: add option to match literal pattern
      ref-filter: add support to sort by version
      ref-filter: add support for %(contents:lines=X)
      ref-filter: add option to filter out tags, branches and remotes
      ref-filter: implement an `align` atom
      ref-filter: introduce match_atom_name()
      ref-filter: introduce handler function for each atom
      utf8: add function to align a string into given strbuf
      ref-filter: introduce ref_formatting_state and ref_formatting_stack
      ref-filter: move `struct atom_value` to ref-filter.c
      strtoul_ui: reject negative values
  11. Merge branch 'jk/test-lint-forbid-when-finished-in-subshell'

    Because "test_when_finished" in our test framework queues the
    clean-up tasks to be done in a shell variable, it should not be
    used inside a subshell.  Add a mechanism to allow 'bash' to catch
    such uses, and fix the ones that were found.
    * jk/test-lint-forbid-when-finished-in-subshell:
      test-lib-functions: detect test_when_finished in subshell
      t7800: don't use test_config in a subshell
      test-lib-functions: support "test_config -C <dir> ..."
      t5801: don't use test_when_finished in a subshell
      t7610: don't use test_config in a subshell
  12. Merge branch 'jk/interpret-trailers-outside-a-repository'

    Allow "git interpret-trailers" to run outside of a Git repository.
    * jk/interpret-trailers-outside-a-repository:
      interpret-trailers: allow running outside a repository
  13. Merge branch 'as/subtree-with-spaces'

    Update "git subtree" (in contrib/) so that it can take whitespaces
    in the pathnames, not only in the in-tree pathname but the name of
    the directory that the repository is in.
    * as/subtree-with-spaces:
      contrib/subtree: respect spaces in a repository path
      t7900-subtree: test the "space in a subdirectory name" case
  14. Merge branch 'jk/connect-clear-env'

    The ssh transport, just like any other transport over the network,
    did not clear GIT_* environment variables, but it is possible to
    use SendEnv and AcceptEnv to leak them to the remote invocation of
    Git, which is not a good idea at all.  Explicitly clear them just
    like we do for the local transport.
    * jk/connect-clear-env:
      git_connect: clarify conn->use_shell flag
      git_connect: clear GIT_* environment for ssh
  15. Merge branch 'jk/date-local'

    "git log --date=local" used to only show the normal (default)
    format in the local timezone.  The command learned to take 'local'
    as an instruction to use the local timezone with other formats,
    e.g. "git show --date=rfc-local".
    * jk/date-local:
      t6300: add tests for "-local" date formats
      t6300: make UTC and local dates different
      date: make "local" orthogonal to date format
      date: check for "local" before anything else
      t6300: add test for "raw" date format
      t6300: introduce test_date() helper
      fast-import: switch crash-report date to iso8601
      Documentation/rev-list: don't list date formats
      Documentation/git-for-each-ref: don't list date formats
      Documentation/config: don't list date formats
      Documentation/blame-options: don't list date formats
  16. Merge branch 'dt/refs-bisection'

    Move the refs used during a "git bisect" session to per-worktree
    hierarchy refs/worktree/* so that independent bisect sessions can
    be done in different worktrees.
    * dt/refs-bisection:
      refs: make refs/bisect/* per-worktree
      path: optimize common dir checking
      refs: clean up common_list
  17. Merge branch 'nk/stash-show-config'

    Users who are too busy to type three extra keystrokes to ask for
    "git stash show -p" can now set stash.showPatch configuration
    varible to true to always see the actual patch, not just the list
    of paths affected with feel for the extent of damage via diffstat.
    * nk/stash-show-config:
      stash: allow "stash show" diff output configurable
  18. Merge branch 'jk/async-pkt-line'

    The debugging infrastructure for pkt-line based communication has
    been improved to mark the side-band communication specifically.
    * jk/async-pkt-line:
      pkt-line: show packets in async processes as "sideband"
      run-command: provide in_async query function
  19. Merge branch 'jh/quiltimport-explicit-series-file'

    "quiltimport" allows to specify the series file by honoring the
    $QUILT_SERIES environment and also --series command line option.
    * jh/quiltimport-explicit-series-file:
      git-quiltimport: add commandline option --series <file>
  20. Merge branch 'ld/p4-import-labels'

    Correct "git p4 --detect-labels" so that it does not fail to create
    a tag that points at a commit that is also being imported.
    * ld/p4-import-labels:
      git-p4: fix P4 label import for unprocessed commits
      git-p4: do not terminate creating tag for unknown commit
      git-p4: failing test for ignoring invalid p4 labels
  21. Merge branch 'ad/bisect-terms'

    The use of 'good/bad' in "git bisect" made it confusing to use when
    hunting for a state change that is not a regression (e.g. bugfix).
    The command learned 'old/new' and then allows the end user to
    say e.g. "bisect start --term-old=fast --term=new=slow" to find a
    performance regression.
    Michael's idea to make 'good/bad' more intelligent does have
    certain attractiveness ($gname/272867), and makes some of the work
    on this topic a moot point.
    * ad/bisect-terms:
      bisect: allow setting any user-specified in 'git bisect start'
      bisect: add 'git bisect terms' to view the current terms
      bisect: add the terms old/new
      bisect: sanity check on terms
  22. Merge branch 'jc/rerere'

    Code clean-up and minor fixes.
    * jc/rerere: (21 commits)
      rerere: un-nest merge() further
      rerere: use "struct rerere_id" instead of "char *" for conflict ID
      rerere: call conflict-ids IDs
      rerere: further clarify do_rerere_one_path()
      rerere: further de-dent do_plain_rerere()
      rerere: refactor "replay" part of do_plain_rerere()
      rerere: explain the remainder
      rerere: explain "rerere forget" codepath
      rerere: explain the primary codepath
      rerere: explain MERGE_RR management helpers
      rerere: fix benign off-by-one non-bug and clarify code
      rerere: explain the rerere I/O abstraction
      rerere: do not leak mmfile[] for a path with multiple stage #1 entries
      rerere: stop looping unnecessarily
      rerere: drop want_sp parameter from is_cmarker()
      rerere: report autoupdated paths only after actually updating them
      rerere: write out each record of MERGE_RR in one go
      rerere: lift PATH_MAX limitation
      rerere: plug conflict ID leaks
      rerere: handle conflicts with multiple stage #1 entries
  23. Merge branch 'kn/for-each-tag-branch'

    Some features from "git tag -l" and "git branch -l" have been made
    available to "git for-each-ref" so that eventually the unified
    implementation can be shared across all three, in a follow-up
    series or two.
    * kn/for-each-tag-branch:
      for-each-ref: add '--contains' option
      ref-filter: implement '--contains' option
      parse-options.h: add macros for '--contains' option
      parse-option: rename parse_opt_with_commit()
      for-each-ref: add '--merged' and '--no-merged' options
      ref-filter: implement '--merged' and '--no-merged' options
      ref-filter: add parse_opt_merge_filter()
      for-each-ref: add '--points-at' option
      ref-filter: implement '--points-at' option
      tag: libify parse_opt_points_at()
      t6302: for-each-ref tests for ref-filter APIs
Commits on Sep 29, 2015
  1. Git 2.6.1

    Signed-off-by: Junio C Hamano <>
  2. Sync with v2.5.4

Commits on Sep 28, 2015
  1. Git 2.5.4

    Signed-off-by: Junio C Hamano <>
  2. Sync with 2.4.10

  3. Git 2.4.10

    Signed-off-by: Junio C Hamano <>
  4. Sync with 2.3.10

Something went wrong with that request. Please try again.