diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-03-27 03:11:20 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-03-27 03:11:20 +0300 |
commit | 4e4baee3f44da26a5eaab27c76d597b04fef5259 (patch) | |
tree | 5d0ebb218dddd9fc17531ac75d140bf59eb056da /unpack-trees.c | |
parent | fa82be982dfc5b463a125991a2d381f1cd0ad9eb (diff) | |
parent | 0c0f8a7f28672fa323312fbba394e5a9949b2aad (diff) |
Merge branch 'bc/filter-process'
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
Diffstat (limited to 'unpack-trees.c')
-rw-r--r-- | unpack-trees.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 1dbcb8c1c3..f618a644ef 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -371,6 +371,7 @@ static int check_updates(struct unpack_trees_options *o) state.quiet = 1; state.refresh_cache = 1; state.istate = index; + clone_checkout_metadata(&state.meta, &o->meta, NULL); if (!o->update || o->dry_run) { remove_marked_cache_entries(index, 0); |