From: Johannes Sixt <j.sixt@viscovery.net>
To: Git Mailing List <git@vger.kernel.org>
Subject: git stash apply usability issues
Date: Thu, 18 Oct 2007 10:32:33 +0200 [thread overview]
Message-ID: <47171A21.9030003@viscovery.net> (raw)
(1) Looking at git-stash.sh I see a few uses of 'git diff' in apply_stash().
Shouldn't these use one of git-diff-{tree,index,files)? The reason is that
porcelain 'git diff' invokes custom diff drivers (that in my case run a UI
program), whereas the plumbing does not.
Is there a particular reason to use porcelain 'git diff'?
(2) when 'git stash apply' runs merge-recursive, it treats the current state
as 'ours' and the stash as 'theirs'. IMHO it should be the other way round:
I have stashed away changes to a binary file. Then committed a different
modification to it, and now want to apply the stash. This results in a
conflict that leaves the current state in the working tree, but I had
preferred that the stashed binary file were in the working tree now.
What do other git-stash users think about changing the order?
-- Hannes
next reply other threads:[~2007-10-18 8:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-18 8:32 Johannes Sixt [this message]
2007-10-18 14:12 ` git stash apply usability issues Steven Grimm
2007-10-19 1:31 ` Shawn O. Pearce
2007-10-19 13:27 ` Karl Hasselström
2007-10-19 13:57 ` David Kastrup
2007-10-19 1:33 ` [PATCH] Avoid invoking diff drivers during git-stash Shawn O. Pearce
2007-10-19 6:08 ` Johannes Sixt
2007-10-19 6:13 ` Shawn O. Pearce
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=47171A21.9030003@viscovery.net \
--to=j.sixt@viscovery.net \
--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).