From 26bb427ab531b13bd226ecb357f9442d5c388e11 Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Sat, 21 Sep 2024 12:24:52 -0700 Subject: [PATCH] Sort file names (#361) --- src/scripts/merge_tools/merge_git_then_plumelib.sh | 2 +- src/scripts/merge_tools/merge_script_then_plumelib.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/merge_tools/merge_git_then_plumelib.sh b/src/scripts/merge_tools/merge_git_then_plumelib.sh index 329997dad3..08d219d1c1 100755 --- 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 index 0c03e8f22f..d42af44d31 100755 --- 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