summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 41bbf9d)
raw | patch | inline | side by side (parent: 41bbf9d)
author | Junio C Hamano <junkio@cox.net> | |
Wed, 14 Mar 2007 17:36:42 +0000 (10:36 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 14 Mar 2007 23:21:19 +0000 (16:21 -0700) |
This was only used by diff-tree-helper program, whose purpose
was to translate a raw diff to a patch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
was to translate a raw diff to a patch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
diff.c | patch | blob | history | |
diff.h | patch | blob | history |
index cc818011b93a13c269344819f5a0045f2558d550..7d938c1484f4bfbdc412786012c6845dc2320d58 100644 (file)
--- a/diff.c
+++ b/diff.c
}
-void diffcore_std_no_resolve(struct diff_options *options)
-{
- if (options->pickaxe)
- diffcore_pickaxe(options->pickaxe, options->pickaxe_opts);
- if (options->orderfile)
- diffcore_order(options->orderfile);
- diffcore_apply_filter(options->filter);
- if (options->exit_with_status)
- options->has_changes = !!diff_queued_diff.nr;
-}
-
void diff_addremove(struct diff_options *options,
int addremove, unsigned mode,
const unsigned char *sha1,
index d13fc89768087427379749479d172da31bff95b9..81fa265656fba7e9b8a88f192c7e10bbbd0cc6b3 100644 (file)
--- a/diff.h
+++ b/diff.h
extern void diffcore_std(struct diff_options *);
-extern void diffcore_std_no_resolve(struct diff_options *);
-
#define COMMON_DIFF_OPTIONS_HELP \
"\ncommon diff options:\n" \
" -z output diff-raw with lines terminated with NUL.\n" \