summaryrefslogtreecommitdiffabout
path: root/shared.c
authorLars Hjemli <hjemli@gmail.com>2008-01-13 18:16:23 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-01-21 07:52:09 (UTC)
commit776200b1c10536174f68fc6599fc709ae620db54 (patch) (unidiff)
treed5b24090675c5ac7b0ca29459d3246dcb0d7c8af /shared.c
parent2122c696a34133a616b9ec6d72abe9eb89e728aa (diff)
downloadcgit-776200b1c10536174f68fc6599fc709ae620db54.zip
cgit-776200b1c10536174f68fc6599fc709ae620db54.tar.gz
cgit-776200b1c10536174f68fc6599fc709ae620db54.tar.bz2
Use GIT-1.5.4.rc4
Diffstat (limited to 'shared.c') (more/less context) (ignore whitespace changes)
-rw-r--r--shared.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/shared.c b/shared.c
index bf0581f..f063894 100644
--- a/shared.c
+++ b/shared.c
@@ -479,33 +479,33 @@ int cgit_diff_files(const unsigned char *old_sha1,
479 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); 479 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
480 return 0; 480 return 0;
481} 481}
482 482
483void cgit_diff_tree(const unsigned char *old_sha1, 483void cgit_diff_tree(const unsigned char *old_sha1,
484 const unsigned char *new_sha1, 484 const unsigned char *new_sha1,
485 filepair_fn fn, const char *prefix) 485 filepair_fn fn, const char *prefix)
486{ 486{
487 struct diff_options opt; 487 struct diff_options opt;
488 int ret; 488 int ret;
489 int prefixlen; 489 int prefixlen;
490 490
491 diff_setup(&opt); 491 diff_setup(&opt);
492 opt.output_format = DIFF_FORMAT_CALLBACK; 492 opt.output_format = DIFF_FORMAT_CALLBACK;
493 opt.detect_rename = 1; 493 opt.detect_rename = 1;
494 opt.rename_limit = cgit_renamelimit; 494 opt.rename_limit = cgit_renamelimit;
495 opt.recursive = 1; 495 DIFF_OPT_SET(&opt, RECURSIVE);
496 opt.format_callback = cgit_diff_tree_cb; 496 opt.format_callback = cgit_diff_tree_cb;
497 opt.format_callback_data = fn; 497 opt.format_callback_data = fn;
498 if (prefix) { 498 if (prefix) {
499 opt.nr_paths = 1; 499 opt.nr_paths = 1;
500 opt.paths = &prefix; 500 opt.paths = &prefix;
501 prefixlen = strlen(prefix); 501 prefixlen = strlen(prefix);
502 opt.pathlens = &prefixlen; 502 opt.pathlens = &prefixlen;
503 } 503 }
504 diff_setup_done(&opt); 504 diff_setup_done(&opt);
505 505
506 if (old_sha1 && !is_null_sha1(old_sha1)) 506 if (old_sha1 && !is_null_sha1(old_sha1))
507 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); 507 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
508 else 508 else
509 ret = diff_root_tree_sha1(new_sha1, "", &opt); 509 ret = diff_root_tree_sha1(new_sha1, "", &opt);
510 diffcore_std(&opt); 510 diffcore_std(&opt);
511 diff_flush(&opt); 511 diff_flush(&opt);