Revision b91a13bbdca0095b1dc9ffb06bcb5caf4aab56b6 authored by Junio C Hamano on 12 March 2012, 22:43:06 UTC, committed by Junio C Hamano on 12 March 2012, 22:43:15 UTC
The code to synthesize the fake ancestor tree used by 3-way merge fallback in "git am" was not prepared to read a patch created with a non-standard -p<num> value. * jc/am-3-nonstandard-popt: test: "am -3" can accept non-standard -p<num> am -3: allow nonstandard -p<num> option
check-builtins.sh
#!/bin/sh
{
cat <<\EOF
sayIt:
$(foreach b,$(BUILT_INS),echo XXX $b YYY;)
EOF
cat Makefile
} |
make -f - sayIt 2>/dev/null |
sed -n -e 's/.*XXX \(.*\) YYY.*/\1/p' |
sort |
{
bad=0
while read builtin
do
base=`expr "$builtin" : 'git-\(.*\)'`
x=`sed -ne 's/.*{ "'$base'", \(cmd_[^, ]*\).*/'$base' \1/p' git.c`
if test -z "$x"
then
echo "$base is builtin but not listed in git.c command list"
bad=1
fi
for sfx in sh perl py
do
if test -f "$builtin.$sfx"
then
echo "$base is builtin but $builtin.$sfx still exists"
bad=1
fi
done
done
exit $bad
}
Computing file changes ...
