threads / discuss / 40671

git-gui is still using old-style git-merge invocation

Subject: git-gui is still using old-style git-merge invocation

## tl;dr

3 messages between Oct 29, 2015 and Oct 29, 2015.

replies: 2people: 2as markdown or json

Johannes Sixt· Oct 29, 2015, 17:50 UTC · lore

Performing a merge with git gui presents the following message in the merge result window:

warning: old-style 'git merge <msg> HEAD <commit>' is deprecated.
Merge made by the 'recursive' strategy.
  a | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 a
But I am unable to find where the invocation happens. Can somebody help?
-- Hannes
PS: Reproducer:

git init echo a > a git add a git commit -ma a git checkout -b side @~ echo b > b git add b git commit -mb git gui # to merge: Ctrl-M, Enter, Enter

Dennis Kaarsemaker· Oct 29, 2015, 17:56 UTC · re: Johannes Sixt · lore

Re: git-gui is still using old-style git-merge invocation

On do, 2015-10-29 at 18:50 +0100, Johannes Sixt wrote:
Show 11 quoted lines
> Performing a merge with git gui presents the following message in the
> merge result window:
> 
> warning: old-style 'git merge <msg> HEAD <commit>' is deprecated.
> Merge made by the 'recursive' strategy.
>   a | 1 +
>   1 file changed, 1 insertion(+)
>   create mode 100644 a
> 
> But I am unable to find where the invocation happens. Can somebody
> help?
git-gui/lib/merge.tcl, method _start
The command is constructed on lines 115-120 (master as of today,
 37023ba3)
-- 
Dennis Kaarsemaker
www.kaarsemaker.net

← back to recent threads