Merge pull request #189 from fries1234/fix-comparison-bug

twaritwaikar · web-flow · commit 2f160a2b7926 · 2023-10-03T20:09:42.000+05:30
fix a comparision bug with renamed git statuses
diff --git a/godot-git-plugin/src/git_plugin.cpp b/godot-git-plugin/src/git_plugin.cpp
@@ -245,7 +245,7 @@ godot::TypedArray<godot::Dictionary> GitPlugin::_get_modified_files_data() {
 		}
 
 		if (entry->status & git_status_index) {
-			if (entry->status == GIT_STATUS_INDEX_RENAMED) {
+			if (entry->status & GIT_STATUS_INDEX_RENAMED) {
 				godot::String old_path = entry->head_to_index->old_file.path;
 				stats_files.push_back(create_status_file(old_path, map_changes.at(GIT_STATUS_INDEX_DELETED), TREE_AREA_STAGED));
 				stats_files.push_back(create_status_file(path, map_changes.at(GIT_STATUS_INDEX_NEW), TREE_AREA_STAGED));

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ godot::TypedArray<godot::Dictionary> GitPlugin::_get_modified_files_data() {`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`if (entry->status & git_status_index) {`
`248`		`- if (entry->status == GIT_STATUS_INDEX_RENAMED) {`
	`248`	`+ if (entry->status & GIT_STATUS_INDEX_RENAMED) {`
`249`	`249`	`godot::String old_path = entry->head_to_index->old_file.path;`
`250`	`250`	`stats_files.push_back(create_status_file(old_path, map_changes.at(GIT_STATUS_INDEX_DELETED), TREE_AREA_STAGED));`
`251`	`251`	`stats_files.push_back(create_status_file(path, map_changes.at(GIT_STATUS_INDEX_NEW), TREE_AREA_STAGED));`