Make resolve-import-conflicts return a status code (#218)

src/scripts/merge_tools/git_hires_merge.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./git-hires-merge.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./git_hires_merge.sh <clone_dir> <branch-1> <branch-2>
 
 clone_dir=$1
 branch1=$2

src/scripts/merge_tools/gitmerge_ort.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-ort.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_ort.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1

src/scripts/merge_tools/gitmerge_ort_ignorespace.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-ort-ignorespace.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_ort_ignorespace.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1

src/scripts/merge_tools/gitmerge_ort_imports.sh

@@ -1,12 +1,21 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-ort.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_ort_imports.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
 branch1=$2
 branch2=$3
 strategy="-s ort"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
+if "$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"; then
+  exit 0
+fi
 
-(cd "$clone_dir" && "$MERGE_SCRIPTS_DIR"/resolve-import-conflicts)
+cd "$clone_dir" || exit 1
+if ! "$MERGE_SCRIPTS_DIR"/resolve-import-conflicts; then
+  echo "Conflict"
+  git merge --abort
+  exit 1
+fi
+
+exit 0

src/scripts/merge_tools/gitmerge_ort_imports_ignorespace.sh

@@ -1,12 +1,21 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-ort-ignorespace.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_ort_imports_ignorespace.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
 branch1=$2
 branch2=$3
 strategy="-s ort -Xignore-space-change"
-"$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"
+if "$MERGE_SCRIPTS_DIR"/gitmerge.sh "$clone_dir" "$branch1" "$branch2" "$strategy"; then
+  exit 0
+fi
 
-(cd "$clone_dir" && "$MERGE_SCRIPTS_DIR"/resolve-import-conflicts)
+cd "$clone_dir" || exit 1
+if ! "$MERGE_SCRIPTS_DIR"/resolve-import-conflicts; then
+  echo "Conflict"
+  git merge --abort
+  exit 1
+fi
+
+exit 0

src/scripts/merge_tools/gitmerge_recursive_histogram.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-recursive-histogram.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_recursive_histogram.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1

src/scripts/merge_tools/gitmerge_recursive_ignorespace.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-recursive-histogram.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_recursive_ignorespace.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_DIR="$(dirname "$0")"
 clone_dir=$1

src/scripts/merge_tools/gitmerge_recursive_minimal.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-recursive-minimal.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_recursive_minimal.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1

src/scripts/merge_tools/gitmerge_recursive_myers.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-recursive-myers.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_recursive_myers.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1

src/scripts/merge_tools/gitmerge_recursive_patience.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge-recursive-patience.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_recursive_patience.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1

src/scripts/merge_tools/gitmerge_resolve.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# usage: ./gitmerge-resolve.sh <clone_dir> <branch-1> <branch-2>
+# usage: ./gitmerge_resolve.sh <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1