Browse Source

Fixed `sde ci` to pass a clean diff to the awk script which tries to generate a log message

misl/sde-wrapper
Alejandro Mery 17 years ago
parent
commit
51d3779582
1 changed files with 6 additions and 7 deletions
  1. +6
    -7
      bin/sde-commit

+ 6
- 7
bin/sde-commit

@ -122,6 +122,12 @@ if [ ".git" ]; then
# git status # git status
git-diff-index -M --color --cached --stat=80,65 HEAD > $tmpfile.status git-diff-index -M --color --cached --stat=80,65 HEAD > $tmpfile.status
git-diff-index -M --color --cached -p HEAD | sed -e "s,^\(.\[1m\|\)\(---\|\+\+\+\) [ab]/,\1\2 $root/," > $tmpfile.diff git-diff-index -M --color --cached -p HEAD | sed -e "s,^\(.\[1m\|\)\(---\|\+\+\+\) [ab]/,\1\2 $root/," > $tmpfile.diff
if [ -z "$logfile" ]; then
logfile=$tmpfile.log
git-diff-index -M --cached -p HEAD | sed -e "s,^\(---\|\+\+\+\) [ab]/,\1 $root/," |
awk -f $SDEROOT/lib/sde-commit/commit-message.awk > $logfile
fi
else else
echo_abort "$root: unknown version control system." echo_abort "$root: unknown version control system."
fi fi
@ -129,13 +135,6 @@ fi
echo_msg "Changes:" echo_msg "Changes:"
cat $tmpfile.diff cat $tmpfile.diff
if [ -z "$logfile" ]; then
logfile=$tmpfile.log
# the grep -v === is a hack - somehow the svn === lines confuse awk ... ?!?
grep -v === $tmpfile.diff |
awk -f $SDEROOT/lib/sde-commit/commit-message.awk > $logfile
fi
echo_msg "Status:" echo_msg "Status:"
cat $tmpfile.status cat $tmpfile.status

Loading…
Cancel
Save