diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2012-04-28 20:30:50 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-04-28 20:30:50 +0800 |
| commit | b240ea25a97d1b96acc4d0f5ae0dbcbe9e0af860 (patch) | |
| tree | da951e1c145cc094a6e5d634141f03b809bf3aff /diffcore-rename.c | |
| parent | 01b127cdc5d596a3022d834d82f883822c7f166b (diff) | |
| parent | 868d662399786462f87df45c3d68bd5390311a6e (diff) | |
Merge maint branch for tracking l10n updates of git stable version
Use master branch to track l10n updates for git next release, while
use maint branch to track l10n updates for git stable version.
Diffstat (limited to 'diffcore-rename.c')
| -rw-r--r-- | diffcore-rename.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c index f639601c76..216a7a4bbc 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -512,9 +512,15 @@ void diffcore_rename(struct diff_options *options) else if (options->single_follow && strcmp(options->single_follow, p->two->path)) continue; /* not interested */ + else if (!DIFF_OPT_TST(options, RENAME_EMPTY) && + is_empty_blob_sha1(p->two->sha1)) + continue; else locate_rename_dst(p->two, 1); } + else if (!DIFF_OPT_TST(options, RENAME_EMPTY) && + is_empty_blob_sha1(p->one->sha1)) + continue; else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) { /* * If the source is a broken "delete", and |