All of lore.kernel.org
 help / color / mirror / Atom feed
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 22:04:00 +0200	[thread overview]
Message-ID: <CAEoQP9ic7yU01JWkjiNT40gtq0WyUW7sBAJPRRdBRw93dhRw9w@mail.gmail.com> (raw)
In-Reply-To: <87o8r3cwcn.fsf@osv.gnss.ru>

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

  reply	other threads:[~2020-05-04 20:04 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
2020-05-04 19:51               ` Sergey Organov
2020-05-04 20:04                 ` Ewa Śliwińska [this message]
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=CAEoQP9ic7yU01JWkjiNT40gtq0WyUW7sBAJPRRdBRw93dhRw9w@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.