git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
636044abd7531cafff15bf7dc42d1fd105941c8c blob 6276 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
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
 
#include "builtin.h"
#include "cache.h"
#include "parse-options.h"
#include "bisect.h"
#include "refs.h"
#include "dir.h"
#include "argv-array.h"
#include "run-command.h"

static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV")
static GIT_PATH_FUNC(git_path_bisect_ancestors_ok, "BISECT_ANCESTORS_OK")
static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG")
static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN")
static GIT_PATH_FUNC(git_path_head_name, "head-name")
static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START")
static GIT_PATH_FUNC(git_path_bisect_head, "BISECT_HEAD")

static const char * const git_bisect_helper_usage[] = {
	N_("git bisect--helper --next-all [--no-checkout]"),
	N_("git bisect--helper --write-terms <bad_term> <good_term>"),
	N_("git bisect--helper --bisect-clean-state"),
	N_("git bisect--helper --bisect-reset [<commit>]"),
	NULL
};

/*
 * Check whether the string `term` belongs to the set of strings
 * included in the variable arguments.
 */
static int one_of(const char *term, ...)
{
	int res = 0;
	va_list matches;
	const char *match;

	va_start(matches, term);
	while (!res && (match = va_arg(matches, const char *)))
		res = !strcmp(term, match);
	va_end(matches);

	return res;
}

static int check_term_format(const char *term, const char *orig_term)
{
	struct strbuf new_term = STRBUF_INIT;
	strbuf_addf(&new_term, "refs/bisect/%s", term);

	if (check_refname_format(new_term.buf, 0)) {
		strbuf_release(&new_term);
		return error(_("'%s' is not a valid term"), term);
	}
	strbuf_release(&new_term);

	if (one_of(term, "help", "start", "skip", "next", "reset",
			"visualize", "replay", "log", "run", NULL))
		return error(_("can't use the builtin command '%s' as a term"), term);

	/*
	 * In theory, nothing prevents swapping completely good and bad,
	 * but this situation could be confusing and hasn't been tested
	 * enough. Forbid it for now.
	 */

	if ((strcmp(orig_term, "bad") && one_of(term, "bad", "new", NULL)) ||
		 (strcmp(orig_term, "good") && one_of(term, "good", "old", NULL)))
		return error(_("can't change the meaning of the term '%s'"), term);

	return 0;
}

static int write_terms(const char *bad, const char *good)
{
	FILE *fp;
	int res;

	if (!strcmp(bad, good))
		return error(_("please use two different terms"));

	if (check_term_format(bad, "bad") || check_term_format(good, "good"))
		return -1;

	fp = fopen(git_path_bisect_terms(), "w");
	if (!fp)
		return error_errno(_("could not open the file BISECT_TERMS"));

	res = fprintf(fp, "%s\n%s\n", bad, good);
	fclose(fp);
	return (res < 0) ? -1 : 0;
}

static int mark_for_removal(const char *refname, const struct object_id *oid,
			    int flag, void *cb_data)
{
	struct string_list *refs = cb_data;
	char *ref = xstrfmt("refs/bisect/%s", refname);
	string_list_append(refs, ref);
	return 0;
}

static int bisect_clean_state(void)
{
	int result = 0;

	/* There may be some refs packed during bisection */
	struct string_list refs_for_removal = STRING_LIST_INIT_NODUP;
	for_each_ref_in("refs/bisect/", mark_for_removal, (void *) &refs_for_removal);
	string_list_append(&refs_for_removal, xstrdup("BISECT_HEAD"));
	result = delete_refs(&refs_for_removal);
	refs_for_removal.strdup_strings = 1;
	string_list_clear(&refs_for_removal, 0);
	remove_path(git_path_bisect_expected_rev());
	remove_path(git_path_bisect_ancestors_ok());
	remove_path(git_path_bisect_log());
	remove_path(git_path_bisect_names());
	remove_path(git_path_bisect_run());
	remove_path(git_path_bisect_terms());
	/* Cleanup head-name if it got left by an old version of git-bisect */
	remove_path(git_path_head_name());
	/*
	 * Cleanup BISECT_START last to support the --no-checkout option
	 * introduced in the commit 4796e823a.
	 */
	remove_path(git_path_bisect_start());

	return result;
}

static int bisect_reset(const char *commit)
{
	struct strbuf branch = STRBUF_INIT;

	if (!commit) {
		if (strbuf_read_file(&branch, git_path_bisect_start(), 0) < 1) {
			printf("We are not bisecting.\n");
			return 0;
		}
		strbuf_rtrim(&branch);
	} else {
		struct object_id oid;
		if (get_oid(commit, &oid))
			return error(_("'%s' is not a valid commit"), commit);
		strbuf_addstr(&branch, commit);
	}

	if (!file_exists(git_path_bisect_head())) {
		struct argv_array argv = ARGV_ARRAY_INIT;
		argv_array_pushl(&argv, "checkout", branch.buf, "--", NULL);
		if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
			error(_("Could not check out original HEAD '%s'. Try"
				"'git bisect reset <commit>'."), branch.buf);
			strbuf_release(&branch);
			argv_array_clear(&argv);
			return -1;
		}
		argv_array_clear(&argv);
	}

	strbuf_release(&branch);
	return bisect_clean_state();
}

int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
{
	enum {
		NEXT_ALL = 1,
		WRITE_TERMS,
		BISECT_CLEAN_STATE,
		BISECT_RESET
	} cmdmode = 0;
	int no_checkout = 0;
	struct option options[] = {
		OPT_CMDMODE(0, "next-all", &cmdmode,
			 N_("perform 'git bisect next'"), NEXT_ALL),
		OPT_CMDMODE(0, "write-terms", &cmdmode,
			 N_("write the terms to .git/BISECT_TERMS"), WRITE_TERMS),
		OPT_CMDMODE(0, "bisect-clean-state", &cmdmode,
			 N_("cleanup the bisection state"), BISECT_CLEAN_STATE),
		OPT_CMDMODE(0, "bisect-reset", &cmdmode,
			 N_("reset the bisection state"), BISECT_RESET),
		OPT_BOOL(0, "no-checkout", &no_checkout,
			 N_("update BISECT_HEAD instead of checking out the current commit")),
		OPT_END()
	};

	argc = parse_options(argc, argv, prefix, options,
			     git_bisect_helper_usage, 0);

	if (!cmdmode)
		usage_with_options(git_bisect_helper_usage, options);

	switch (cmdmode) {
	case NEXT_ALL:
		return bisect_next_all(prefix, no_checkout);
	case WRITE_TERMS:
		if (argc != 2)
			die(_("--write-terms requires two arguments"));
		return write_terms(argv[0], argv[1]);
	case BISECT_CLEAN_STATE:
		if (argc != 0)
			die(_("--bisect-clean-state requires no arguments"));
		return bisect_clean_state();
	case BISECT_RESET:
		if (argc > 1)
			die(_("--bisect-reset requires either zero or one arguments"));
		return bisect_reset(argc ? argv[0] : NULL);
	default:
		die("BUG: unknown subcommand '%d'", cmdmode);
	}
	return 0;
}
debug log:

solving 636044a ...
found 636044a in https://public-inbox.org/git/20160712223538.28508-8-pranit.bauva@gmail.com/
found 3089433 in https://public-inbox.org/git/20160712223538.28508-5-pranit.bauva@gmail.com/
found bec63d6 in https://public-inbox.org/git/20160712223538.28508-4-pranit.bauva@gmail.com/
found 3c748d1 in https://public-inbox.org/git/20160712223538.28508-3-pranit.bauva@gmail.com/ ||
	https://public-inbox.org/git/1464014928-31548-3-git-send-email-pranit.bauva@gmail.com/ ||
	https://public-inbox.org/git/20160524072124.2945-3-pranit.bauva@gmail.com/ ||
	https://public-inbox.org/git/1463031127-17718-3-git-send-email-pranit.bauva@gmail.com/ ||
	https://public-inbox.org/git/20160524184242.7518-3-pranit.bauva@gmail.com/
found 8111c91 in https://public-inbox.org/git/010201567675adc1-17e27495-6b36-40d1-836d-814da029fcc4-000000@eu-west-1.amazonses.com/ ||
	https://public-inbox.org/git/01020157c38b19e0-81123fa5-5d9d-4f64-8f1b-ff336e83ebe4-000000@eu-west-1.amazonses.com/ ||
	https://public-inbox.org/git/01020156b73fe5b4-5dc768ab-b73b-4a21-ab92-018e2a7aa6f7-000000@eu-west-1.amazonses.com/ ||
	https://public-inbox.org/git/01020156a48144f8-c0e127c1-8cd9-4295-ac16-449a54315cac-000000@eu-west-1.amazonses.com/ ||
	https://public-inbox.org/git/0102015640423c26-2060fd70-c90d-4de3-ae8c-1801ad160b1c-000000@eu-west-1.amazonses.com/ ||
	https://public-inbox.org/git/010201560a4781be-e8418d6a-5996-45cd-b11b-ca25894ad7f2-000000@eu-west-1.amazonses.com/ ||
	https://public-inbox.org/git/20160712223538.28508-2-pranit.bauva@gmail.com/ ||
	https://public-inbox.org/git/1464014928-31548-2-git-send-email-pranit.bauva@gmail.com/ ||
	https://public-inbox.org/git/20160524072124.2945-2-pranit.bauva@gmail.com/ ||
	https://public-inbox.org/git/1463031127-17718-2-git-send-email-pranit.bauva@gmail.com/ ||
	https://public-inbox.org/git/20160524184242.7518-2-pranit.bauva@gmail.com/
`3324229' ambiguous in git.git.git
3324229025300f7d7de600753c03af3ac22e2152 blob

found 3324229 in https://public-inbox.org/git/1375288117-1576-3-git-send-email-stefanbeller@googlemail.com/ ||
	https://public-inbox.org/git/1375530686-2309-3-git-send-email-stefanbeller@googlemail.com/
found e3884e3 in git.git.git
preparing index
index prepared:
100644 e3884e3bb61c7dfb0cd97ddba7bd0558b44c6b8f	builtin/bisect--helper.c

applying [1/21] https://public-inbox.org/git/1375288117-1576-3-git-send-email-stefanbeller@googlemail.com/
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index e3884e3..3324229 100644

Checking patch builtin/bisect--helper.c...
Applied patch builtin/bisect--helper.c cleanly.

skipping https://public-inbox.org/git/1375530686-2309-3-git-send-email-stefanbeller@googlemail.com/ for 3324229
index at:
100644 3324229025300f7d7de600753c03af3ac22e2152	builtin/bisect--helper.c

applying [2/21] https://public-inbox.org/git/010201567675adc1-17e27495-6b36-40d1-836d-814da029fcc4-000000@eu-west-1.amazonses.com/
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 3324229..8111c91 100644

Checking patch builtin/bisect--helper.c...
Applied patch builtin/bisect--helper.c cleanly.

skipping https://public-inbox.org/git/01020157c38b19e0-81123fa5-5d9d-4f64-8f1b-ff336e83ebe4-000000@eu-west-1.amazonses.com/ for 8111c91
skipping https://public-inbox.org/git/01020156b73fe5b4-5dc768ab-b73b-4a21-ab92-018e2a7aa6f7-000000@eu-west-1.amazonses.com/ for 8111c91
skipping https://public-inbox.org/git/01020156a48144f8-c0e127c1-8cd9-4295-ac16-449a54315cac-000000@eu-west-1.amazonses.com/ for 8111c91
skipping https://public-inbox.org/git/0102015640423c26-2060fd70-c90d-4de3-ae8c-1801ad160b1c-000000@eu-west-1.amazonses.com/ for 8111c91
skipping https://public-inbox.org/git/010201560a4781be-e8418d6a-5996-45cd-b11b-ca25894ad7f2-000000@eu-west-1.amazonses.com/ for 8111c91
skipping https://public-inbox.org/git/20160712223538.28508-2-pranit.bauva@gmail.com/ for 8111c91
skipping https://public-inbox.org/git/1464014928-31548-2-git-send-email-pranit.bauva@gmail.com/ for 8111c91
skipping https://public-inbox.org/git/20160524072124.2945-2-pranit.bauva@gmail.com/ for 8111c91
skipping https://public-inbox.org/git/1463031127-17718-2-git-send-email-pranit.bauva@gmail.com/ for 8111c91
skipping https://public-inbox.org/git/20160524184242.7518-2-pranit.bauva@gmail.com/ for 8111c91
index at:
100644 8111c9149f5b95234f7144b1310f3d2bd5f6310e	builtin/bisect--helper.c

applying [3/21] https://public-inbox.org/git/20160712223538.28508-3-pranit.bauva@gmail.com/
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 8111c91..3c748d1 100644

Checking patch builtin/bisect--helper.c...
Applied patch builtin/bisect--helper.c cleanly.

skipping https://public-inbox.org/git/1464014928-31548-3-git-send-email-pranit.bauva@gmail.com/ for 3c748d1
skipping https://public-inbox.org/git/20160524072124.2945-3-pranit.bauva@gmail.com/ for 3c748d1
skipping https://public-inbox.org/git/1463031127-17718-3-git-send-email-pranit.bauva@gmail.com/ for 3c748d1
skipping https://public-inbox.org/git/20160524184242.7518-3-pranit.bauva@gmail.com/ for 3c748d1
index at:
100644 3c748d159698c1d605363e3385fd3cd335c076c3	builtin/bisect--helper.c

applying [4/21] https://public-inbox.org/git/20160712223538.28508-4-pranit.bauva@gmail.com/
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 3c748d1..bec63d6 100644


applying [5/21] https://public-inbox.org/git/20160712223538.28508-5-pranit.bauva@gmail.com/
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index bec63d6..3089433 100644


applying [6/21] https://public-inbox.org/git/20160712223538.28508-8-pranit.bauva@gmail.com/
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 3089433..636044a 100644

Checking patch builtin/bisect--helper.c...
Applied patch builtin/bisect--helper.c cleanly.
Checking patch builtin/bisect--helper.c...
Applied patch builtin/bisect--helper.c cleanly.
Checking patch builtin/bisect--helper.c...
Applied patch builtin/bisect--helper.c cleanly.

index at:
100644 636044abd7531cafff15bf7dc42d1fd105941c8c	builtin/bisect--helper.c

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.version-control.git
	nntp://ie5yzdi7fg72h7s4sdcztq5evakq23rdt33mfyfcddc5u3ndnw24ogqd.onion/inbox.comp.version-control.git
	nntp://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

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

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

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git