Smudge and clean filters are currently provided with one particular
piece of data: the pathname of the file being smudged. While this is
helpful, there are a variety of situations where people would like to
have more data. This series introduces additional data for these
filters.
I decided that there is indeed value to providing the full ref when
using git checkout, so an invocation that uses a tag will now pass that
tag along. It's easy for filters that don't want this data to simply
ignore it, but significantly harder to recover if it's not provided.
One thing I should mention here that may seem obvious: this metadata
only appears for smudge filters. We obviously cannot know the blob when
data is being cleaned, and the ref, commit, and tree are already known
at that point (because one is using "git add" or an equivalent), so the
filter can simply do a git rev-parse if it's curious.
Changes from v1:
* Add support for arbitrary refs to checkout.
* Use FREE_AND_NULL where appropriate.
* Improve commit message to explain expected result and data as well as
rationale.
brian m. carlson (8):
builtin/checkout: pass branch info down to checkout_worktree
convert: permit passing additional metadata to filter processes
convert: provide additional metadata to filters
builtin/checkout: compute checkout metadata for checkouts
builtin/clone: compute checkout metadata for clones
builtin/rebase: compute checkout metadata for rebases
builtin/reset: compute checkout metadata for reset
t0021: test filter metadata for additional cases
apply.c | 2 +-
archive.c | 13 ++-
archive.h | 1 +
builtin/cat-file.c | 5 +-
builtin/checkout.c | 64 +++++++++----
builtin/clone.c | 5 +-
builtin/rebase.c | 1 +
builtin/reset.c | 16 +++-
cache.h | 1 +
convert.c | 66 ++++++++++++--
convert.h | 29 +++++-
diff.c | 5 +-
entry.c | 7 +-
merge-recursive.c | 2 +-
merge.c | 1 +
sequencer.c | 1 +
t/t0021-conversion.sh | 198 ++++++++++++++++++++++++++++++++++------
t/t0021/rot13-filter.pl | 6 ++
unpack-trees.c | 1 +
unpack-trees.h | 1 +
20 files changed, 350 insertions(+), 75 deletions(-)
Range-diff against v1:
1: 93111f0c13 = 1: 77b064093c builtin/checkout: pass branch info down to checkout_worktree
2: 7e3675fc33 ! 2: d910bf619c convert: permit passing additional metadata to filter processes
@@ Commit message
pass this information in all cases, such as when renormalizing or when
we're performing diffs, since it doesn't make sense in those cases.
- This series wires up the code to print this information, but doesn't
+ The data we currently get from the filter process looks like the
+ following:
+
+ command=smudge
+ pathname=git.c
+ 0000
+
+ With this change, we'll get data more like this:
+
+ command=smudge
+ pathname=git.c
+ refname=refs/tags/v2.25.1
+ treeish=c522f061d551c9bb8684a7c3859b2ece4499b56b
+ blob=7be7ad34bd053884ec48923706e70c81719a8660
+ 0000
+
+ There are a couple things to note about this approach. For operations
+ like checkout, treeish will always be a commit, since we cannot check
+ out individual trees, but for other operations, like archive, we can end
+ up operating on only a particular tree, so we'll provide only a tree as
+ the treeish. Similar comments apply for refname, since there are a
+ variety of cases in which we won't have a ref.
+
+ This commit wires up the code to print this information, but doesn't
pass any of it at this point. In a future commit, we'll have various
code paths pass the actual useful data down.
3: ed056a4516 ! 3: ab2730d9a3 convert: provide additional metadata to filters
@@ builtin/cat-file.c: static int filter_object(const char *path, unsigned mode,
*buf = strbuf_detach(&strbuf, NULL);
## builtin/checkout.c ##
+@@ builtin/checkout.c: struct branch_info {
+ const char *name; /* The short name used */
+ const char *path; /* The full name of a real branch */
+ struct commit *commit; /* The named commit */
++ char *refname; /* The full name of the ref being checked out. */
++ struct object_id oid; /* The object ID of the commit being checked out. */
+ /*
+ * if not null the branch is detached because it's already
+ * checked out in this checkout
@@ builtin/checkout.c: static int checkout_worktree(const struct checkout_opts *opts,
state.refresh_cache = 1;
state.istate = &the_index;
-+ init_checkout_metadata(&state.meta, info->path,
-+ info->commit ? &info->commit->object.oid : NULL,
++ init_checkout_metadata(&state.meta, info->refname,
++ info->commit ? &info->commit->object.oid : &info->oid,
+ NULL);
+
enable_delayed_checkout(&state);
for (pos = 0; pos < active_nr; pos++) {
struct cache_entry *ce = active_cache[pos];
+@@ builtin/checkout.c: static void setup_branch_path(struct branch_info *branch)
+ {
+ struct strbuf buf = STRBUF_INIT;
+
++ /*
++ * If this is a ref, resolve it; otherwise, look up the OID for our
++ * expression. Failure here is okay.
++ */
++ if (!dwim_ref(branch->name, strlen(branch->name), &branch->oid, &branch->refname))
++ repo_get_oid_committish(the_repository, branch->name, &branch->oid);
++
+ strbuf_branchname(&buf, branch->name, INTERPRET_BRANCH_LOCAL);
+ if (strcmp(buf.buf, branch->name))
+ branch->name = xstrdup(buf.buf);
## cache.h ##
@@ cache.h: struct checkout {
4: 676b08a650 ! 4: 3630b2279b builtin/checkout: compute checkout metadata for checkouts
@@ builtin/checkout.c: static int reset_tree(struct tree *tree, const struct checko
opts.verbose_update = o->show_progress;
opts.src_index = &the_index;
opts.dst_index = &the_index;
-+ init_checkout_metadata(&opts.meta, info->path,
++ init_checkout_metadata(&opts.meta, info->refname,
+ info->commit ? &info->commit->object.oid :
-+ &tree->object.oid,
++ is_null_oid(&info->oid) ? &tree->object.oid :
++ &info->oid,
+ NULL);
parse_tree(tree);
init_tree_desc(&tree_desc, tree->buffer, tree->size);
@@ builtin/checkout.c: static int merge_working_tree(const struct checkout_opts *op
topts.quiet = opts->merge && old_branch_info->commit;
topts.verbose_update = opts->show_progress;
topts.fn = twoway_merge;
-+ init_checkout_metadata(&topts.meta, new_branch_info->path,
++ init_checkout_metadata(&topts.meta, new_branch_info->refname,
+ new_branch_info->commit ?
+ &new_branch_info->commit->object.oid :
-+ NULL, NULL);
++ &new_branch_info->oid, NULL);
if (opts->overwrite_ignore) {
topts.dir = xcalloc(1, sizeof(*topts.dir));
topts.dir->flags |= DIR_SHOW_IGNORED;
5: 853af8380c ! 5: 79168566bc builtin/clone: compute checkout metadata for clones
@@ builtin/clone.c: static int checkout(int submodule_progress)
if (!strcmp(head, "HEAD")) {
if (advice_detached_head)
detach_advice(oid_to_hex(&oid));
-+ free(head);
-+ head = NULL;
++ FREE_AND_NULL(head);
} else {
if (!starts_with(head, "refs/heads/"))
die(_("HEAD not found below refs/heads!"));
6: 22f2d41884 = 6: af8e2af64b builtin/rebase: compute checkout metadata for rebases
7: b789b6db7e = 7: c0afbd1da2 builtin/reset: compute checkout metadata for reset
8: b3aaf17a16 = 8: 32da1229ed t0021: test filter metadata for additional cases
