| 1 |
commit: 7ffea4126bfece837ad78ef214d00ddb20a9c8d2 |
| 2 |
Author: Matthew Brewer <tomboy64 <AT> sina <DOT> cn> |
| 3 |
AuthorDate: Sun Jun 5 11:01:19 2016 +0000 |
| 4 |
Commit: M. B. <tomboy64 <AT> sina <DOT> cn> |
| 5 |
CommitDate: Sun Jun 5 11:01:19 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=7ffea412 |
| 7 |
|
| 8 |
update ortrta.sh |
| 9 |
|
| 10 |
tools/ortrta.sh | 7 ++++--- |
| 11 |
1 file changed, 4 insertions(+), 3 deletions(-) |
| 12 |
|
| 13 |
diff --git a/tools/ortrta.sh b/tools/ortrta.sh |
| 14 |
index 0d5d38f..281df2c 100755 |
| 15 |
--- a/tools/ortrta.sh |
| 16 |
+++ b/tools/ortrta.sh |
| 17 |
@@ -9,6 +9,7 @@ errorout() { |
| 18 |
} |
| 19 |
|
| 20 |
repoman_this() { |
| 21 |
+ local gitdir=$(git rev-parse --show-toplevel) |
| 22 |
local ebuilds=( $(git diff --numstat HEAD^ | cut -f3 | grep '\.ebuild') ) |
| 23 |
local dirs=() |
| 24 |
for i in ${ebuilds[@]}; do |
| 25 |
@@ -22,7 +23,7 @@ repoman_this() { |
| 26 |
done |
| 27 |
if [[ ${inIt} -eq 0 ]]; then |
| 28 |
dirs+="${dir}" |
| 29 |
- pushd ${dir} |
| 30 |
+ pushd "${gitdir}/${dir}" |
| 31 |
repoman full |
| 32 |
popd 2>&1 > /dev/null |
| 33 |
fi |
| 34 |
@@ -45,7 +46,7 @@ choose() { |
| 35 |
|
| 36 |
case ${response} in |
| 37 |
d ) |
| 38 |
- git diff --find-renames --find-copies --find-copies-harder --color=always HEAD^ | cat |
| 39 |
+ git diff --find-renames --find-copies --find-copies-harder --color=always HEAD^ |
| 40 |
;; |
| 41 |
e ) |
| 42 |
exit 0 |
| 43 |
@@ -80,7 +81,7 @@ choose() { |
| 44 |
resume() { |
| 45 |
count=$(GIT_EDITOR='cat' git rebase --edit-todo | grep -v '^#' | wc -l) |
| 46 |
while [[ ${count} -ge 0 ]]; do |
| 47 |
- git diff --color --stat HEAD^ | cat |
| 48 |
+ git diff --color --find-renames --find-copies --find-copies-harder --stat HEAD^ | cat |
| 49 |
echo "left: ${count}" |
| 50 |
count=$(( count - 1 )) |
| 51 |
choose |
Archives