From: "Ewa Śliwińska" <kreska07@gmail.com>
To: Sergey Organov <sorganov@gmail.com>
Cc: Shourya Shukla <shouryashukla.oo@gmail.com>, git@vger.kernel.org
Subject: Re: file is showing as modified even that it was never commited
Date: Mon, 4 May 2020 20:39:10 +0200 [thread overview]
Message-ID: <CAEoQP9guAWg8E95Pi4MOih7z5rPg7OCB+_jZ6EMhJxpFsM3A1A@mail.gmail.com> (raw)
In-Reply-To: <874ksvei1r.fsf@osv.gnss.ru>
Hi Sergey,
Thanks for engaging here.
Actually, I gave some details in the first email, I'm not sure if they
were even noticed.
About asking second time: I emphasized this because I felt this part
was ignored and I didn't like it.
I wanted to describe problem more generally and gave you the commands.
But now I will paste the console full output as you demanded:
mac:lp3rater noelo$ git status
On branch master
Your branch is based on 'origin/master', but the upstream is gone.
(use "git branch --unset-upstream" to fixup)
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
new file: .idea/.gitignore
new file: .idea/compiler.xml
new file: .idea/encodings.xml
new file: .idea/jarRepositories.xml
new file: .idea/libraries/Maven__commons_codec_commons_codec_1_11.xml
new file: .idea/libraries/Maven__commons_io_commons_io_2_6.xml
new file: .idea/libraries/Maven__commons_logging_commons_logging_1_2.xml
new file: .idea/libraries/Maven__commons_net_commons_net_3_6.xml
new file: .idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_2_39_1.xml
new file: .idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_core_js_2_39_0.xml
new file: .idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_cssparser_1_5_0.xml
new file: .idea/libraries/Maven__net_sourceforge_htmlunit_neko_htmlunit_2_39_0.xml
new file: .idea/libraries/Maven__org_apache_commons_commons_lang3_3_10.xml
new file: .idea/libraries/Maven__org_apache_commons_commons_text_1_8.xml
new file: .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_12.xml
new file: .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_13.xml
new file: .idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_12.xml
new file: .idea/libraries/Maven__org_brotli_dec_0_1_2.xml
new file: .idea/libraries/Maven__org_eclipse_jetty_jetty_client_9_4_27_v20200227.xml
new file: .idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_4_27_v20200227.xml
new file: .idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_4_27_v20200227.xml
new file: .idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_4_27_v20200227.xml
new file: .idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_4_27_v20200227.xml
new file: .idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_4_27_v20200227.xml
new file: .idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_4_27_v20200227.xml
new file: .idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_4_27_v20200227.xml
new file: .idea/libraries/Maven__xalan_serializer_2_7_2.xml
new file: .idea/libraries/Maven__xalan_xalan_2_7_2.xml
new file: .idea/libraries/Maven__xerces_xercesImpl_2_12_0.xml
new file: .idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml
new file: .idea/misc.xml
new file: .idea/modules.xml
new file: .idea/sonarlint/issuestore/2/2/22a598feccb13c958ecc8eff5c53a9a7f9470a72
new file: .idea/sonarlint/issuestore/4/4/442292b8a7efeabbe4cc176709b833b1792140ec
new file: .idea/sonarlint/issuestore/c/0/c02b58f69e810278d2d423bdee557628145ed943
new file: .idea/sonarlint/issuestore/f/b/fb31951790c271e26d568f9ac5b7681e7f0804ec
new file: .idea/sonarlint/issuestore/index.pb
new file: .idea/vcs.xml
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: .idea/sonarlint/issuestore/c/0/c02b58f69e810278d2d423bdee557628145ed943
modified: .idea/sonarlint/issuestore/f/b/fb31951790c271e26d568f9ac5b7681e7f0804ec
modified: .idea/sonarlint/issuestore/index.pb
modified: src/main/java/Downloader.java
mac:lp3rater noelo$ git log
commit 50001426b28ed80433484f24831c160fcf15eec1 (HEAD -> master)
Author: Ewa Śliwiska <kreska07@gmail.com>
Date: Fri May 1 22:02:10 2020 +0200
content of the main page displayed
mac:lp3rater noelo$ git show --pretty="" --name-only 5000142
.gitignore
pom.xml
src/main/java/Application.java
src/main/java/Downloader.java
mac:lp3rater noelo$ git log -p
.idea/sonarlint/issuestore/c/0/c02b58f69e810278d2d423bdee557628145ed943
mac:lp3rater noelo$
Best regards
Ewa
On Mon, 4 May 2020 at 19:17, Sergey Organov <sorganov@gmail.com> wrote:
>
> Dear Ewa,
>
> Please see below.
>
> Ewa Śliwińska <kreska07@gmail.com> writes:
>
> >> That actually was a solution to your problem, not a workaround.
>
> > Not really, because I would like to investigate what happened, not
> > just fix it. In that case I could as well recreate repository I
> > guess...
> >
> > I agree that I could add those files accidentally. But I'm really
> > disappointed in fact that you seem to ignore all the part where I
> > described in details how I checked this and why I think this is not
> > the case.
>
> Except you didn't give actual details. Please give exact commands you
> issued and exact answers you've got.
>
> For example:
>
> $ ls .test
> a x
> $ git status
> On branch v4.0
> Your branch and 'origin/v4.0' have diverged,
> and have 2 and 29 different commits each, respectively.
> (use "git pull" to merge the remote branch into yours)
>
> Changes not staged for commit:
> (use "git add <file>..." to update what will be committed)
> (use "git checkout -- <file>..." to discard changes in working directory)
>
> modified: .test/a
>
> no changes added to commit (use "git add" and/or "git commit -a")
> $ git log -- .test
> commit e1e7818f4120b5ebc622c8dbf1b257ea8a03530c
> Author: Sergey Organov <sorganov@gmail.com>
> Date: Mon May 4 18:55:58 2020 +0300
>
> Test
>
> $ git log -- .test/a
> commit e1e7818f4120b5ebc622c8dbf1b257ea8a03530c
> Author: Sergey Organov <sorganov@gmail.com>
> Date: Mon May 4 18:55:58 2020 +0300
>
> Test
> $ git log -- .test/x
> $
>
> > Could you please answer if there was something wrong with my checking?
>
> Nobody could tell unless you actually show us your checkings.
>
> > I'm asking second time.
>
> Thanks, we've noticed.
>
> -- Sergey
next prev parent reply other threads:[~2020-05-04 18:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAEoQP9gVur=UDDPzHnLq-AryDnd45uYdEs3kajzLrtr572e_rA@mail.gmail.com>
2020-05-03 20:03 ` file is showing as modified even that it was never commited Ewa Śliwińska
2020-05-04 5:55 ` Shourya Shukla
2020-05-04 8:17 ` Ewa Śliwińska
[not found] ` <CAEoQP9hyMi=oj18atTJo+dR3ve_zzrLQoOja0CKAAVHei6rA0g@mail.gmail.com>
2020-05-04 12:00 ` Shourya Shukla
2020-05-04 12:11 ` Ewa Śliwińska
2020-05-04 17:17 ` Sergey Organov
2020-05-04 18:39 ` Ewa Śliwińska [this message]
2020-05-04 19:51 ` Sergey Organov
2020-05-04 20:04 ` Ewa Śliwińska
2020-05-04 20:41 ` Andreas Schwab
2020-05-05 7:49 ` Ewa Śliwińska
2020-05-05 8:07 ` Andreas Schwab
2020-05-05 8:10 ` Ewa Śliwińska
2020-05-05 8:14 ` Andreas Schwab
2020-05-05 8:19 ` Ewa Śliwińska
2020-05-05 8:25 ` Andreas Schwab
2020-05-05 8:34 ` Ewa Śliwińska
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAEoQP9guAWg8E95Pi4MOih7z5rPg7OCB+_jZ6EMhJxpFsM3A1A@mail.gmail.com \
--to=kreska07@gmail.com \
--cc=git@vger.kernel.org \
--cc=shouryashukla.oo@gmail.com \
--cc=sorganov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.