git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* Resetting files during a merge causes loss of resetted change, invisible in commit logs.
@ 2019-05-17 10:28 Thijs ter Horst
  2019-05-17 16:56 ` Elijah Newren
  0 siblings, 1 reply; 2+ messages in thread
From: Thijs ter Horst @ 2019-05-17 10:28 UTC (permalink / raw)
  To: git

Dear all,

Disclaimer: I have never done a bug report / worked with mailing lists
before, so if I'm doing things wrong I'd gladly hear.

As the title describes, git can change files without logging the
change. I'm not sure how to describe it shortly, so I've made a
minimal reproduction at 'https://github.com/gmth/git_test', along with
a shell script (git_debug.sh) that reproduces what I think is a
problem. In that repo "text1.txt" changes back when according to
commit logs it shouldnt have.

I ran into this when I lost some changes in my codebase that I could
not find in the commit logs, and a merge commit ('feature' into
'master') showed that that commit reverted a file to an earlier state,
while that change was not visible in any commits in 'feature'. The
cause in my case was probably that I accidentally clicked the
"Discard" button on a file in SmartGit, but the shell script shows how
to reproduce it with commandline git. Therefore I do not think this
has to do with SmartGit.

I am unsure if I'm allowed to attach the reproducing shell script to
this email, so that's why I haven't (spam filters etc).

Kind regards,

Thijs ter Horst

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-05-17 16:56 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-17 10:28 Resetting files during a merge causes loss of resetted change, invisible in commit logs Thijs ter Horst
2019-05-17 16:56 ` Elijah Newren

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).