596
remove_tempfile();
597
}
598
599
+static void diff_fill_sha1_info(struct diff_filespec *one)
600
+{
601
+ if (DIFF_FILE_VALID(one)) {
602
+ if (!one->sha1_valid) {
603
+ struct stat st;
604
+ if (stat(one->path, &st) < 0)
605
+ die("stat %s", one->path);
606
+ if (index_path(one->sha1, one->path, &st, 0))
607
+ die("cannot hash %s\n", one->path);
608
+ }
609
+ }
610
+ else
611
+ memset(one->sha1, 0, 20);
612
+}
613
+
614
static void run_diff(struct diff_filepair *p)
615
{
616
const char *pgm = external_diff();
602
- char msg_[PATH_MAX*2+200], *xfrm_msg;
617
+ char msg[PATH_MAX*2+300], *xfrm_msg;
618
struct diff_filespec *one;
619
struct diff_filespec *two;
620
const char *name;
621
const char *other;
622
int complete_rewrite = 0;
623
+ int len;
624
625
if (DIFF_PAIR_UNMERGED(p)) {
626
/* unmerged */
632
name = p->one->path;
633
other = (strcmp(name, p->two->path) ? p->two->path : NULL);
634
one = p->one; two = p->two;
635
+
636
+ diff_fill_sha1_info(one);
637
+ diff_fill_sha1_info(two);
638
+
639
+ len = 0;
640
switch (p->status) {
641
case DIFF_STATUS_COPIED:
621
- sprintf(msg_,
622
- "similarity index %d%%\n"
623
- "copy from %s\n"
624
- "copy to %s",
625
- (int)(0.5 + p->score * 100.0/MAX_SCORE),
626
- name, other);
627
- xfrm_msg = msg_;
642
+ len += snprintf(msg + len, sizeof(msg) - len,
643
+ "similarity index %d%%\n"
644
+ "copy from %s\n"
645
+ "copy to %s\n",
646
+ (int)(0.5 + p->score * 100.0/MAX_SCORE),
647
+ name, other);
648
break;
649
case DIFF_STATUS_RENAMED:
630
- sprintf(msg_,
631
- "similarity index %d%%\n"
632
- "rename from %s\n"
633
- "rename to %s",
634
- (int)(0.5 + p->score * 100.0/MAX_SCORE),
635
- name, other);
636
- xfrm_msg = msg_;
650
+ len += snprintf(msg + len, sizeof(msg) - len,
651
+ "similarity index %d%%\n"
652
+ "rename from %s\n"
653
+ "rename to %s\n",
654
+ (int)(0.5 + p->score * 100.0/MAX_SCORE),
655
+ name, other);
656
break;
657
case DIFF_STATUS_MODIFIED:
658
if (p->score) {
640
- sprintf(msg_,
641
- "dissimilarity index %d%%",
642
- (int)(0.5 + p->score * 100.0/MAX_SCORE));
643
- xfrm_msg = msg_;
659
+ len += snprintf(msg + len, sizeof(msg) - len,
660
+ "dissimilarity index %d%%\n",
661
+ (int)(0.5 + p->score *
662
+ 100.0/MAX_SCORE));
663
complete_rewrite = 1;
664
break;
665
}
666
/* fallthru */
667
default:
649
- xfrm_msg = NULL;
668
+ /* nothing */
669
+ ;
670
}
671
672
+ if (memcmp(one->sha1, two->sha1, 20)) {
673
+ char one_sha1[41];
674
+ memcpy(one_sha1, sha1_to_hex(one->sha1), 41);
675
+
676
+ len += snprintf(msg + len, sizeof(msg) - len,
677
+ "index %.7s..%.7s", one_sha1,
678
+ sha1_to_hex(two->sha1));
679
+ if (one->mode == two->mode)
680
+ len += snprintf(msg + len, sizeof(msg) - len,
681
+ " %06o", one->mode);
682
+ len += snprintf(msg + len, sizeof(msg) - len, "\n");
683
+ }
684
+
685
+ if (len)
686
+ msg[--len] = 0;
687
+ xfrm_msg = len ? msg : NULL;
688
+
689
if (!pgm &&
690
DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two) &&
691
(S_IFMT & one->mode) != (S_IFMT & two->mode)) {