diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
|---|---|---|
| committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
| commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
| tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/resolve-undo.h | |
| parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) | |
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/resolve-undo.h')
| -rw-r--r-- | third_party/git/resolve-undo.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/third_party/git/resolve-undo.h b/third_party/git/resolve-undo.h deleted file mode 100644 index 2b3f0f901e63..000000000000 --- a/third_party/git/resolve-undo.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef RESOLVE_UNDO_H -#define RESOLVE_UNDO_H - -#include "cache.h" - -struct resolve_undo_info { - unsigned int mode[3]; - struct object_id oid[3]; -}; - -void record_resolve_undo(struct index_state *, struct cache_entry *); -void resolve_undo_write(struct strbuf *, struct string_list *); -struct string_list *resolve_undo_read(const char *, unsigned long); -void resolve_undo_clear_index(struct index_state *); -int unmerge_index_entry_at(struct index_state *, int); -void unmerge_index(struct index_state *, const struct pathspec *); -void unmerge_marked_index(struct index_state *); - -#endif |