File history walk: include both new and old file paths when renamed

ianhattendorf · ianhattendorf · commit 6231c50ae506 · 2019-05-16T17:46:25.000-07:00
diff --git a/generate/templates/manual/revwalk/file_history_walk.cc b/generate/templates/manual/revwalk/file_history_walk.cc
@@ -44,9 +44,10 @@ class FileHistoryEvent {
     Nan::Set(historyEntry, Nan::New("status").ToLocalChecked(), Nan::New<Number>(type));
     Nan::Set(historyEntry, Nan::New("isMergeCommit").ToLocalChecked(), Nan::New(isMergeCommit));
     if (type == GIT_DELTA_RENAMED) {
-      if (existsInCurrentTree) {
+      if (from != NULL) {
         Nan::Set(historyEntry, Nan::New("oldName").ToLocalChecked(), Nan::New(from).ToLocalChecked());
-      } else {
+      }
+      if (to != NULL) {
         Nan::Set(historyEntry, Nan::New("newName").ToLocalChecked(), Nan::New(to).ToLocalChecked());
       }
     }
@@ -100,7 +101,7 @@ class FileHistoryEvent {
               false,
               currentCommit,
               delta->old_file.path,
-              NULL
+              delta->new_file.path
             );
             git_diff_free(diff);
             git_tree_entry_free(currentEntry);
@@ -139,7 +140,7 @@ class FileHistoryEvent {
               false,
               false,
               currentCommit,
-              NULL,
+              delta->old_file.path,
               delta->new_file.path
             );
             git_diff_free(diff);
