Sort file names (#361)

benedikt-schesch · Sep 21, 2024 · 26bb427 · 26bb427
1 parent 0ce02a5
commit 26bb427
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/scripts/merge_tools/merge_git_then_plumelib.sh b/src/scripts/merge_tools/merge_git_then_plumelib.sh
@@ -78,7 +78,7 @@ if [ -n "$VERBOSE" ] ; then
 fi
 
 # Check if there are still conflicts
-diffs=$(git diff --name-only --diff-filter=U)
+diffs=$(git diff --name-only --diff-filter=U | sort)
 if [ -z "$diffs" ]; then
     git add .
     if [ -n "$VERBOSE" ] ; then

diff --git a/src/scripts/merge_tools/merge_script_then_plumelib.sh b/src/scripts/merge_tools/merge_script_then_plumelib.sh
@@ -79,7 +79,7 @@ if [ -n "$VERBOSE" ] ; then
 fi
 
 # Check if there are still conflicts
-diffs=$(git diff --name-only --diff-filter=U)
+diffs=$(git diff --name-only --diff-filter=U | sort)
 if [ -z "$diffs" ]; then
     git add .
     if [ -n "$VERBOSE" ] ; then