Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/git.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1259,10 +1259,6 @@ const RevFile* Git::getFiles(SCRef sha, SCRef diffToSha, bool allFiles, SCRef pa
const Rev* r = revLookup(sha);
if (!r)
return NULL;

if (r->parentsCount() == 0) // skip initial rev
return NULL;

if (r->parentsCount() > 1 && diffToSha.isEmpty() && allFiles)
return getAllMergeFiles(r);

Expand Down Expand Up @@ -1293,7 +1289,7 @@ const RevFile* Git::getFiles(SCRef sha, SCRef diffToSha, bool allFiles, SCRef pa

EM_PROCESS_EVENTS; // 'git diff-tree' could be slow

QString runCmd("git diff-tree --no-color -r -c " + sha), runOutput;
QString runCmd("git diff-tree --no-color -r -c --root " + sha), runOutput;
if (!runDiffTreeWithRenameDetection(runCmd, &runOutput))
return NULL;

Expand Down
Loading