git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Britton Kerin <britton.kerin@gmail.com>
To: git@vger.kernel.org
Subject: bug when git stash apply after switching to branch with links were regular files
Date: Tue, 4 Jan 2022 15:52:43 -0900	[thread overview]
Message-ID: <CAC4O8c98H=txccR-3JM2L7jiAaf7WmJ1qyg+oiqSgrB5Qc1nUg@mail.gmail.com> (raw)

On git version 2.34.1:

I have a branch where sym links get replaced with copies of the
regular files they point to.  If I make a change to that branch and
git stash it, then git checkout master again, then git stash apply I
get messages like this:

     $ git stash apply
     Adding dirA_thats_now_a_link_again
     Adding dirB_thats_now_a_link_again
     etc.

These messages seem  completely spurious: applying the stash doesn't
result in any actual changes in any of those paths (and the links stay
links).  The only change is to the actual file affected by the stash
(which was a real file in both the branch and master).

Interestingly I was getting this same message a few smallish versions
of git back I believe when I did the checkout back to master.  I
updated to latest stable git and that issue went away.  So it looks
like maybe a fix to get rid of these spurious messages got applied in
one place but not others.

If there's interest in fixing this issue I can go back and isolate it
more carefully on request.

Britton

                 reply	other threads:[~2022-01-05  0:53 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAC4O8c98H=txccR-3JM2L7jiAaf7WmJ1qyg+oiqSgrB5Qc1nUg@mail.gmail.com' \
    --to=britton.kerin@gmail.com \
    --cc=git@vger.kernel.org \
    /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.
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).