[thirdparty/git.git] / diff-no-index.c

/*
 * "diff --no-index" support
 * Copyright (c) 2007 by Johannes Schindelin
 * Copyright (c) 2008 by Junio C Hamano
 */

#include "git-compat-util.h"
#include "abspath.h"
#include "color.h"
#include "commit.h"
#include "blob.h"
#include "tag.h"
#include "diff.h"
#include "diffcore.h"
#include "gettext.h"
#include "revision.h"
#include "log-tree.h"
#include "parse-options.h"
#include "string-list.h"
#include "dir.h"

static int read_directory_contents(const char *path, struct string_list *list)
{
	DIR *dir;
	struct dirent *e;

	if (!(dir = opendir(path)))
		return error("Could not open directory %s", path);

	while ((e = readdir_skip_dot_and_dotdot(dir)))
		string_list_insert(list, e->d_name);

	closedir(dir);
	return 0;
}

/*
 * This should be "(standard input)" or something, but it will
 * probably expose many more breakages in the way no-index code
 * is bolted onto the diff callchain.
 */
static const char file_from_standard_input[] = "-";

/*
 * For paths given on the command-line we treat "-" as stdin and named
 * pipes and symbolic links to named pipes specially.
 */
enum special {
	SPECIAL_NONE,
	SPECIAL_STDIN,
	SPECIAL_PIPE,
};

static int get_mode(const char *path, int *mode, enum special *special)
{
	struct stat st;

	if (!path || !strcmp(path, "/dev/null")) {
		*mode = 0;
#ifdef GIT_WINDOWS_NATIVE
	} else if (!strcasecmp(path, "nul")) {
		*mode = 0;
#endif
	} else if (path == file_from_standard_input) {
		*mode = create_ce_mode(0666);
		*special = SPECIAL_STDIN;
	} else if (lstat(path, &st)) {
		return error("Could not access '%s'", path);
	} else {
		*mode = st.st_mode;
	}
	/*
	 * For paths on the command-line treat named pipes and symbolic
	 * links that resolve to a named pipe specially.
	 */
	if (special &&
	    (S_ISFIFO(*mode) ||
	     (S_ISLNK(*mode) && !stat(path, &st) && S_ISFIFO(st.st_mode)))) {
		*mode = create_ce_mode(0666);
		*special = SPECIAL_PIPE;
	}

	return 0;
}

static void populate_common(struct diff_filespec *s, struct strbuf *buf)
{
	size_t size = 0;

	s->should_munmap = 0;
	s->data = strbuf_detach(buf, &size);
	s->size = size;
	s->should_free = 1;
	s->is_stdin = 1;
}

static void populate_from_pipe(struct diff_filespec *s)
{
	struct strbuf buf = STRBUF_INIT;
	int fd = xopen(s->path, O_RDONLY);

	if (strbuf_read(&buf, fd, 0) < 0)
		die_errno("error while reading from '%s'", s->path);
	close(fd);
	populate_common(s, &buf);
}

static void populate_from_stdin(struct diff_filespec *s)
{
	struct strbuf buf = STRBUF_INIT;

	if (strbuf_read(&buf, 0, 0) < 0)
		die_errno("error while reading from stdin");
	populate_common(s, &buf);
}

static struct diff_filespec *noindex_filespec(const char *name, int mode,
					      enum special special)
{
	struct diff_filespec *s;

	if (!name)
		name = "/dev/null";
	s = alloc_filespec(name);
	fill_filespec(s, null_oid(), 0, mode);
	if (special == SPECIAL_STDIN)
		populate_from_stdin(s);
	else if (special == SPECIAL_PIPE)
		populate_from_pipe(s);
	return s;
}

static int queue_diff(struct diff_options *o,
		      const char *name1, const char *name2, int recursing)
{
	int mode1 = 0, mode2 = 0;
	enum special special1 = SPECIAL_NONE, special2 = SPECIAL_NONE;

	/* Paths can only be special if we're not recursing. */
	if (get_mode(name1, &mode1, recursing ? NULL : &special1) ||
	    get_mode(name2, &mode2, recursing ? NULL : &special2))
		return -1;

	if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2)) {
		struct diff_filespec *d1, *d2;

		if (S_ISDIR(mode1)) {
			/* 2 is file that is created */
			d1 = noindex_filespec(NULL, 0, SPECIAL_NONE);
			d2 = noindex_filespec(name2, mode2, special2);
			name2 = NULL;
			mode2 = 0;
		} else {
			/* 1 is file that is deleted */
			d1 = noindex_filespec(name1, mode1, special1);
			d2 = noindex_filespec(NULL, 0, SPECIAL_NONE);
			name1 = NULL;
			mode1 = 0;
		}
		/* emit that file */
		diff_queue(&diff_queued_diff, d1, d2);

		/* and then let the entire directory be created or deleted */
	}

	if (S_ISDIR(mode1) || S_ISDIR(mode2)) {
		struct strbuf buffer1 = STRBUF_INIT;
		struct strbuf buffer2 = STRBUF_INIT;
		struct string_list p1 = STRING_LIST_INIT_DUP;
		struct string_list p2 = STRING_LIST_INIT_DUP;
		int i1, i2, ret = 0;
		size_t len1 = 0, len2 = 0;

		if (name1 && read_directory_contents(name1, &p1))
			return -1;
		if (name2 && read_directory_contents(name2, &p2)) {
			string_list_clear(&p1, 0);
			return -1;
		}

		if (name1) {
			strbuf_addstr(&buffer1, name1);
			strbuf_complete(&buffer1, '/');
			len1 = buffer1.len;
		}

		if (name2) {
			strbuf_addstr(&buffer2, name2);
			strbuf_complete(&buffer2, '/');
			len2 = buffer2.len;
		}

		for (i1 = i2 = 0; !ret && (i1 < p1.nr || i2 < p2.nr); ) {
			const char *n1, *n2;
			int comp;

			strbuf_setlen(&buffer1, len1);
			strbuf_setlen(&buffer2, len2);

			if (i1 == p1.nr)
				comp = 1;
			else if (i2 == p2.nr)
				comp = -1;
			else
				comp = strcmp(p1.items[i1].string, p2.items[i2].string);

			if (comp > 0)
				n1 = NULL;
			else {
				strbuf_addstr(&buffer1, p1.items[i1++].string);
				n1 = buffer1.buf;
			}

			if (comp < 0)
				n2 = NULL;
			else {
				strbuf_addstr(&buffer2, p2.items[i2++].string);
				n2 = buffer2.buf;
			}

			ret = queue_diff(o, n1, n2, 1);
		}
		string_list_clear(&p1, 0);
		string_list_clear(&p2, 0);
		strbuf_release(&buffer1);
		strbuf_release(&buffer2);

		return ret;
	} else {
		struct diff_filespec *d1, *d2;

		if (o->flags.reverse_diff) {
			SWAP(mode1, mode2);
			SWAP(name1, name2);
		}

		d1 = noindex_filespec(name1, mode1, special1);
		d2 = noindex_filespec(name2, mode2, special2);
		diff_queue(&diff_queued_diff, d1, d2);
		return 0;
	}
}

/* append basename of F to D */
static void append_basename(struct strbuf *path, const char *dir, const char *file)
{
	const char *tail = strrchr(file, '/');

	strbuf_addstr(path, dir);
	while (path->len && path->buf[path->len - 1] == '/')
		path->len--;
	strbuf_addch(path, '/');
	strbuf_addstr(path, tail ? tail + 1 : file);
}

/*
 * DWIM "diff D F" into "diff D/F F" and "diff F D" into "diff F D/F"
 * Note that we append the basename of F to D/, so "diff a/b/file D"
 * becomes "diff a/b/file D/file", not "diff a/b/file D/a/b/file".
 */
static void fixup_paths(const char **path, struct strbuf *replacement)
{
	struct stat st;
	unsigned int isdir0 = 0, isdir1 = 0;
	unsigned int ispipe0 = 0, ispipe1 = 0;

	if (path[0] != file_from_standard_input && !stat(path[0], &st)) {
		isdir0 = S_ISDIR(st.st_mode);
		ispipe0 = S_ISFIFO(st.st_mode);
	}

	if (path[1] != file_from_standard_input && !stat(path[1], &st)) {
		isdir1 = S_ISDIR(st.st_mode);
		ispipe1 = S_ISFIFO(st.st_mode);
	}

	if ((path[0] == file_from_standard_input && isdir1) ||
	    (isdir0 && path[1] == file_from_standard_input))
		die(_("cannot compare stdin to a directory"));

	if ((isdir0 && ispipe1) || (ispipe0 && isdir1))
		die(_("cannot compare a named pipe to a directory"));

	if (isdir0 == isdir1)
		return;
	if (isdir0) {
		append_basename(replacement, path[0], path[1]);
		path[0] = replacement->buf;
	} else {
		append_basename(replacement, path[1], path[0]);
		path[1] = replacement->buf;
	}
}

static const char * const diff_no_index_usage[] = {
	N_("git diff --no-index [<options>] <path> <path>"),
	NULL
};

int diff_no_index(struct rev_info *revs,
		  int implicit_no_index,
		  int argc, const char **argv)
{
	int i, no_index;
	int ret = 1;
	const char *paths[2];
	char *to_free[ARRAY_SIZE(paths)] = { 0 };
	struct strbuf replacement = STRBUF_INIT;
	const char *prefix = revs->prefix;
	struct option no_index_options[] = {
		OPT_BOOL_F(0, "no-index", &no_index, "",
			   PARSE_OPT_NONEG | PARSE_OPT_HIDDEN),
		OPT_END(),
	};
	struct option *options;

	options = add_diff_options(no_index_options, &revs->diffopt);
	argc = parse_options(argc, argv, revs->prefix, options,
			     diff_no_index_usage, 0);
	if (argc != 2) {
		if (implicit_no_index)
			warning(_("Not a git repository. Use --no-index to "
				  "compare two paths outside a working tree"));
		usage_with_options(diff_no_index_usage, options);
	}
	FREE_AND_NULL(options);
	for (i = 0; i < 2; i++) {
		const char *p = argv[i];
		if (!strcmp(p, "-"))
			/*
			 * stdin should be spelled as "-"; if you have
			 * path that is "-", spell it as "./-".
			 */
			p = file_from_standard_input;
		else if (prefix)
			p = to_free[i] = prefix_filename(prefix, p);
		paths[i] = p;
	}

	fixup_paths(paths, &replacement);

	revs->diffopt.skip_stat_unmatch = 1;
	if (!revs->diffopt.output_format)
		revs->diffopt.output_format = DIFF_FORMAT_PATCH;

	revs->diffopt.flags.no_index = 1;

	revs->diffopt.flags.relative_name = 1;
	revs->diffopt.prefix = prefix;

	revs->max_count = -2;
	diff_setup_done(&revs->diffopt);

	setup_diff_pager(&revs->diffopt);
	revs->diffopt.flags.exit_with_status = 1;

	if (queue_diff(&revs->diffopt, paths[0], paths[1], 0))
		goto out;
	diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
	diffcore_std(&revs->diffopt);
	diff_flush(&revs->diffopt);

	/*
	 * The return code for --no-index imitates diff(1):
	 * 0 = no changes, 1 = changes, else error
	 */
	ret = diff_result_code(&revs->diffopt);

out:
	for (i = 0; i < ARRAY_SIZE(to_free); i++)
		free(to_free[i]);
	strbuf_release(&replacement);
	return ret;
}
Commit	Line	Data
0569e9b8 JH	1	/*
	2	* "diff --no-index" support
	3	* Copyright (c) 2007 by Johannes Schindelin
	4	* Copyright (c) 2008 by Junio C Hamano
	5	*/
	6
d812c3b6	7	#include "git-compat-util.h"
0b027f6c	8	#include "abspath.h"
0569e9b8 JH	9	#include "color.h"
	10	#include "commit.h"
	11	#include "blob.h"
	12	#include "tag.h"
	13	#include "diff.h"
	14	#include "diffcore.h"
f394e093	15	#include "gettext.h"
0569e9b8 JH	16	#include "revision.h"
0569e9b8 JH	17	#include "log-tree.h"
16bb3d71	18	#include "parse-options.h"
c455c87c	19	#include "string-list.h"
fd3aeeab	20	#include "dir.h"
0569e9b8	21
9daf0ef0	22	static int read_directory_contents(const char path, struct string_list list)
0569e9b8 JH	23	{
	24	DIR *dir;
	25	struct dirent *e;
	26
	27	if (!(dir = opendir(path)))
	28	return error("Could not open directory %s", path);
	29
b548f0f1 EN	30	while ((e = readdir_skip_dot_and_dotdot(dir)))
b548f0f1 EN	31	string_list_insert(list, e->d_name);
0569e9b8 JH	32
	33	closedir(dir);
	34	return 0;
	35	}
	36
4682d852 JH	37	/*
	38	* This should be "(standard input)" or something, but it will
	39	* probably expose many more breakages in the way no-index code
	40	* is bolted onto the diff callchain.
	41	*/
	42	static const char file_from_standard_input[] = "-";
	43
1e3f2654 PW	44	/*
	45	* For paths given on the command-line we treat "-" as stdin and named
	46	* pipes and symbolic links to named pipes specially.
	47	*/
	48	enum special {
	49	SPECIAL_NONE,
	50	SPECIAL_STDIN,
	51	SPECIAL_PIPE,
	52	};
	53
	54	static int get_mode(const char path, int mode, enum special *special)
0569e9b8 JH	55	{
	56	struct stat st;
	57
1e3f2654	58	if (!path \|\| !strcmp(path, "/dev/null")) {
0569e9b8	59	*mode = 0;
380395d0	60	#ifdef GIT_WINDOWS_NATIVE
1e3f2654	61	} else if (!strcasecmp(path, "nul")) {
36adb4ab JS	62	*mode = 0;
36adb4ab JS	63	#endif
1e3f2654	64	} else if (path == file_from_standard_input) {
0569e9b8	65	*mode = create_ce_mode(0666);
1e3f2654 PW	66	*special = SPECIAL_STDIN;
1e3f2654 PW	67	} else if (lstat(path, &st)) {
0569e9b8	68	return error("Could not access '%s'", path);
1e3f2654	69	} else {
0569e9b8	70	*mode = st.st_mode;
1e3f2654 PW	71	}
	72	/*
	73	* For paths on the command-line treat named pipes and symbolic
	74	* links that resolve to a named pipe specially.
	75	*/
	76	if (special &&
	77	(S_ISFIFO(*mode) \|\|
	78	(S_ISLNK(*mode) && !stat(path, &st) && S_ISFIFO(st.st_mode)))) {
	79	*mode = create_ce_mode(0666);
	80	*special = SPECIAL_PIPE;
	81	}
	82
0569e9b8 JH	83	return 0;
	84	}
	85
1e3f2654	86	static void populate_common(struct diff_filespec s, struct strbuf buf)
4682d852	87	{
4682d852 JH	88	size_t size = 0;
4682d852 JH	89
4682d852	90	s->should_munmap = 0;
1e3f2654	91	s->data = strbuf_detach(buf, &size);
4682d852 JH	92	s->size = size;
	93	s->should_free = 1;
	94	s->is_stdin = 1;
4682d852 JH	95	}
4682d852 JH	96
1e3f2654 PW	97	static void populate_from_pipe(struct diff_filespec *s)
	98	{
	99	struct strbuf buf = STRBUF_INIT;
	100	int fd = xopen(s->path, O_RDONLY);
	101
	102	if (strbuf_read(&buf, fd, 0) < 0)
	103	die_errno("error while reading from '%s'", s->path);
	104	close(fd);
	105	populate_common(s, &buf);
	106	}
	107
	108	static void populate_from_stdin(struct diff_filespec *s)
	109	{
	110	struct strbuf buf = STRBUF_INIT;
	111
	112	if (strbuf_read(&buf, 0, 0) < 0)
	113	die_errno("error while reading from stdin");
	114	populate_common(s, &buf);
	115	}
	116
	117	static struct diff_filespec noindex_filespec(const char name, int mode,
	118	enum special special)
4682d852 JH	119	{
	120	struct diff_filespec *s;
	121
	122	if (!name)
	123	name = "/dev/null";
	124	s = alloc_filespec(name);
14228447	125	fill_filespec(s, null_oid(), 0, mode);
1e3f2654	126	if (special == SPECIAL_STDIN)
4682d852	127	populate_from_stdin(s);
1e3f2654 PW	128	else if (special == SPECIAL_PIPE)
1e3f2654 PW	129	populate_from_pipe(s);
4682d852 JH	130	return s;
	131	}
	132
0569e9b8	133	static int queue_diff(struct diff_options *o,
1e3f2654	134	const char name1, const char name2, int recursing)
0569e9b8 JH	135	{
0569e9b8 JH	136	int mode1 = 0, mode2 = 0;
1e3f2654	137	enum special special1 = SPECIAL_NONE, special2 = SPECIAL_NONE;
0569e9b8	138
1e3f2654 PW	139	/* Paths can only be special if we're not recursing. */
	140	if (get_mode(name1, &mode1, recursing ? NULL : &special1) \|\|
	141	get_mode(name2, &mode2, recursing ? NULL : &special2))
0569e9b8 JH	142	return -1;
0569e9b8 JH	143
06151739 JH	144	if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2)) {
	145	struct diff_filespec d1, d2;
	146
	147	if (S_ISDIR(mode1)) {
	148	/* 2 is file that is created */
1e3f2654 PW	149	d1 = noindex_filespec(NULL, 0, SPECIAL_NONE);
1e3f2654 PW	150	d2 = noindex_filespec(name2, mode2, special2);
06151739 JH	151	name2 = NULL;
	152	mode2 = 0;
	153	} else {
	154	/* 1 is file that is deleted */
1e3f2654 PW	155	d1 = noindex_filespec(name1, mode1, special1);
1e3f2654 PW	156	d2 = noindex_filespec(NULL, 0, SPECIAL_NONE);
06151739 JH	157	name1 = NULL;
	158	mode1 = 0;
	159	}
	160	/* emit that file */
	161	diff_queue(&diff_queued_diff, d1, d2);
	162
	163	/* and then let the entire directory be created or deleted */
	164	}
0569e9b8 JH	165
0569e9b8 JH	166	if (S_ISDIR(mode1) \|\| S_ISDIR(mode2)) {
875b91b3 JH	167	struct strbuf buffer1 = STRBUF_INIT;
875b91b3 JH	168	struct strbuf buffer2 = STRBUF_INIT;
183113a5 TF	169	struct string_list p1 = STRING_LIST_INIT_DUP;
183113a5 TF	170	struct string_list p2 = STRING_LIST_INIT_DUP;
875b91b3	171	int i1, i2, ret = 0;
f3999e03	172	size_t len1 = 0, len2 = 0;
0569e9b8	173
9daf0ef0	174	if (name1 && read_directory_contents(name1, &p1))
0569e9b8	175	return -1;
9daf0ef0	176	if (name2 && read_directory_contents(name2, &p2)) {
c455c87c	177	string_list_clear(&p1, 0);
0569e9b8 JH	178	return -1;
	179	}
	180
	181	if (name1) {
875b91b3	182	strbuf_addstr(&buffer1, name1);
00b6c178	183	strbuf_complete(&buffer1, '/');
f3999e03	184	len1 = buffer1.len;
0569e9b8 JH	185	}
	186
	187	if (name2) {
875b91b3	188	strbuf_addstr(&buffer2, name2);
00b6c178	189	strbuf_complete(&buffer2, '/');
f3999e03	190	len2 = buffer2.len;
0569e9b8 JH	191	}
	192
	193	for (i1 = i2 = 0; !ret && (i1 < p1.nr \|\| i2 < p2.nr); ) {
	194	const char n1, n2;
	195	int comp;
	196
f3999e03 BP	197	strbuf_setlen(&buffer1, len1);
	198	strbuf_setlen(&buffer2, len2);
	199
0569e9b8 JH	200	if (i1 == p1.nr)
	201	comp = 1;
	202	else if (i2 == p2.nr)
	203	comp = -1;
	204	else
875b91b3	205	comp = strcmp(p1.items[i1].string, p2.items[i2].string);
0569e9b8 JH	206
	207	if (comp > 0)
	208	n1 = NULL;
	209	else {
875b91b3 JH	210	strbuf_addstr(&buffer1, p1.items[i1++].string);
875b91b3 JH	211	n1 = buffer1.buf;
0569e9b8 JH	212	}
	213
	214	if (comp < 0)
	215	n2 = NULL;
	216	else {
875b91b3 JH	217	strbuf_addstr(&buffer2, p2.items[i2++].string);
875b91b3 JH	218	n2 = buffer2.buf;
0569e9b8 JH	219	}
0569e9b8 JH	220
1e3f2654	221	ret = queue_diff(o, n1, n2, 1);
0569e9b8	222	}
c455c87c JS	223	string_list_clear(&p1, 0);
c455c87c JS	224	string_list_clear(&p2, 0);
176a3354 BP	225	strbuf_release(&buffer1);
176a3354 BP	226	strbuf_release(&buffer2);
0569e9b8 JH	227
	228	return ret;
	229	} else {
	230	struct diff_filespec d1, d2;
	231
0d1e0e78	232	if (o->flags.reverse_diff) {
402bf8e1	233	SWAP(mode1, mode2);
35d803bc	234	SWAP(name1, name2);
0569e9b8 JH	235	}
0569e9b8 JH	236
1e3f2654 PW	237	d1 = noindex_filespec(name1, mode1, special1);
1e3f2654 PW	238	d2 = noindex_filespec(name2, mode2, special2);
0569e9b8 JH	239	diff_queue(&diff_queued_diff, d1, d2);
	240	return 0;
	241	}
	242	}
	243
c9e1f2c7 JH	244	/* append basename of F to D */
	245	static void append_basename(struct strbuf path, const char dir, const char *file)
	246	{
	247	const char *tail = strrchr(file, '/');
	248
	249	strbuf_addstr(path, dir);
	250	while (path->len && path->buf[path->len - 1] == '/')
	251	path->len--;
	252	strbuf_addch(path, '/');
	253	strbuf_addstr(path, tail ? tail + 1 : file);
	254	}
	255
	256	/*
	257	* DWIM "diff D F" into "diff D/F F" and "diff F D" into "diff F D/F"
	258	* Note that we append the basename of F to D/, so "diff a/b/file D"
	259	* becomes "diff a/b/file D/file", not "diff a/b/file D/a/b/file".
	260	*/
	261	static void fixup_paths(const char *path, struct strbuf replacement)
	262	{
1e3f2654 PW	263	struct stat st;
	264	unsigned int isdir0 = 0, isdir1 = 0;
	265	unsigned int ispipe0 = 0, ispipe1 = 0;
c9e1f2c7	266
1e3f2654 PW	267	if (path[0] != file_from_standard_input && !stat(path[0], &st)) {
	268	isdir0 = S_ISDIR(st.st_mode);
	269	ispipe0 = S_ISFIFO(st.st_mode);
	270	}
	271
	272	if (path[1] != file_from_standard_input && !stat(path[1], &st)) {
	273	isdir1 = S_ISDIR(st.st_mode);
	274	ispipe1 = S_ISFIFO(st.st_mode);
	275	}
49819845 PW	276
	277	if ((path[0] == file_from_standard_input && isdir1) \|\|
	278	(isdir0 && path[1] == file_from_standard_input))
	279	die(_("cannot compare stdin to a directory"));
	280
1e3f2654 PW	281	if ((isdir0 && ispipe1) \|\| (ispipe0 && isdir1))
	282	die(_("cannot compare a named pipe to a directory"));
	283
c9e1f2c7 JH	284	if (isdir0 == isdir1)
	285	return;
	286	if (isdir0) {
	287	append_basename(replacement, path[0], path[1]);
	288	path[0] = replacement->buf;
	289	} else {
	290	append_basename(replacement, path[1], path[0]);
	291	path[1] = replacement->buf;
	292	}
	293	}
	294
16bb3d71 NTND	295	static const char * const diff_no_index_usage[] = {
	296	N_("git diff --no-index [<options>] <path> <path>"),
	297	NULL
	298	};
	299
dcd6a8c0	300	int diff_no_index(struct rev_info *revs,
16bb3d71 NTND	301	int implicit_no_index,
16bb3d71 NTND	302	int argc, const char **argv)
0569e9b8	303	{
16bb3d71	304	int i, no_index;
fffe7d81	305	int ret = 1;
c20f5926	306	const char *paths[2];
07a6f94a	307	char *to_free[ARRAY_SIZE(paths)] = { 0 };
c9e1f2c7	308	struct strbuf replacement = STRBUF_INIT;
e5f7a5d1	309	const char *prefix = revs->prefix;
16bb3d71 NTND	310	struct option no_index_options[] = {
	311	OPT_BOOL_F(0, "no-index", &no_index, "",
	312	PARSE_OPT_NONEG \| PARSE_OPT_HIDDEN),
	313	OPT_END(),
	314	};
	315	struct option *options;
0569e9b8	316
c5630c48	317	options = add_diff_options(no_index_options, &revs->diffopt);
16bb3d71 NTND	318	argc = parse_options(argc, argv, revs->prefix, options,
	319	diff_no_index_usage, 0);
	320	if (argc != 2) {
	321	if (implicit_no_index)
	322	warning(_("Not a git repository. Use --no-index to "
	323	"compare two paths outside a working tree"));
	324	usage_with_options(diff_no_index_usage, options);
0569e9b8	325	}
16bb3d71	326	FREE_AND_NULL(options);
3b069b1b	327	for (i = 0; i < 2; i++) {
2b43dd0e	328	const char *p = argv[i];
3b069b1b	329	if (!strcmp(p, "-"))
0569e9b8	330	/*
3b069b1b JH	331	* stdin should be spelled as "-"; if you have
3b069b1b JH	332	* path that is "-", spell it as "./-".
0569e9b8	333	*/
4682d852	334	p = file_from_standard_input;
116fb64e	335	else if (prefix)
07a6f94a	336	p = to_free[i] = prefix_filename(prefix, p);
3b069b1b	337	paths[i] = p;
0569e9b8	338	}
c9e1f2c7 JH	339
	340	fixup_paths(paths, &replacement);
	341
d61027b2	342	revs->diffopt.skip_stat_unmatch = 1;
5d83f9c1 JS	343	if (!revs->diffopt.output_format)
5d83f9c1 JS	344	revs->diffopt.output_format = DIFF_FORMAT_PATCH;
0569e9b8	345
0d1e0e78	346	revs->diffopt.flags.no_index = 1;
0569e9b8	347
0d1e0e78	348	revs->diffopt.flags.relative_name = 1;
7d8930d9 JK	349	revs->diffopt.prefix = prefix;
7d8930d9 JK	350
0569e9b8	351	revs->max_count = -2;
28452655	352	diff_setup_done(&revs->diffopt);
0569e9b8	353
af63b543	354	setup_diff_pager(&revs->diffopt);
0d1e0e78	355	revs->diffopt.flags.exit_with_status = 1;
af63b543	356
1e3f2654	357	if (queue_diff(&revs->diffopt, paths[0], paths[1], 0))
fffe7d81	358	goto out;
a5a818ee	359	diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
0569e9b8 JH	360	diffcore_std(&revs->diffopt);
	361	diff_flush(&revs->diffopt);
	362
	363	/*
	364	* The return code for --no-index imitates diff(1):
	365	* 0 = no changes, 1 = changes, else error
	366	*/
5cc6b2d7	367	ret = diff_result_code(&revs->diffopt);
fffe7d81 RS	368
fffe7d81 RS	369	out:
07a6f94a RS	370	for (i = 0; i < ARRAY_SIZE(to_free); i++)
07a6f94a RS	371	free(to_free[i]);
fffe7d81 RS	372	strbuf_release(&replacement);
fffe7d81 RS	373	return ret;
0569e9b8	374	}