* git-gui is still using old-style git-merge invocation
@ 2015-10-29 17:50 Johannes Sixt
2015-10-29 17:56 ` Dennis Kaarsemaker
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Sixt @ 2015-10-29 17:50 UTC (permalink / raw)
To: Git Mailing List
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git-gui is still using old-style git-merge invocation
2015-10-29 17:50 git-gui is still using old-style git-merge invocation Johannes Sixt
@ 2015-10-29 17:56 ` Dennis Kaarsemaker
2015-10-29 19:31 ` Johannes Sixt
0 siblings, 1 reply; 3+ messages in thread
From: Dennis Kaarsemaker @ 2015-10-29 17:56 UTC (permalink / raw)
To: Johannes Sixt, Git Mailing List
On do, 2015-10-29 at 18:50 +0100, Johannes Sixt wrote:
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-29 19:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-29 17:50 git-gui is still using old-style git-merge invocation Johannes Sixt
2015-10-29 17:56 ` Dennis Kaarsemaker
2015-10-29 19:31 ` Johannes Sixt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).