]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'bc/filter-process'
authorJunio C Hamano <gitster@pobox.com>
Fri, 27 Mar 2020 00:11:20 +0000 (17:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 27 Mar 2020 00:11:20 +0000 (17:11 -0700)
Provide more information (e.g. the object of the tree-ish in which
the blob being converted appears, in addition to its path, which
has already been given) to smudge/clean conversion filters.

* bc/filter-process:
  t0021: test filter metadata for additional cases
  builtin/reset: compute checkout metadata for reset
  builtin/rebase: compute checkout metadata for rebases
  builtin/clone: compute checkout metadata for clones
  builtin/checkout: compute checkout metadata for checkouts
  convert: provide additional metadata to filters
  convert: permit passing additional metadata to filter processes
  builtin/checkout: pass branch info down to checkout_worktree

1  2 
builtin/clone.c
builtin/rebase.c
cache.h
sequencer.c
unpack-trees.c

diff --cc builtin/clone.c
Simple merge
Simple merge
diff --cc cache.h
Simple merge
diff --cc sequencer.c
Simple merge
diff --cc unpack-trees.c
Simple merge