git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
25bd9b12e66751141b87a3f44b104dce2c9155f1 blob 2146 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
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
 
#include "diff-merges.h"

#include "revision.h"

static void suppress(struct rev_info *revs) {
	revs->ignore_merges = 1;
	revs->first_parent_merges = 0;
	revs->combine_merges = 0;
	revs->dense_combined_merges = 0;
}

/*
 * Public functions. They are in the order they are called.
 */

void diff_merges_init_revs(struct rev_info *revs) {
	revs->ignore_merges = -1;
}

int diff_merges_parse_opts(struct rev_info *revs, const char **argv) {
	int argcount;
	const char *optarg;
	const char *arg = argv[0];

	if (!strcmp(arg, "-m")) {
		/*
		 * To "diff-index", "-m" means "match missing", and to the "log"
		 * family of commands, it means "show full diff for merges". Set
		 * both fields appropriately.
		 */
		revs->ignore_merges = 0;
		revs->match_missing = 1;
	} else if (!strcmp(arg, "-c")) {
		revs->diff = 1;
		revs->dense_combined_merges = 0;
		revs->combine_merges = 1;
	} else if (!strcmp(arg, "--cc")) {
		revs->diff = 1;
		set_dense_combined(revs);
	} else if (!strcmp(arg, "--no-diff-merges")) {
		suppress(revs);
	} else if (!strcmp(arg, "--combined-all-paths")) {
		revs->diff = 1;
		revs->combined_all_paths = 1;
	} else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) {
		if (!strcmp(optarg, "off")) {
			suppress(revs);
		} else {
			die(_("unknown value for --diff-merges: %s"), optarg);
		}
	} else
		return 0;

	return 1;
}

void diff_merges_suppress(struct rev_info *revs) {
	suppress(revs);
}

void diff_merges_default_to_first_parent(struct rev_info *revs) {
	if (revs->ignore_merges < 0)		/* No -m */
		revs->ignore_merges = 0;
}

void diff_merges_default_to_dense_combined(struct rev_info *revs) {
	if (revs->ignore_merges < 0) {		/* No -m */
		revs->ignore_merges = 0;
		if (!revs->combine_merges) {	/* No -c/--cc" */
			revs->combine_merges = 1;
			revs->dense_combined_merges = 1;
		}
	}
}

void diff_merges_setup_revs(struct rev_info *revs)
{
	if (revs->combine_merges && revs->ignore_merges < 0)
		revs->ignore_merges = 0;
	if (revs->ignore_merges < 0)
		revs->ignore_merges = 1;
	if (revs->combined_all_paths && !revs->combine_merges)
		die("--combined-all-paths makes no sense without -c or --cc");
}
debug log:

solving 25bd9b12e667 ...
found 25bd9b12e667 in https://public-inbox.org/git/20201101193330.24775-11-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-11-sorganov@gmail.com/
found 8536941e0b56 in https://public-inbox.org/git/20201101193330.24775-10-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-10-sorganov@gmail.com/
found bb08a92e3b36 in https://public-inbox.org/git/20201101193330.24775-9-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-9-sorganov@gmail.com/
found 9dd472803d15 in https://public-inbox.org/git/20201101193330.24775-8-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-8-sorganov@gmail.com/
found 85bf0b6d1d1d in https://public-inbox.org/git/20201101193330.24775-7-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-7-sorganov@gmail.com/
found 8b9dd4ad5625 in https://public-inbox.org/git/20201101193330.24775-6-sorganov@gmail.com/ ||
	https://public-inbox.org/git/20201108213838.4880-6-sorganov@gmail.com/

applying [1/12] https://public-inbox.org/git/20201101193330.24775-6-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
new file mode 100644
index 000000000000..8b9dd4ad5625

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-6-sorganov@gmail.com/ for 8b9dd4ad5625
index at:
100644 8b9dd4ad56256a6111d1e4cee168cbdc5bea2ad0	diff-merges.c

applying [2/12] https://public-inbox.org/git/20201101193330.24775-7-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index 8b9dd4ad5625..85bf0b6d1d1d 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-7-sorganov@gmail.com/ for 85bf0b6d1d1d
index at:
100644 85bf0b6d1d1d33f4935b30ccd587ddf5455f5225	diff-merges.c

applying [3/12] https://public-inbox.org/git/20201101193330.24775-8-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index 85bf0b6d1d1d..9dd472803d15 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-8-sorganov@gmail.com/ for 9dd472803d15
index at:
100644 9dd472803d15e15dc66d2c74437977d2a28cf012	diff-merges.c

applying [4/12] https://public-inbox.org/git/20201101193330.24775-9-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index 9dd472803d15..bb08a92e3b36 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-9-sorganov@gmail.com/ for bb08a92e3b36
index at:
100644 bb08a92e3b366d249a5724540e7eed998fe5bfe6	diff-merges.c

applying [5/12] https://public-inbox.org/git/20201101193330.24775-10-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index bb08a92e3b36..8536941e0b56 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-10-sorganov@gmail.com/ for 8536941e0b56
index at:
100644 8536941e0b56598fa79c5067a8e7a1ab59f00821	diff-merges.c

applying [6/12] https://public-inbox.org/git/20201101193330.24775-11-sorganov@gmail.com/
diff --git a/diff-merges.c b/diff-merges.c
index 8536941e0b56..25bd9b12e667 100644

Checking patch diff-merges.c...
Applied patch diff-merges.c cleanly.

skipping https://public-inbox.org/git/20201108213838.4880-11-sorganov@gmail.com/ for 25bd9b12e667
index at:
100644 25bd9b12e66751141b87a3f44b104dce2c9155f1	diff-merges.c

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).