summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-15 01:10:38 -0700
committerJunio C Hamano <gitster@pobox.com>2008-03-15 01:10:38 -0700
commit1f1e1257a176ce851ffb683bbba505ae22625ec9 (patch)
tree856ee0a40a971d8c41d7ec16fd653f741e7df4a3 /diff.h
parent50c2b54b23e0d7df40bd8739c1c96df42c47f280 (diff)
parent4ba0cb27c1c0c3aa65d28e1891c1f3dca3db5f93 (diff)
downloadgit-1f1e1257a176ce851ffb683bbba505ae22625ec9.tar.gz
Merge branch 'db/diff-to-fp'
* db/diff-to-fp: wt-status.c: no need for dup() dance anymore Write diff output to a file in struct diff_options
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 9a652e7f38..f2c77391a9 100644
--- a/diff.h
+++ b/diff.h
@@ -98,6 +98,9 @@ struct diff_options {
/* this is set by diffcore for DIFF_FORMAT_PATCH */
int found_changes;
+ FILE *file;
+ int close_file;
+
int nr_paths;
const char **paths;
int *pathlens;