From 4c038db693068f0582a2ceb937d0e312da4f2e63 Mon Sep 17 00:00:00 2001 From: Jason Woofenden Date: Tue, 14 Oct 2014 18:47:56 -0400 Subject: [PATCH] .git-ftp-ignore: support / prefix --- git-ftp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-ftp b/git-ftp index bc01b670..3a3dddc0 100755 --- a/git-ftp +++ b/git-ftp @@ -556,7 +556,7 @@ set_changed_files() { # Filter against ignore file if [ -f '.git-ftp-ignore' ]; then - grep -v '^#.*$\|^\s*$' '.git-ftp-ignore' | tr -d '\r' > '.git-ftp-ignore-tmp' + grep -v '^#.*$\|^\s*$' '.git-ftp-ignore' | tr -d '\r' | sed -e 's|^\([^/].*\)|^..\\(.*/\\)\\?\1$|; s|^/|^..|' > '.git-ftp-ignore-tmp' FILES_CHANGED=$(grep --invert-match -f '.git-ftp-ignore-tmp' '.git-ftp-tmp' | tr '\t' ' ') else FILES_CHANGED=$(cat '.git-ftp-tmp' | tr '\t' ' ')