summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2012-07-03 11:57:15 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2012-07-07 11:15:01 (GMT)
commit6de70d7fbf21db32ddad571a3104b89d38d98bb6 (patch)
tree79931987a19ee06528e515da458fd8a90b4993bc
parentccc0a3a9faf4a9cf6fd4952a1ef5590df2542e0e (diff)
downloadffmpeg-6de70d7fbf21db32ddad571a3104b89d38d98bb6.zip
ffmpeg-6de70d7fbf21db32ddad571a3104b89d38d98bb6.tar.gz
ffmpeg-6de70d7fbf21db32ddad571a3104b89d38d98bb6.tar.bz2
tools/bisect: rename temporary file and add it to git ignore
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rw-r--r--.gitignore1
-rwxr-xr-xtools/bisect6
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index ac5b7cc..77c9859 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@
/tests/vsynth1/
/tools/aviocat
/tools/ffbisect
+/tools/bisect.need
/tools/cws2fws
/tools/ffeval
/tools/graph2dot
diff --git a/tools/bisect b/tools/bisect
index f840243..f03e47c 100755
--- a/tools/bisect
+++ b/tools/bisect
@@ -23,12 +23,12 @@ case "$1" in
need)
case $2 in
ffmpeg|ffplay|ffprobe|ffserver)
- echo $2.c >> need
+ echo $2.c >> tools/bisect.need
;;
esac
;;
start|reset)
- echo . > need
+ echo . > tools/bisect.need
git bisect $*
;;
skip)
@@ -37,7 +37,7 @@ case "$1" in
good|bad)
git bisect $*
- until ls `cat need` > /dev/null 2> /dev/null; do
+ until ls `cat tools/bisect.need` > /dev/null 2> /dev/null; do
git bisect skip || break
done
;;