зеркало из https://github.com/microsoft/git.git
git-bisect: war on "sed"
We do not need to pipe "echo" to "sed" only to strip refs/heads/ from the beginning. We are assuming not-so-ancient shells these days. Also there is no need to avoid assuming \012 is the LF; we do not run on EBCDIC, sorry. Other parts of the script already uses tr to convert separator to LF that way. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
947a604b01
Коммит
e23cb8c0cc
|
@ -71,7 +71,7 @@ bisect_start() {
|
||||||
;;
|
;;
|
||||||
refs/heads/*)
|
refs/heads/*)
|
||||||
[ -s "$GIT_DIR/head-name" ] && die "won't bisect on seeked tree"
|
[ -s "$GIT_DIR/head-name" ] && die "won't bisect on seeked tree"
|
||||||
echo "$head" | sed 's#^refs/heads/##' >"$GIT_DIR/head-name"
|
echo "${head#refs/heads/}" >"$GIT_DIR/head-name"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
die "Bad HEAD - strange symbolic ref"
|
die "Bad HEAD - strange symbolic ref"
|
||||||
|
@ -275,8 +275,7 @@ exit_if_skipped_commits () {
|
||||||
if expr "$_tried" : ".*[|].*" > /dev/null ; then
|
if expr "$_tried" : ".*[|].*" > /dev/null ; then
|
||||||
echo "There are only 'skip'ped commit left to test."
|
echo "There are only 'skip'ped commit left to test."
|
||||||
echo "The first bad commit could be any of:"
|
echo "The first bad commit could be any of:"
|
||||||
echo "$_tried" | sed -e 's/[|]/\
|
echo "$_tried" | tr '[|]' '[\012]'
|
||||||
/g'
|
|
||||||
echo "We cannot bisect more!"
|
echo "We cannot bisect more!"
|
||||||
exit 2
|
exit 2
|
||||||
fi
|
fi
|
||||||
|
|
Загрузка…
Ссылка в новой задаче