Home » Mailing list archives » git » 2007 » October » 18

git stash apply usability issues

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Johannes Sixt
Subject: git stash apply usability issues
Date: Thursday, October 18, 2007 - 1:32 am

(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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
git stash apply usability issues, Johannes Sixt, (Thu Oct 18, 1:32 am)
Re: git stash apply usability issues, Steven Grimm, (Thu Oct 18, 7:12 am)
Re: git stash apply usability issues, Shawn O. Pearce, (Thu Oct 18, 6:31 pm)
[PATCH] Avoid invoking diff drivers during git-stash, Shawn O. Pearce, (Thu Oct 18, 6:33 pm)
Re: [PATCH] Avoid invoking diff drivers during git-stash, Johannes Sixt, (Thu Oct 18, 11:08 pm)
Re: [PATCH] Avoid invoking diff drivers during git-stash, Shawn O. Pearce, (Thu Oct 18, 11:13 pm)
Re: git stash apply usability issues, Karl , (Fri Oct 19, 6:27 am)