Return non-zero status code if mergeStrings didn't resolve all conflicts

mclaughlinconnor · Sep 6, 2024 · f0bdd16 · f0bdd16
1 parent dbd39be
commit f0bdd16
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Main.hx b/src/Main.hx
@@ -29,8 +29,8 @@ class Main {
 				}
 			case "cli":
 				var result = MergeDriver.mergeStrings(args[1], args[2], args[3], Std.parseInt(args[4]));
-				Sys.print(result);
-				return 0;
+				Sys.print(result.diff);
+				return result.noConflicts ? 0 : 1;
 			default:
 				trace("Invalid command");
 				return -1;

diff --git a/src/MergeDriver.hx b/src/MergeDriver.hx
@@ -9,7 +9,7 @@ class MergeDriver {
 
 		See https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver
 	**/
-	static public function mergeStrings(base:String, current:String, other:String, opts:Int):String {
+	static public function mergeStrings(base:String, current:String, other:String, opts:Int):{diff:String, noConflicts:Bool} {
 		DiffConfig.AUTO_APPLY_NON_CONFLICTED_CHANGES = (opts & (1 << 0)) != 0;
 		DiffConfig.USE_GREEDY_MERGE_MAGIC_RESOLVE = (opts & (1 << 1)) != 0;
 		DiffConfig.USE_PATIENCE_ALG = (opts & (1 << 2)) != 0;
@@ -23,7 +23,7 @@ class MergeDriver {
 		}
 
 		var git = new GitDiff([current, viewer.myModel.getDocument(), other], viewer.myAllMergeChanges);
-		return git.formatDiff();
+		return {diff: git.formatDiff(), noConflicts: viewer.getChanges().length == 0};
 	}
 
 	/**