From b7222ed26e50fdd5b02d0d02bad9e1b3518d4251 Mon Sep 17 00:00:00 2001 From: Tj Holowaychuk Date: Fri, 20 May 2011 07:37:04 -0700 Subject: [PATCH] revert git-ignore but retain argc == 0 as showing .gitignore contents --- bin/git-ignore | 27 ++------------------------- etc/gitignore | 1 - 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 160000 etc/gitignore diff --git a/bin/git-ignore b/bin/git-ignore index c3ab6a4..84166f5 100755 --- a/bin/git-ignore +++ b/bin/git-ignore @@ -1,33 +1,10 @@ #!/bin/sh -template="" -while getopts "t:" opt; do - case "$opt" in - t) template=$OPTARG;shift;shift;; - esac -done - -if [ ! -z "$template" ]; then - gitignoredir="`dirname $0`/../etc/gitignore" - available_templates() { - find $gitignoredir -type f -name *.gitignore | xargs -i basename {} .gitignore | sort - } - selected_template() { - available_templates | grep $template - } - count=$(selected_template | wc -w) - case "$count" in - 0) echo "The pattern '$template' does not match any available templates." && available_templates | less && exit 1;; - 1) find $gitignoredir -name $(selected_template).gitignore -exec cat {} \; >> .gitignore && echo "... added patterns from template '$(selected_template)'";; - *) echo "Be more specific. $count matches found:" && selected_template | grep --color $template && exit 2;; - esac -fi - if test $# -eq 0; then - test -z $template && test -f .gitignore && cat .gitignore + test -f .gitignore && cat .gitignore else for pattern in $@; do + echo "... adding '$pattern' to .gitignore" echo $pattern >> .gitignore - echo "... added '$pattern'" done fi diff --git a/etc/gitignore b/etc/gitignore deleted file mode 160000 index acbcdb0..0000000 --- a/etc/gitignore +++ /dev/null @@ -1 +0,0 @@ -Subproject commit acbcdb02e5e608cfd1c9a93eba67c6a73d632870