[gentoo-commits] repo/user/tbc:master commit in: tools/

["M. B." <tomboy64@sina.cn>]

commit:     7ffea4126bfece837ad78ef214d00ddb20a9c8d2
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Sun Jun  5 11:01:19 2016 +0000
Commit:     M. B. <tomboy64 <AT> sina <DOT> cn>
CommitDate: Sun Jun  5 11:01:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=7ffea412

update ortrta.sh

 tools/ortrta.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/ortrta.sh b/tools/ortrta.sh
index 0d5d38f..281df2c 100755
--- a/tools/ortrta.sh
+++ b/tools/ortrta.sh
@@ -9,6 +9,7 @@ errorout() {
 }
 
 repoman_this() {
+	local gitdir=$(git rev-parse --show-toplevel)
 	local ebuilds=( $(git diff --numstat HEAD^ | cut -f3 | grep '\.ebuild') )
 	local dirs=()
 	for i in ${ebuilds[@]}; do
@@ -22,7 +23,7 @@ repoman_this() {
 		done
 		if [[ ${inIt} -eq 0 ]]; then
 			dirs+="${dir}"
-			pushd ${dir}
+			pushd "${gitdir}/${dir}"
 			repoman full
 			popd 2>&1 > /dev/null
 		fi
@@ -45,7 +46,7 @@ choose() {
 		
 		case ${response} in
 			d )
-				git diff --find-renames --find-copies --find-copies-harder --color=always HEAD^ | cat
+				git diff --find-renames --find-copies --find-copies-harder --color=always HEAD^
 				;;
 			e )
 				exit 0
@@ -80,7 +81,7 @@ choose() {
 resume() {
 	count=$(GIT_EDITOR='cat' git rebase --edit-todo | grep -v '^#' | wc -l)
 	while [[ ${count} -ge 0 ]]; do
-		git diff --color --stat HEAD^ | cat
+		git diff --color --find-renames --find-copies --find-copies-harder --stat HEAD^ | cat
 		echo "left: ${count}"
 		count=$(( count - 1 ))
 		choose