From e4b7a209cf5c2dd59515faed35d58e461556968c Mon Sep 17 00:00:00 2001 From: Ben Peachey Date: Tue, 4 Oct 2022 16:34:34 +0200 Subject: [PATCH] Fix bug caused by incorrect refactor Previously a log file was used. This was replaced by a direct call to `git log`. However, the `cat` command was left in place, hence the bug. Fixes #7 --- src/git-split-file.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/git-split-file.sh b/src/git-split-file.sh index c1cb37d..262ffb2 100755 --- a/src/git-split-file.sh +++ b/src/git-split-file.sh @@ -371,7 +371,7 @@ mergeSplitBranch() { && commit "Merging split file '${g_sSourceFileName}'" ) || ( printStatus 'Merge conflict remains. Attempting to resolve more aggressively.' - git add $(cat git status | grep -o -E 'added by us: .*' | cut -d ':' -f 2) \ + git add $(git status | grep -o -E 'added by us: .*' | cut -d ':' -f 2) \ && commit "Merging split file '${g_sSourceFileName}'" ) else