# FW: question about merge in 1.7.10 7 messages from 2012-02-24 to 2012-02-24. Participants: Marlene Cote, Zbigniew Jędrzejewski-Szmek, Junio C Hamano. Thread: https://gitlist.dev/t/29725 ## Marlene Cote, 2012-02-24 14:33 Subject: FW: question about merge in 1.7.10 Message-ID: <1F026B57884A5841B330471696849DE9114503D7@MBX021-W4-CA-5.exch021.domain.local> URL: https://gitlist.dev/e/1F026B57884A5841B330471696849DE9114503D7%40MBX021-W4-CA-5.exch021.domain.local ``` I used merge with -no-commit -no-ff.  So, I assume I won't see any change in behavior, since merge is not performing commits, right? ------------------ Regards, Marlene Cote, Release Engineering 978-268-0821 ``` ## Zbigniew Jędrzejewski-Szmek, 2012-02-24 19:29 Subject: Re: FW: question about merge in 1.7.10 Message-ID: <4F47E51B.6080401@in.waw.pl> URL: https://gitlist.dev/e/4F47E51B.6080401%40in.waw.pl In-Reply-To: <1F026B57884A5841B330471696849DE9114503D7@MBX021-W4-CA-5.exch021.domain.local> ``` On 02/24/2012 03:33 PM, Marlene Cote wrote: > > I used merge with -no-commit -no-ff. So, I assume I won't see any change in behavior, since merge is not performing commits, right? Hi Marlene, --no-commit only stops the last step, i.e. making of the commit. The tree (working files) is changed before that. So basically after a merge with --no-commit, your tree will be dirty and git status will show modified files. zbyszek ``` ## Marlene Cote, 2012-02-24 19:33 Subject: RE: FW: question about merge in 1.7.10 Message-ID: <1F026B57884A5841B330471696849DE9114508EC@MBX021-W4-CA-5.exch021.domain.local> URL: https://gitlist.dev/e/1F026B57884A5841B330471696849DE9114508EC%40MBX021-W4-CA-5.exch021.domain.local In-Reply-To: <4F47E51B.6080401@in.waw.pl> ``` I know that the tree will be dirty. The change to git in 1.7.10 says that the merge will require a commit message when the command is run. Since I am not committing, I need to supply a message, but only later when I commit. Not when I execute the merge command. This means my scripts don't have to change. -----Original Message----- From: Zbigniew Jędrzejewski-Szmek [mailto:zbyszek@in.waw.pl] Sent: Friday, February 24, 2012 2:30 PM To: Marlene Cote Cc: git@vger.kernel.org Subject: Re: FW: question about merge in 1.7.10 On 02/24/2012 03:33 PM, Marlene Cote wrote: > > I used merge with -no-commit -no-ff. So, I assume I won't see any change in behavior, since merge is not performing commits, right? Hi Marlene, --no-commit only stops the last step, i.e. making of the commit. The tree (working files) is changed before that. So basically after a merge with --no-commit, your tree will be dirty and git status will show modified files. zbyszek ``` ## Junio C Hamano, 2012-02-24 20:00 Subject: Re: FW: question about merge in 1.7.10 Message-ID: <7vobsoypb3.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vobsoypb3.fsf%40alter.siamese.dyndns.org In-Reply-To: <1F026B57884A5841B330471696849DE9114503D7@MBX021-W4-CA-5.exch021.domain.local> ``` Marlene Cote writes: > I used merge with -no-commit -no-ff. So, I assume I won't see any > change in behavior, since merge is not performing commits, right? The _only_ difference is when (1) "git merge" is run interactively; (2) the merge goes cleanly that it does not need to ask help from the user to resolve conflicts; and (3) it records the result by creating a commit. Because your use case with "--no-commit" does not satisfy the last criteria, I do not expect you to see any difference. Otherwise you may have found a bug. As noted in http://git-blame.blogspot.com/2012/02/anticipating-git-1710.html please try out the version from the 'master' branch before it gets released, so that you can help us avoid surprises in the corner cases. Thanks. ``` ## Junio C Hamano, 2012-02-24 21:22 Subject: Re: FW: question about merge in 1.7.10 Message-ID: <7vbooox6xy.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vbooox6xy.fsf%40alter.siamese.dyndns.org In-Reply-To: <1F026B57884A5841B330471696849DE9114508EC@MBX021-W4-CA-5.exch021.domain.local> ``` Marlene Cote writes: > I know that the tree will be dirty. The change to git in 1.7.10 says > that the merge will require a commit message when the command is run. I do not think I ever said that. "merge" will always start an editor when it auto-commits is what I said. Could you point me where you read that "will require a commit message", so that it can be corrected? ``` ## Marlene Cote, 2012-02-24 21:24 Subject: RE: FW: question about merge in 1.7.10 Message-ID: <1F026B57884A5841B330471696849DE911450B9B@MBX021-W4-CA-5.exch021.domain.local> URL: https://gitlist.dev/e/1F026B57884A5841B330471696849DE911450B9B%40MBX021-W4-CA-5.exch021.domain.local In-Reply-To: <7vbooox6xy.fsf@alter.siamese.dyndns.org> ``` Sorry. You are correct. You said it would open an editor session. -----Original Message----- From: Junio C Hamano [mailto:gitster@pobox.com] Sent: Friday, February 24, 2012 4:23 PM To: Marlene Cote Cc: Zbigniew Jędrzejewski-Szmek; git@vger.kernel.org Subject: Re: FW: question about merge in 1.7.10 Marlene Cote writes: > I know that the tree will be dirty. The change to git in 1.7.10 says > that the merge will require a commit message when the command is run. I do not think I ever said that. "merge" will always start an editor when it auto-commits is what I said. Could you point me where you read that "will require a commit message", so that it can be corrected? ``` ## Junio C Hamano, 2012-02-24 21:55 Subject: Re: FW: question about merge in 1.7.10 Message-ID: <7v4nufopzr.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v4nufopzr.fsf%40alter.siamese.dyndns.org In-Reply-To: <1F026B57884A5841B330471696849DE911450B9B@MBX021-W4-CA-5.exch021.domain.local> ``` Marlene Cote writes: > Sorry. You are correct. You said it would open an editor session. Whew. I was really worried that we may be sending a wrong message and making users needlessly afraid of changes. Thanks for a prompt response. ```