mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  scripts: do not get confused with HEAD in work tree
  Improve description of git-branch -d and -D in man page.
This commit is contained in:
Junio C Hamano
2007-11-28 17:06:57 -08:00
parent b3a4f8586b 38762c47d6
commit d25430c5f8
7 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
git-am.sh
View File

@ -218,7 +218,7 @@ fi
case "$resolved" in
'')
files=$(git diff-index --cached --name-only HEAD) || exit
files=$(git diff-index --cached --name-only HEAD --) || exit
if [ "$files" ]; then
echo "Dirty index: cannot apply patches (dirty: $files)" >&2
exit 1
@ -352,7 +352,7 @@ do
case "$resolved$interactive" in
tt)
# This is used only for interactive view option.
git diff-index -p --cached HEAD >"$dotest/patch"
git diff-index -p --cached HEAD -- >"$dotest/patch"
;;
esac
esac
@ -411,7 +411,7 @@ do
# trust what the user has in the index file and the
# working tree.
resolved=
git diff-index --quiet --cached HEAD && {
git diff-index --quiet --cached HEAD -- && {
echo "No changes - did you forget to use 'git add'?"
stop_here_user_resolve $this
}
@ -433,7 +433,7 @@ do
then
# Applying the patch to an earlier tree and merging the
# result may have produced the same tree as ours.
git diff-index --quiet --cached HEAD && {
git diff-index --quiet --cached HEAD -- && {
echo No changes -- Patch already applied.
go_next
continue