* file is showing as modified even that it was never commited [not found] <CAEoQP9gVur=UDDPzHnLq-AryDnd45uYdEs3kajzLrtr572e_rA@mail.gmail.com> @ 2020-05-03 20:03 ` Ewa Śliwińska 2020-05-04 5:55 ` Shourya Shukla 0 siblings, 1 reply; 17+ messages in thread From: Ewa Śliwińska @ 2020-05-03 20:03 UTC (permalink / raw) To: git Hi, I’m probably missing something here, but it looks really weird and I can’t find any information on this. My situation is as following: I created empty repository on Bitbucket, then cloned it, added code and made one initial commit (without push). Now I changed the code and I would like to commit it, but I have some troubles. The problem is some files are showing as changed while I never committed them. I never intended to commit them (they are under .idea directory, which I added to .gitignore). I checked with git log - I have only this one commit. I checked files affected by this commit using git show --pretty="" --name-only. Mentioned files are not there. Also checked the history of one particular file, using git log -p - no history here.| At the same time, file is showing is changes not staged for commit when calling git status. For what is worth, file is even not there. I hope you’ll help me unravel this. I am out of ideas, kind of seems like a bug. Best regards Ewa ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: file is showing as modified even that it was never commited 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> 0 siblings, 2 replies; 17+ messages in thread From: Shourya Shukla @ 2020-05-04 5:55 UTC (permalink / raw) To: kreska07; +Cc: git Hey Ewa! This might be the fix for you: A `gitignore` file ensures that certain file(s) which are not tracked by Git remain untracked. However, sometimes particular file(s) may have been tracked before adding them into the `.gitignore`, hence they still remain tracked. To untrack and ignore files/patterns, use `git rm --cached <file/pattern>` and add a pattern to `.gitignore` that matches the <file>. Most probably the '.idea' folder might have been tracked before adding it to the '.gitignore' and hence it shows up in the staging area (i.e., when you run a `git status`, it shows up as modified). If there is a doubt still, feel free to drop a message here :) Regards, Shourya Shukla ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: file is showing as modified even that it was never commited 2020-05-04 5:55 ` Shourya Shukla @ 2020-05-04 8:17 ` Ewa Śliwińska [not found] ` <CAEoQP9hyMi=oj18atTJo+dR3ve_zzrLQoOja0CKAAVHei6rA0g@mail.gmail.com> 1 sibling, 0 replies; 17+ messages in thread From: Ewa Śliwińska @ 2020-05-04 8:17 UTC (permalink / raw) To: Shourya Shukla; +Cc: git Hi, thanks for your response. I consider what you propose rather a workaround, while it is really important for me to get to know what happened here. Could you help me investigate this? I though that I might add those files accidentally before. That's why I checked it, I described it in the original email. Did I check in a wrong way? ^ permalink raw reply [flat|nested] 17+ messages in thread
[parent not found: <CAEoQP9hyMi=oj18atTJo+dR3ve_zzrLQoOja0CKAAVHei6rA0g@mail.gmail.com>]
* Re: file is showing as modified even that it was never commited [not found] ` <CAEoQP9hyMi=oj18atTJo+dR3ve_zzrLQoOja0CKAAVHei6rA0g@mail.gmail.com> @ 2020-05-04 12:00 ` Shourya Shukla 2020-05-04 12:11 ` Ewa Śliwińska 0 siblings, 1 reply; 17+ messages in thread From: Shourya Shukla @ 2020-05-04 12:00 UTC (permalink / raw) To: Ewa Śliwińska; +Cc: git On 04/05 10:11, Ewa Śliwińska wrote: > Hi, > > thanks for your response. > I consider what you propose rather a workaround, while it is really > important for me to get to know what happened here. > Could you help me investigate this? That actually was a solution to your problem, not a workaround. > I though that I might add those files accidentally before. That's why I > checked it, I wrote about this in the original email. > Did I check in a wrong way? If we go into detail of what might have actually happened, the `.idea` folder must've been tracked before getting a mention in the `.gitignore`. Now, the thing is that `.gitignore` ignores only those patterns/files which were not tracked since their addition in it. So most probably, this would have been the case with `.idea` as well. And yes, you might have added those files before accidentally, maybe when you did a `git add .` or something alike. Regards, Shourya Shukla ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: file is showing as modified even that it was never commited 2020-05-04 12:00 ` Shourya Shukla @ 2020-05-04 12:11 ` Ewa Śliwińska 2020-05-04 17:17 ` Sergey Organov 0 siblings, 1 reply; 17+ messages in thread From: Ewa Śliwińska @ 2020-05-04 12:11 UTC (permalink / raw) To: Shourya Shukla; +Cc: git > 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. Could you please answer if there was something wrong with my checking? I'm asking second time. Or could you guide me step by step through investigation which would confirm your theory? On Mon, 4 May 2020 at 14:00, Shourya Shukla <shouryashukla.oo@gmail.com> wrote: > > On 04/05 10:11, Ewa Śliwińska wrote: > > Hi, > > > > thanks for your response. > > I consider what you propose rather a workaround, while it is really > > important for me to get to know what happened here. > > Could you help me investigate this? > > That actually was a solution to your problem, not a workaround. > > > I though that I might add those files accidentally before. That's why I > > checked it, I wrote about this in the original email. > > Did I check in a wrong way? > > If we go into detail of what might have actually happened, the `.idea` > folder must've been tracked before getting a mention in the > `.gitignore`. Now, the thing is that `.gitignore` ignores only those > patterns/files which were not tracked since their addition in it. So > most probably, this would have been the case with `.idea` as well. > > And yes, you might have added those files before accidentally, maybe > when you did a `git add .` or something alike. > > Regards, > Shourya Shukla Pozdrawiam Ewa On Mon, 4 May 2020 at 14:00, Shourya Shukla <shouryashukla.oo@gmail.com> wrote: > > On 04/05 10:11, Ewa Śliwińska wrote: > > Hi, > > > > thanks for your response. > > I consider what you propose rather a workaround, while it is really > > important for me to get to know what happened here. > > Could you help me investigate this? > > That actually was a solution to your problem, not a workaround. > > > I though that I might add those files accidentally before. That's why I > > checked it, I wrote about this in the original email. > > Did I check in a wrong way? > > If we go into detail of what might have actually happened, the `.idea` > folder must've been tracked before getting a mention in the > `.gitignore`. Now, the thing is that `.gitignore` ignores only those > patterns/files which were not tracked since their addition in it. So > most probably, this would have been the case with `.idea` as well. > > And yes, you might have added those files before accidentally, maybe > when you did a `git add .` or something alike. > > Regards, > Shourya Shukla ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: file is showing as modified even that it was never commited 2020-05-04 12:11 ` Ewa Śliwińska @ 2020-05-04 17:17 ` Sergey Organov 2020-05-04 18:39 ` Ewa Śliwińska 0 siblings, 1 reply; 17+ messages in thread From: Sergey Organov @ 2020-05-04 17:17 UTC (permalink / raw) To: Ewa Śliwińska; +Cc: Shourya Shukla, git 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 ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: file is showing as modified even that it was never commited 2020-05-04 17:17 ` Sergey Organov @ 2020-05-04 18:39 ` Ewa Śliwińska 2020-05-04 19:51 ` Sergey Organov 2020-05-04 20:41 ` Andreas Schwab 0 siblings, 2 replies; 17+ messages in thread From: Ewa Śliwińska @ 2020-05-04 18:39 UTC (permalink / raw) To: Sergey Organov; +Cc: Shourya Shukla, git 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 ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: file is showing as modified even that it was never commited 2020-05-04 18:39 ` Ewa Śliwińska @ 2020-05-04 19:51 ` Sergey Organov 2020-05-04 20:04 ` Ewa Śliwińska 2020-05-04 20:41 ` Andreas Schwab 1 sibling, 1 reply; 17+ messages in thread From: Sergey Organov @ 2020-05-04 19:51 UTC (permalink / raw) To: Ewa Śliwińska; +Cc: Shourya Shukla, git Ewa Śliwińska <kreska07@gmail.com> writes: > 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) This is something I've never seen before. Dunno how this happened to you, but to me it rings a bell that something weird goes on in this repo. Maybe it's in fact nothing, but then you may get all kinds of nasty behaviors if repo is indeed broken. > > > Changes to be committed: > > (use "git reset HEAD <file>..." to unstage) > > > new file: .idea/.gitignore [... a lot more new files ...] Interesting. Is it the .gitignore that tells git to ignore all files in .idea/? If so, it's not a good idea for .gitignore to ignore itself. It's very confusing at minimum. Many new files also tells that you somehow, apparently by mistake, added all these files to staging (that will be committed at the next commit). Also, apparently you already did this same thing before, so there are some more files from .idea/ that are already there. [...] > 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 These were likely already committed at the previous commit(s) and now have some changes. Try, say: $ git log -- .idea/sonarlint/issuestore/index.pb to see what commit added the file. In addition, try: $ git check-ignore .idea/sonarlint/issuestore/index.pb to check if the file you think is ignored is in fact ignored, as it'd be the simplest explanation of your troubles if it isn't. HTH, -- Sergey ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: file is showing as modified even that it was never commited 2020-05-04 19:51 ` Sergey Organov @ 2020-05-04 20:04 ` Ewa Śliwińska 0 siblings, 0 replies; 17+ messages in thread From: Ewa Śliwińska @ 2020-05-04 20:04 UTC (permalink / raw) To: Sergey Organov; +Cc: Shourya Shukla, git I don't know why would something be broken in my repo. As I wrote, I simply clone it (empty) from bitbucket and than started adding code, really nothing extraordinary. "Is it the .gitignore that tells git to ignore all files in .idea/?" - no, it contains some default-ignored by idea files. The one that I'm using (or at least intended to) is on the main level. This is the output of the commands you wrote me to run: mac:.idea noelo$ git log -- .idea/sonarlint/issuestore/index.pb mac:.idea noelo$ git check-ignore .idea/sonarlint/issuestore/index.pb .idea/sonarlint/issuestore/index.pb mac:.idea noelo$ So it still seems like the file was not committed and it is ignored as far as I understand this. On Mon, 4 May 2020 at 21:51, Sergey Organov <sorganov@gmail.com> wrote: > > Ewa Śliwińska <kreska07@gmail.com> writes: > > > 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) > > This is something I've never seen before. Dunno how this happened to > you, but to me it rings a bell that something weird goes on in this > repo. Maybe it's in fact nothing, but then you may get all kinds of > nasty behaviors if repo is indeed broken. > > > > > > > Changes to be committed: > > > > (use "git reset HEAD <file>..." to unstage) > > > > > > new file: .idea/.gitignore > [... a lot more new files ...] > > Interesting. Is it the .gitignore that tells git to ignore all files in > .idea/? If so, it's not a good idea for .gitignore to ignore itself. > It's very confusing at minimum. > > Many new files also tells that you somehow, apparently by mistake, added > all these files to staging (that will be committed at the next commit). > > Also, apparently you already did this same thing before, so there are > some more files from .idea/ that are already there. > > [...] > > > 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 > > These were likely already committed at the previous commit(s) and now > have some changes. Try, say: > > $ git log -- .idea/sonarlint/issuestore/index.pb > > to see what commit added the file. > > In addition, try: > > $ git check-ignore .idea/sonarlint/issuestore/index.pb > > to check if the file you think is ignored is in fact ignored, as it'd be > the simplest explanation of your troubles if it isn't. > > HTH, > -- Sergey ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: file is showing as modified even that it was never commited 2020-05-04 18:39 ` Ewa Śliwińska 2020-05-04 19:51 ` Sergey Organov @ 2020-05-04 20:41 ` Andreas Schwab 2020-05-05 7:49 ` Ewa Śliwińska 1 sibling, 1 reply; 17+ messages in thread From: Andreas Schwab @ 2020-05-04 20:41 UTC (permalink / raw) To: Ewa Śliwińska; +Cc: Sergey Organov, Shourya Shukla, git On Mai 04 2020, Ewa Śliwińska wrote: > 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 That means you have explicitly staged all these files with git add. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different." ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: file is showing as modified even that it was never commited 2020-05-04 20:41 ` Andreas Schwab @ 2020-05-05 7:49 ` Ewa Śliwińska 2020-05-05 8:07 ` Andreas Schwab 0 siblings, 1 reply; 17+ messages in thread From: Ewa Śliwińska @ 2020-05-05 7:49 UTC (permalink / raw) To: Andreas Schwab; +Cc: Sergey Organov, Shourya Shukla, git Thank you, but those are not what I ask about here. I guess the Idea must did it for me. That is not the problem now, I worry only about those "modified" files. Pozdrawiam Ewa On Mon, 4 May 2020 at 22:41, Andreas Schwab <schwab@linux-m68k.org> wrote: > > On Mai 04 2020, Ewa Śliwińska wrote: > > > 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 > > That means you have explicitly staged all these files with git add. > > Andreas. > > -- > Andreas Schwab, schwab@linux-m68k.org > GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 > "And now for something completely different." ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: file is showing as modified even that it was never commited 2020-05-05 7:49 ` Ewa Śliwińska @ 2020-05-05 8:07 ` Andreas Schwab 2020-05-05 8:10 ` Ewa Śliwińska 0 siblings, 1 reply; 17+ messages in thread From: Andreas Schwab @ 2020-05-05 8:07 UTC (permalink / raw) To: Ewa Śliwińska; +Cc: Sergey Organov, Shourya Shukla, git On Mai 05 2020, Ewa Śliwińska wrote: > That is not the problem now, I worry only about those "modified" files. Just git add them again. Each time you git add a file, only the current content is staged. If you modify it further, you need to git add it again if you want to commit the new contents. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different." ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: file is showing as modified even that it was never commited 2020-05-05 8:07 ` Andreas Schwab @ 2020-05-05 8:10 ` Ewa Śliwińska 2020-05-05 8:14 ` Andreas Schwab 0 siblings, 1 reply; 17+ messages in thread From: Ewa Śliwińska @ 2020-05-05 8:10 UTC (permalink / raw) To: Andreas Schwab; +Cc: Sergey Organov, Shourya Shukla, git We probably don't understand each other. At least I don't get you. I don't know what you think I want with them, but it's definitely not adding. And the problem is I would like to know what HAPPENED or why they are displaying as they were added when at the same time it seems they weren't (that was never my intention). On Tue, 5 May 2020 at 10:07, Andreas Schwab <schwab@linux-m68k.org> wrote: > > On Mai 05 2020, Ewa Śliwińska wrote: > > > That is not the problem now, I worry only about those "modified" files. > > Just git add them again. Each time you git add a file, only the current > content is staged. If you modify it further, you need to git add it > again if you want to commit the new contents. > > Andreas. > > -- > Andreas Schwab, schwab@linux-m68k.org > GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 > "And now for something completely different." ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: file is showing as modified even that it was never commited 2020-05-05 8:10 ` Ewa Śliwińska @ 2020-05-05 8:14 ` Andreas Schwab 2020-05-05 8:19 ` Ewa Śliwińska 0 siblings, 1 reply; 17+ messages in thread From: Andreas Schwab @ 2020-05-05 8:14 UTC (permalink / raw) To: Ewa Śliwińska; +Cc: Sergey Organov, Shourya Shukla, git On Mai 05 2020, Ewa Śliwińska wrote: > I don't know what you think I want with them, but it's definitely not adding. Then why did you stage them in the first place? Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different." ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: file is showing as modified even that it was never commited 2020-05-05 8:14 ` Andreas Schwab @ 2020-05-05 8:19 ` Ewa Śliwińska 2020-05-05 8:25 ` Andreas Schwab 0 siblings, 1 reply; 17+ messages in thread From: Ewa Śliwińska @ 2020-05-05 8:19 UTC (permalink / raw) To: Andreas Schwab; +Cc: Sergey Organov, Shourya Shukla, git I didn't, not explicitly. Maybe my IDE, but I don't know how that happened. And first of all, I don't want to talk about those files at all. Just about the modified ones below. Don't get me wrong, I can answer your questions, I just don't see how this is relevant. On Tue, 5 May 2020 at 10:14, Andreas Schwab <schwab@linux-m68k.org> wrote: > > On Mai 05 2020, Ewa Śliwińska wrote: > > > I don't know what you think I want with them, but it's definitely not adding. > > Then why did you stage them in the first place? > > Andreas. > > -- > Andreas Schwab, schwab@linux-m68k.org > GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 > "And now for something completely different." ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: file is showing as modified even that it was never commited 2020-05-05 8:19 ` Ewa Śliwińska @ 2020-05-05 8:25 ` Andreas Schwab 2020-05-05 8:34 ` Ewa Śliwińska 0 siblings, 1 reply; 17+ messages in thread From: Andreas Schwab @ 2020-05-05 8:25 UTC (permalink / raw) To: Ewa Śliwińska; +Cc: Sergey Organov, Shourya Shukla, git On Mai 05 2020, Ewa Śliwińska wrote: > And first of all, I don't want to talk about those files at all. Just > about the modified ones below. You cannot ignore the staged files, that's the key to your confusion. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different." ^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: file is showing as modified even that it was never commited 2020-05-05 8:25 ` Andreas Schwab @ 2020-05-05 8:34 ` Ewa Śliwińska 0 siblings, 0 replies; 17+ messages in thread From: Ewa Śliwińska @ 2020-05-05 8:34 UTC (permalink / raw) To: Andreas Schwab; +Cc: Sergey Organov, Shourya Shukla, git Wow, your completely right. Thanks a lot! Now I see they must have been somehow staged, then changed and only changes are not staged... That explains everything. I don't know how I staged them now, and I guess you can't help me answer this question, what is important is that they are in fact staged. Maybe that's a problem with IDE or I did it somehow accidentally... Anyway, that seems explained now, not bug. Thank you all a lot once again. On Tue, 5 May 2020 at 10:25, Andreas Schwab <schwab@linux-m68k.org> wrote: > > On Mai 05 2020, Ewa Śliwińska wrote: > > > And first of all, I don't want to talk about those files at all. Just > > about the modified ones below. > > You cannot ignore the staged files, that's the key to your confusion. > > Andreas. > > -- > Andreas Schwab, schwab@linux-m68k.org > GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 > "And now for something completely different." ^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2020-05-05 8:34 UTC | newest] Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [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 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
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.