Commit 27822c7f authored by Vitaly Lipatov's avatar Vitaly Lipatov

show git diff only for interactive session

parent d9a6144c
...@@ -373,7 +373,7 @@ if [ "$VENDOR" = "alt" ] && is_gear $SPECDIR ; then ...@@ -373,7 +373,7 @@ if [ "$VENDOR" = "alt" ] && is_gear $SPECDIR ; then
git merge $CURBRANCH git merge $CURBRANCH
mv -f $BPSPEC $SPEC mv -f $BPSPEC $SPEC
# FIXME: Ctrl-\ and q will cancelled less with return error code # FIXME: Ctrl-\ and q will cancelled less with return error code
if ! ( echo "etersoft-build-utils INFO: Please check diff for backported spec:" ; echo "# etersoft-build-utils NOTE: You can press Ctrl-\ before quit for cancel process."; echo ; git diff $USEBRANCH ) | less; then if tty -s && ! ( echo "etersoft-build-utils INFO: Please check diff for backported spec:" ; echo "# etersoft-build-utils NOTE: You can press Ctrl-\ before quit for cancel process."; echo ; git diff $USEBRANCH ) | less; then
#git checkout $SPEC $MDISTR #git checkout $SPEC $MDISTR
#git checkout $CURBRANCH #git checkout $CURBRANCH
fatal "User cancelled. You are still in $USEBRANCH branch with modified spec" fatal "User cancelled. You are still in $USEBRANCH branch with modified spec"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment