git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
From: Philippe <bqobctqyemmeacqxbrsaury3l4ka@quarantine.de>
To: Git mailing list <git@vger.kernel.org>
Subject: Re: difftool fails with dangling symlinks, writes to targets outside of the repository
Date: Mon, 2 Dec 2019 13:23:00 +0100
Message-ID: <c23d23d8-8a08-9ee7-d148-77b1f4611606@quarantine.de> (raw)
In-Reply-To: <7e04799d-c03c-ac28-604d-ec4d30029d44@quarantine.de>

Hi all,

since that "difftool overwrites files outside of the git
repository"-thingy is apparently not considered a bug, could you please
point me to the correct usage of difftool or a workaround?

To recall the situation:
- git repo contains a symlink pointing outside of the repository to a
non-existing file
- that symlink gets replaced by a regular file
- using 'git difftool -d ${oldstate}..${newstate}' overwrites the file
the symlink was pointing to (which might fail if the target is not writable)

Kind regards

Philippe

      reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-22 12:37 Philippe
2019-12-02 12:23 ` Philippe [this message]

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=c23d23d8-8a08-9ee7-d148-77b1f4611606@quarantine.de \
    --to=bqobctqyemmeacqxbrsaury3l4ka@quarantine.de \
    --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

git@vger.kernel.org list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git