aboutsummaryrefslogtreecommitdiffstats
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-03-29 12:22:03 -0700
committerJunio C Hamano <gitster@pobox.com>2022-03-29 12:22:03 -0700
commit5fe35fcc790f6df1839ff984896f9d5e6710d012 (patch)
treec974a750116a6a13c9b53d40d447d7ee146d0bef /commit.h
parentMerge branch 'vd/cache-bottom-fix' (diff)
parentshallow: reset commit grafts when shallow is reset (diff)
downloadgit-5fe35fcc790f6df1839ff984896f9d5e6710d012.tar.gz
git-5fe35fcc790f6df1839ff984896f9d5e6710d012.zip
Merge branch 'jt/reset-grafts-when-resetting-shallow'
When "shallow" information is updated, we forgot to update the in-core equivalent, which has been corrected. * jt/reset-grafts-when-resetting-shallow: shallow: reset commit grafts when shallow is reset
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/commit.h b/commit.h
index 3b174135bc..21e4d25ce7 100644
--- a/commit.h
+++ b/commit.h
@@ -249,6 +249,7 @@ int commit_graft_pos(struct repository *r, const struct object_id *oid);
int register_commit_graft(struct repository *r, struct commit_graft *, int);
void prepare_commit_graft(struct repository *r);
struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid);
+void reset_commit_grafts(struct repository *r);
struct commit *get_fork_point(const char *refname, struct commit *commit);