git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
1d4be9cdfb34b6683f5d7519ced9c67d0d83b049 blob 1393 bytes (raw)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
 
#ifndef METACOMMIT_H
#define METACOMMIT_H

// If specified, non-fast-forward changes are permitted.
#define UPDATE_OPTION_FORCE     0x0001
// If specified, no attempt will be made to append to existing changes.
// Normally, if a metacommit points to a commit in its replace or origin
// list and an existing change points to that same commit as its content, the
// new metacommit will attempt to append to that same change. This may replace
// the commit parent with one or more metacommits from the head of the appended
// changes. This option disables this behavior, and will always create a new
// change rather than reusing existing changes.
#define UPDATE_OPTION_NOAPPEND  0x0002

// Metacommit Data

struct metacommit_data {
	struct object_id content;
	struct oid_array replace;
	struct oid_array origin;
	int abandoned;
};

extern void init_metacommit_data(struct metacommit_data *state);

extern void clear_metacommit_data(struct metacommit_data *state);

extern int record_metacommit(struct repository *repo,
	const struct metacommit_data *metacommit,
	const char* override_change, int options, struct strbuf *err);

extern void modify_change(struct repository *repo,
	const struct object_id *old_commit, const struct object_id *new_commit,
	struct strbuf *err);

extern int write_metacommit(struct repository *repo, struct metacommit_data *state,
	struct object_id *result);

#endif
debug log:

solving 1d4be9cdfb ...
found 1d4be9cdfb in https://public-inbox.org/git/20190121223216.66659-6-sxenos@google.com/ ||
	https://public-inbox.org/git/20190127194415.171035-6-sxenos@google.com/ ||
	https://public-inbox.org/git/20190127194128.161250-6-sxenos@google.com/

applying [1/3] https://public-inbox.org/git/20190121223216.66659-6-sxenos@google.com/
diff --git a/metacommit.h b/metacommit.h
new file mode 100644
index 0000000000..1d4be9cdfb

Checking patch metacommit.h...
Applied patch metacommit.h cleanly.

skipping https://public-inbox.org/git/20190127194415.171035-6-sxenos@google.com/ for 1d4be9cdfb
skipping https://public-inbox.org/git/20190127194128.161250-6-sxenos@google.com/ for 1d4be9cdfb
index at:
100644 1d4be9cdfb34b6683f5d7519ced9c67d0d83b049	metacommit.h

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).