← Back to branch summary

~ubuntu-branches/debian/sid/git/sid

« back to all changes in this revision

Viewing changes to diffcore-rename.c

  • Committer: Package Import Robot
  • Author(s): Gerrit Pape
  • Date: 2012-06-08 00:04:11 UTC
  • mfrom: (1.2.18)
  • Revision ID: package-import@ubuntu.com-20120608000411-4oljtllc9gst19ou
Tags: 1:1.7.10.4-1
new upstream point release (thx Jonathan Nieder).

Show diffs side-by-side

added added

removed removed

Lines of Context:
diffcore-rename.c
512
512
                        else if (options->single_follow &&
513
513
                                 strcmp(options->single_follow, p->two->path))
514
514
                                continue; /* not interested */
 
515
                        else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
 
516
                                 is_empty_blob_sha1(p->two->sha1))
 
517
                                continue;
515
518
                        else
516
519
                                locate_rename_dst(p->two, 1);
517
520
                }
 
521
                else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
 
522
                         is_empty_blob_sha1(p->one->sha1))
 
523
                        continue;
518
524
                else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
519
525
                        /*
520
526
                         * If the source is a broken "delete", and