global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-24 01:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge-octopus: avoid dashed invocation

Browse Source 
A long time ago, in turn a long time after introducing builtins and
moving Git's scripts to libexec/git-core/, we deprecated the invocation
of dashed commands.

The merge-octopus script is a holdover from the time before that, as it
still tries to invoke a builtin by its dashed form. Let's just not.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2016-11-29 23:34:18 +01:00
parent 37896fe03f
commit c51e86bc66
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge-octopus.sh
View File

@@ -100,7 +100,7 @@ do
if test $? -ne 0
then
gettextln "Simple merge did not work, trying automatic merge."
git-merge-index -o git-merge-one-file -a ||
git merge-index -o git-merge-one-file -a ||
OCTOPUS_FAILURE=1
next=$(git write-tree 2>/dev/null)
fi