aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-26 00:14:22 -0800
committerJunio C Hamano <gitster@pobox.com>2008-02-26 00:14:22 -0800
commit2db511fdbdbe1c8aab80f4bc13f0df037bce8a33 (patch)
tree23350997a56089356ccaeaa923a783378c198bf6 /diff.c
parentb8d97d07fd5025232cae74cfc9a555abd9ac390e (diff)
parent81fa145917c40b68a5e2cca6afc6a10cdfdbd25b (diff)
downloadgit-2db511fdbdbe1c8aab80f4bc13f0df037bce8a33.tar.gz
git-2db511fdbdbe1c8aab80f4bc13f0df037bce8a33.tar.xz
Merge branch 'maint'
* maint: Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotest timezone_names[]: fixed the tz offset for New Zealand. filter-branch documentation: non-zero exit status in command abort the filter rev-parse: fix potential bus error with --parseopt option spec handling Use a single implementation and API for copy_file() Documentation/git-filter-branch: add a new msg-filter example Correct fast-export file mode strings to match fast-import standard
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/diff.c b/diff.c
index 99daca610..dff826b63 100644
--- a/diff.c
+++ b/diff.c
@@ -272,8 +272,8 @@ static void print_line_count(int count)
}
}
-static void copy_file(int prefix, const char *data, int size,
- const char *set, const char *reset)
+static void copy_file_with_prefix(int prefix, const char *data, int size,
+ const char *set, const char *reset)
{
int ch, nl_just_seen = 1;
while (0 < size--) {
@@ -331,9 +331,9 @@ static void emit_rewrite_diff(const char *name_a,
print_line_count(lc_b);
printf(" @@%s\n", reset);
if (lc_a)
- copy_file('-', one->data, one->size, old, reset);
+ copy_file_with_prefix('-', one->data, one->size, old, reset);
if (lc_b)
- copy_file('+', two->data, two->size, new, reset);
+ copy_file_with_prefix('+', two->data, two->size, new, reset);
}
static int fill_mmfile(mmfile_t *mf, struct diff_filespec *one)