mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mz/maint-rename-unmerged' into maint

Browse Source 
* mz/maint-rename-unmerged:
  diffcore-rename: don't consider unmerged path as source
This commit is contained in:
Junio C Hamano
2011-05-13 10:41:24 -07:00
parent ebe8621fd7 d7c9bf2235
commit 4bdbfb15b2
2 changed files with 67 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
diffcore-rename.c
View File

@ -466,7 +466,7 @@ void diffcore_rename(struct diff_options *options)
else
locate_rename_dst(p->two, 1);
}
else if (!DIFF_FILE_VALID(p->two)) {
else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
/*
* If the source is a broken "delete", and
* they did not really want to get broken,
@ -586,7 +586,10 @@ void diffcore_rename(struct diff_options *options)
struct diff_filepair *p = q->queue[i];
struct diff_filepair *pair_to_free = NULL;
if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
if (DIFF_PAIR_UNMERGED(p)) {
diff_q(&outq, p);
}
else if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
/*
* Creation
*