summaryrefslogtreecommitdiff
path: root/update-ignore.d
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-01-26 15:57:59 -0500
committerJoey Hess <joey@gnu.kitenet.net>2010-01-26 15:57:59 -0500
commitcc7f4348a45a41fa15614d74a690e529d83eb812 (patch)
treeabe0c3281c2338ace34858acecdda69794d6edfd /update-ignore.d
parenta4308790b3b0b6fb407b598c5e8865547f68d7c1 (diff)
Fix handling of "#*#" ignores for git and hg.
Diffstat (limited to 'update-ignore.d')
-rwxr-xr-xupdate-ignore.d/01update-ignore9
1 files changed, 7 insertions, 2 deletions
diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore
index 3d9cd79..cf25ee7 100755
--- a/update-ignore.d/01update-ignore
+++ b/update-ignore.d/01update-ignore
@@ -37,7 +37,12 @@ ignore() {
glob="$1"
case "$VCS" in
- git|bzr)
+ git)
+ # escape "#" in ignores, as otherwise it may
+ # be considered a comment
+ echo "$glob" | sed 's/#/\\#/g' >>"$file"
+ ;;
+ bzr)
echo "$glob" >>"$file"
;;
hg)
@@ -49,7 +54,7 @@ ignore() {
nl
hg_syntax_printed=1
fi
- echo "$glob" >>"$file"
+ echo "$glob" | sed 's/#/\\#/g' >>"$file"
;;
darcs)
# darcs doesn't understand globs, so we need to