threads / discuss / 45121
Subject: [git-gui] Amending doesn't preserve timestamp
JurajI've just noticed that amending a commit from git-gui uses the time of amending as the new timestamp of the commit, whereas git commit --amend preserves the original timestamp. Maybe the two should work the same, whatever it is decided to be the standard behavior.
Juraj
Re: [git-gui] Amending doesn't preserve timestamp
On 12/02/2017 21:50, Juraj wrote:
> I've just noticed that amending a commit from git-gui uses the time of > amending as the new timestamp of the commit, whereas git commit > --amend preserves the original timestamp. Maybe the two should work > the same, whatever it is decided to be the standard behavior. > > Juraj >
Hi Juraj,
Just to report that it seems to work as expected on my end...? Amending through both command line and git-gui preserves author date and updates commiter date.
git version 2.11.1.windows.1 git-gui version 0.21.GITGUI Tcl/Tk version 8.6.6
Regards, BugA
JurajRe: [git-gui] Amending doesn't preserve timestamp
Hi Igor,
I forgot to write the version I'm using. It's on Ubuntu 16.04, git-gui package version 1:2.7.4-0ubuntu1 (--version: git-gui version 0.20.0), git version 2.7.4, tcl and tk 8.6.0+9. Perhaps it got fixed in a newer version, in that case, my bad for not checking before posting.
Thanks, Juraj
Re: [git-gui] Amending doesn't preserve timestamp
On 12/02/2017 22:40, Juraj wrote:
> Hi Igor, > > I forgot to write the version I'm using. It's on Ubuntu 16.04, git-gui > package version 1:2.7.4-0ubuntu1 (--version: git-gui version 0.20.0), > git version 2.7.4, tcl and tk 8.6.0+9. Perhaps it got fixed in a newer > version, in that case, my bad for not checking before posting. > > Thanks, > Juraj
Hi Juraj,
Indeed, if I`m reading it correctly, it seems to be addressed in git-gui version 0.21.0[1], introduced in git version 2.11.0[2] on 2016-11-29 ("git-gui: Do not reset author details on amend", 2016-04-11[3], referencing an old bug report[4]).
Regards, BugA
[1] https://public-inbox.org/git/878ttji701.fsf@red.patthoyts.tk/ [2] https://public-inbox.org/git/xmqqmvgidlsg.fsf@gitster.mtv.corp.google.com/ [3] https://public-inbox.org/git/1462458182-4488-1-git-send-email-orgads@gmail.com/ [4] https://public-inbox.org/git/CAGHpTB+35j0njmCZ0uCgBVroe=Ma7HLnn6fDty8yebKWgEmECg@mail.gmail.com/
Juraj OršulićRe: [git-gui] Amending doesn't preserve timestamp
Hello Igor (and others), I have something else to report about the commit amend functionality in git-gui, and I think it could be related to my original question. It seems that git-gui messes up international signs on amending.
E.g. I use git gui to make a commit, and all is OK:
commit ef24b133dda6c18b8ef01b1a38f9e049d87f2021 Author: Juraj Oršulić <juraj.orsulic@fer.hr>
I open git gui again, click "Amend Last Commit", press "Commit", and I get this in git log:
commit 6e09ff9edcef863d92f02cf86e0307c27171aec0 Author: Juraj OrÅ¡uliÄ<U+0087> <juraj.orsulic@fer.hr>
Does anyone have any idea what could be the cause?
I tested this on Ubuntu 16.04 and HEAD vearsion of git-gui on http://repo.or.cz/git-gui.git, currently 0.21.0.5.g5ab72.
Thanks, Juraj
Re: [git-gui] Amending doesn't preserve timestamp
Hi Juraj,
On 23/03/2017 15:26, Juraj Oršulić wrote:
> Hello Igor (and others), I have something else to report about the > commit amend functionality in git-gui, and I think it could be > related to my original question. It seems that git-gui messes up > international signs on amending. > > E.g. I use git gui to make a commit, and all is OK: > > commit ef24b133dda6c18b8ef01b1a38f9e049d87f2021 > Author: Juraj Oršulić <juraj.orsulic@fer.hr> > > I open git gui again, click "Amend Last Commit", press "Commit", and I > get this in git log: > > commit 6e09ff9edcef863d92f02cf86e0307c27171aec0 > Author: Juraj OrÅ¡uliÄ<U+0087> <juraj.orsulic@fer.hr> > > > Does anyone have any idea what could be the cause? > > I tested this on Ubuntu 16.04 and HEAD vearsion of git-gui on > http://repo.or.cz/git-gui.git, currently 0.21.0.5.g5ab72.
Yes, I can confirm this.
git version 2.12.1.windows.1 git-gui version 0.21.GITGUI Tcl/Tk version 8.6.6
That said, it seems there are quite some topics about it, like [1], [2], [3] and [4], but the most interesting one could be [5], having some kind of a "workaround" at the end as well.
I`ve tried replacing the "commit.tcl" file as proposed, and it seems to work correctly -- just please do note that it actually reverts the file in question to an older version, maybe (re)introducing other bugs while fixing this specific one, so it could be something you may want to investigate into a bit more before actually using it for good.
P.S. It might be a good idea to start a new topic in situations like this (send out a new e-mail instead of a reply), keeping unrelated discussions separated and helping interested parties spotting the new topic more easily.
Regards, Buga
[1] https://public-inbox.org/git/588ac268-0a1b-6787-e6a1-4164e7e9a784@b-i-t.de/T/#ea05ebbde162f9c230a2cc4f7099363aed68768f6 [2] https://public-inbox.org/git/52E1627956F20E458D872C5961027EDC654FE17C@SGDS00759.zf-lenksysteme.net/T/#m0baea8c76e79f25bf92ca0deabe38efec2ee168d [3] https://public-inbox.org/git/50913C58.2000200@drmicha.warpmail.net/T/#m72664106ad3070235ea2628b61fc6203fbb5563e [4] https://public-inbox.org/git/20071212091744.GA5377@pvv.org/T/#m8490dd348389b4eea82eb1bdaab69227c946de19 [5] https://github.com/git-for-windows/git/issues/761
Juraj OršulićRe: [git-gui] Amending doesn't preserve timestamp
Hi Igor! Thanks on for thoroughly searching the mailing list and on your suggestions. I hope that someone will come up with a fix that both preserves the author details and date correctly.
Regards, Juraj
On Thu, Mar 23, 2017 at 11:54 PM, Igor Djordjevic <igor.d.djordjevic@gmail.com> wrote:
> Hi Juraj, > > On 23/03/2017 15:26, Juraj Oršulić wrote: >> Hello Igor (and others), I have something else to report about the >> commit amend functionality in git-gui, and I think it could be >> related to my original question. It seems that git-gui messes up >> international signs on amending. >> >> E.g. I use git gui to make a commit, and all is OK: >> >> commit ef24b133dda6c18b8ef01b1a38f9e049d87f2021 >> Author: Juraj Oršulić <juraj.orsulic@fer.hr> >> >> I open git gui again, click "Amend Last Commit", press "Commit", and I >> get this in git log: >> >> commit 6e09ff9edcef863d92f02cf86e0307c27171aec0 >> Author: Juraj OrÅ¡uliÄ<U+0087> <juraj.orsulic@fer.hr> >> >> >> Does anyone have any idea what could be the cause? >> >> I tested this on Ubuntu 16.04 and HEAD vearsion of git-gui on >> http://repo.or.cz/git-gui.git, currently 0.21.0.5.g5ab72. > > Yes, I can confirm this. > > git version 2.12.1.windows.1 > git-gui version 0.21.GITGUI > Tcl/Tk version 8.6.6 > > That said, it seems there are quite some topics about it, like [1], > [2], [3] and [4], but the most interesting one could be [5], having > some kind of a "workaround" at the end as well. > > I`ve tried replacing the "commit.tcl" file as proposed, and it seems > to work correctly -- just please do note that it actually reverts the > file in question to an older version, maybe (re)introducing other > bugs while fixing this specific one, so it could be something you may > want to investigate into a bit more before actually using it for good. > > P.S. It might be a good idea to start a new topic in situations like > this (send out a new e-mail instead of a reply), keeping unrelated > discussions separated and helping interested parties spotting the new > topic more easily. > > Regards, > Buga > > [1] https://public-inbox.org/git/588ac268-0a1b-6787-e6a1-4164e7e9a784@b-i-t.de/T/#ea05ebbde162f9c230a2cc4f7099363aed68768f6 > [2] https://public-inbox.org/git/52E1627956F20E458D872C5961027EDC654FE17C@SGDS00759.zf-lenksysteme.net/T/#m0baea8c76e79f25bf92ca0deabe38efec2ee168d > [3] https://public-inbox.org/git/50913C58.2000200@drmicha.warpmail.net/T/#m72664106ad3070235ea2628b61fc6203fbb5563e > [4] https://public-inbox.org/git/20071212091744.GA5377@pvv.org/T/#m8490dd348389b4eea82eb1bdaab69227c946de19 > [5] https://github.com/git-for-windows/git/issues/761