threads / bug / 41982

A small Git bug

Subject: A small Git bug

## tl;dr

3 messages between Apr 10, 2016 and Apr 10, 2016.

replies: 2people: 3as markdown or json

Victor Porton· Apr 10, 2016, 15:17 UTC · lore
I have three branches: master, prerelease, and devel.
Suppose now we are in master.

I often run the following command (in fact it is an alias, to save typing):

git push && git checkout prerelease && git merge master && git push && git checkout devel && git merge prerelease && git push && git checkout master

There is a small problem: After running this command my text editor proposes me to reload changed files.

So, it seems that the above command marks some files as changed. It is wrong, because it is inconvenient a little to reload a file or two every time after I submit the changes.

Karthik Nayak· Apr 10, 2016, 16:01 UTC · re: Victor Porton · lore

Re: A small Git bug

Hello,
On Sun, Apr 10, 2016 at 8:47 PM, Victor Porton <porton@narod.ru> wrote:
Show 17 quoted lines
> I have three branches: master, prerelease, and devel.
>
> Suppose now we are in master.
>
> I often run the following command (in fact it is an alias, to save
> typing):
>
> git push && git checkout prerelease && git merge master && git push &&
> git checkout devel && git merge prerelease && git push && git checkout
> master
>
> There is a small problem: After running this command my text editor
> proposes me to reload changed files.
>
> So, it seems that the above command marks some files as changed. It is
> wrong, because it is inconvenient a little to reload a file or two
> every time after I submit the changes.

Its more of intentional behavior than a bug. When you merge branches, the timestamp of the files involved are updated to reflect the merge.

Your text editor seems to have picked up this change in the file's timestamp as changes made to the content of the file.

-- 
Regards,
Karthik Nayak
Philip Oakley· Apr 10, 2016, 17:34 UTC · re: Karthik Nayak · lore

Re: A small Git bug

From: "Karthik Nayak" <karthik.188@gmail.com>
Show 28 quoted lines
> Hello,
>
> On Sun, Apr 10, 2016 at 8:47 PM, Victor Porton <porton@narod.ru> wrote:
>> I have three branches: master, prerelease, and devel.
>>
>> Suppose now we are in master.
>>
>> I often run the following command (in fact it is an alias, to save
>> typing):
>>
>> git push && git checkout prerelease && git merge master && git push &&
>> git checkout devel && git merge prerelease && git push && git checkout
>> master
>>
>> There is a small problem: After running this command my text editor
>> proposes me to reload changed files.
>>
>> So, it seems that the above command marks some files as changed. It is
>> wrong, because it is inconvenient a little to reload a file or two
>> every time after I submit the changes.
>
> Its more of intentional behavior than a bug. When you merge branches, the
> timestamp of the files involved are updated to reflect the merge.
>
> Your text editor seems to have picked up this change in the file's 
> timestamp as
> changes made to the content of the file.
>

Victor, There is also a patch series in discussion [1] about doing these conflict free (hopefully) merges without the use of the worktree. This would allow you workflow to be re-coded so that the checkout dance never occurs and master is undisturbed, removing the editor's change logic from the problem.

[1] http://thread.gmane.org/gmane.comp.version-control.git/291007 --

Philip 

← back to recent threads