diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2007-12-01 23:13:05 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2008-07-19 00:39:23 +0200 |
| commit | a7853548c739a5526a6ae6643ea6479c1d0dfbb8 (patch) | |
| tree | 16563ae9fe916995d017d9fd24ad742b37552cdd | |
| parent | dcb174a351c63441f39669145f2032fec51b7b27 (diff) | |
| download | ndim-git-utils-a7853548c739a5526a6ae6643ea6479c1d0dfbb8.tar.gz ndim-git-utils-a7853548c739a5526a6ae6643ea6479c1d0dfbb8.tar.xz ndim-git-utils-a7853548c739a5526a6ae6643ea6479c1d0dfbb8.zip | |
Checkpoint git-rebase-subtree, add --dry-run
| -rw-r--r-- | git-rebase-subtree/git-rebase-subtree.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-rebase-subtree/git-rebase-subtree.in b/git-rebase-subtree/git-rebase-subtree.in index d16d837..9f7e78a 100644 --- a/git-rebase-subtree/git-rebase-subtree.in +++ b/git-rebase-subtree/git-rebase-subtree.in @@ -37,10 +37,12 @@ require_work_tree # Abort on error set -e +#dry_run=: +dry_run=false cmd() { echo "CMD>" "$@" - "$@" + "$dry_run" || "$@" } @@ -109,6 +111,7 @@ gf_rebase_tree() { git config "$configvar" | while read from to restofline; do if test "x#" = "x$(echo "$from" | sed -n '1s/^\(.\).*/\1/p')"; then continue; fi if test "x$reverse" = "xno" && test "x$from" = "x$oldroot"; then + cmd git-rebase "$newroot" "$oldroot" cmd git-rebase --onto "$newroot" "follow-old/$from" "$to" elif test "x$reverse" = "xyes" && test "x$from" = "x$newroot"; then cmd git-rebase --onto "$newroot" "$oldroot" "$to" |