diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-27 01:11:20 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-27 01:11:20 +0100 |
| commit | 4e4baee3f44da26a5eaab27c76d597b04fef5259 (patch) | |
| tree | 5d0ebb218dddd9fc17531ac75d140bf59eb056da /sequencer.c | |
| parent | Merge branch 'hi/gpg-prefer-check-signature' (diff) | |
| parent | t0021: test filter metadata for additional cases (diff) | |
| download | git-4e4baee3f44da26a5eaab27c76d597b04fef5259.tar.xz git-4e4baee3f44da26a5eaab27c76d597b04fef5259.zip | |
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 'sequencer.c')
| -rw-r--r-- | sequencer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c index c37515ee31..6fd2674632 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3305,6 +3305,7 @@ static int do_reset(struct repository *r, unpack_tree_opts.fn = oneway_merge; unpack_tree_opts.merge = 1; unpack_tree_opts.update = 1; + init_checkout_metadata(&unpack_tree_opts.meta, name, &oid, NULL); if (repo_read_index_unmerged(r)) { rollback_lock_file(&lock); |