From 0dca83a452b5b6d4e116bb1597db8b417907601a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 13 Jul 2010 18:45:50 +0200 Subject: [PATCH] Use 'git checkout HEAD' instead of reset+checkout. Thanks for the suggestion to Jonathan Callen. --- sunrise-commit | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sunrise-commit b/sunrise-commit index f586cee..3e849a6 100755 --- a/sunrise-commit +++ b/sunrise-commit @@ -174,8 +174,7 @@ check_for_changes() { # Discard any changes to a particular set of files. vcs_reset() { if [ ${SC_VCS%-svn} = git ]; then - req git reset -q HEAD -- "${@}" - git checkout -f -- "${@}" 2>/dev/null || req rm -f -- "${@}" + git checkout HEAD -- "${@}" 2>/dev/null || req rm -f -- "${@}" elif [ ${SC_VCS} = svn ]; then req rm -f -- "${@}" svn revert -- "${@}" >/dev/null