global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-11 01:10:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pk/stash-apply-status-relative' into maint

Browse Source 
* pk/stash-apply-status-relative:
  Add test: git stash shows status relative to current dir
  git stash: show status relative to current directory
This commit is contained in:
Junio C Hamano
2011-04-01 16:23:43 -07:00
parent bcf3d1fd9c 6eaf92f3d0
commit 2aa5b6b6c0
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
git-stash.sh
View File

@@ -12,6 +12,7 @@ USAGE="list [<options>]
SUBDIRECTORY_OK=Yes
OPTIONS_SPEC=
START_DIR=`pwd`
. git-sh-setup
require_work_tree
cd_to_toplevel
@@ -393,7 +394,7 @@ apply_stash () {
then
squelch='>/dev/null 2>&1'
fi
eval "git status $squelch" || :
(cd "$START_DIR" && eval "git status $squelch") || :
else
# Merge conflict; keep the exit status from merge-recursive
status=$?