git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kirill <ks1322@gmail.com>
To: git@vger.kernel.org
Subject: Bug: git difftool --tool=meld -d HEAD^ lose copied file
Date: Sun, 13 Apr 2025 17:07:20 +0300	[thread overview]
Message-ID: <CAKFQ_Q93M=x_xNuCm_evjUSfi_cNGQ0LuZSHVua1vTZHc0e-7w@mail.gmail.com> (raw)

Thank you for filling out a Git bug report!
Please answer the following questions to help us understand your issue.

What did you do before the bug happened? (Steps to reproduce your issue)

mkdir git-copy-lost
cd git-copy-lost
git init
touch file
git add file
git commit -am "message"
git rm file
git commit -am "message"
git difftool --tool=meld -d HEAD^

In meld right click on `file` in left pane and press "Copy To Right" in menu
Quit meld

ls -l

What did you expect to happen? (Expected behavior)

`file` is present in working directory

What happened instead? (Actual behavior)

`file` is absent in working directory

What's different between what you expected and what actually happened?

`file` is missing while it was copied in meld with "Copy To Right" button

Anything else you want to add:

This bug was also reported for meld but I don't think meld can do
anything with it
because copied file is being lost in temporary directory like
/tmp/git-difftool.7bOf2n/right/ created by git
Meld bug: https://gitlab.gnome.org/GNOME/meld/-/issues/555

Please review the rest of the bug report below.
You can delete any lines you don't wish to share.


[System Info]
git version:
git version 2.49.0
cpu: x86_64
no commit associated with this build
sizeof-long: 8
sizeof-size_t: 8
shell-path: /bin/sh
libcurl: 8.9.1
OpenSSL: OpenSSL 3.2.4 11 Feb 2025
zlib-ng: 2.2.3
uname: Linux 6.13.9-200.fc41.x86_64 #1 SMP PREEMPT_DYNAMIC Sat Mar 29
01:29:31 UTC 2025 x86_64
compiler info: gnuc: 14.2
libc info: glibc: 2.40
$SHELL (typically, interactive shell): /bin/bash


[Enabled Hooks]

             reply	other threads:[~2025-04-13 14:07 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-13 14:07 Kirill [this message]
2025-04-13 15:11 ` Bug: git difftool --tool=meld -d HEAD^ lose copied file K Jayatheerth

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='CAKFQ_Q93M=x_xNuCm_evjUSfi_cNGQ0LuZSHVua1vTZHc0e-7w@mail.gmail.com' \
    --to=ks1322@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.
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 NNTP newsgroup(s).