Merge git://repo.or.cz/git-gui

diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 18b07d9d36a55271b582b6fb8bf90e9e197f0622..c9300f3c8b246e3c81570532534748e510a2865f 100755 (executable)
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -808,7 +808,7 @@ test_expect_success POSIXPERM,SANITY 'status succeeds in a read-only repository'
        (exit $status)
 '
 
-(cd sm && echo > bar && git add bar && git commit -q -m 'Add bar' && cd .. && git add sm)
+(cd sm && echo > bar && git add bar && git commit -q -m 'Add bar') && git add sm
 new_head=$(cd sm && git rev-parse --short=7 --verify HEAD)
 touch .gitmodules