Skip to content

Commit

Permalink
Fix bug caused by incorrect refactor
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Potherca committed Oct 4, 2022
1 parent e74176a commit e4b7a20
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/git-split-file.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e4b7a20

Please sign in to comment.