diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-01 13:39:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-01 13:39:51 -0700 |
| commit | 2b4ff3d3dc64d4abcded7caa9bcdf063aea5ec3f (patch) | |
| tree | d92a6b80a57a024256b1306665e629ae1d4b8185 /commit.h | |
| parent | Merge branch 'dd/mailinfo-with-nul' (diff) | |
| parent | shallow.c: use '{commit,rollback}_shallow_file' (diff) | |
| download | git-2b4ff3d3dc64d4abcded7caa9bcdf063aea5ec3f.tar.gz git-2b4ff3d3dc64d4abcded7caa9bcdf063aea5ec3f.zip | |
Merge branch 'tb/reset-shallow'
Fix in-core inconsistency after fetching into a shallow repository
that broke the code to write out commit-graph.
* tb/reset-shallow:
shallow.c: use '{commit,rollback}_shallow_file'
t5537: use test_write_lines and indented heredocs for readability
Diffstat (limited to 'commit.h')
| -rw-r--r-- | commit.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -249,6 +249,8 @@ struct oid_array; struct ref; int register_shallow(struct repository *r, const struct object_id *oid); int unregister_shallow(const struct object_id *oid); +int commit_shallow_file(struct repository *r, struct lock_file *lk); +void rollback_shallow_file(struct repository *r, struct lock_file *lk); int for_each_commit_graft(each_commit_graft_fn, void *); int is_repository_shallow(struct repository *r); struct commit_list *get_shallow_commits(struct object_array *heads, |