global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-01 12:30:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bc/filter-process'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2020-03-26 17:11:20 -07:00
parent fa82be982d 0c0f8a7f28
commit 4e4baee3f4
20 changed files with 350 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/rebase.c
View File

@@ -868,6 +868,7 @@ static int reset_head(struct object_id *oid, const char *action,
unpack_tree_opts.fn = reset_hard ? oneway_merge : twoway_merge;
unpack_tree_opts.update = 1;
unpack_tree_opts.merge = 1;
init_checkout_metadata(&unpack_tree_opts.meta, switch_to_branch, oid, NULL);
if (!detach_head)
unpack_tree_opts.reset = 1;