chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: Do not misrecognise some initial packaging as gdr-processable
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index 79c832188c7abfefd43f0b93d1f7dbb1565956ae..829ab82ce6e44941e0be6ddb83ff7922bf3b573e 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-47,7
+47,7
@@
usages:
git-debrebase [<options>] prepush [--prose=...]
git-debrebase [<options>] quick|conclude
git-debrebase [<options>] new-upstream <new-version> [<details ...>]
git-debrebase [<options>] prepush [--prose=...]
git-debrebase [<options>] quick|conclude
git-debrebase [<options>] new-upstream <new-version> [<details ...>]
- git-debrebase [<options>] convert-from-
gbp [<upstream-commitish>]
+ git-debrebase [<options>] convert-from-
* ...
...
See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).
END
...
See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).
END
@@
-2537,6
+2537,7
@@
sub complete_convert_from ($$$$) {
update_head_checkout $old_head, $new_head, $mrest;
}
update_head_checkout $old_head, $new_head, $mrest;
}
+sub cmd_convert_from_unapplied () { cmd_convert_from_gbp(); }
sub cmd_convert_from_gbp () {
badusage __ "want only 1 optional argument, the upstream git commitish"
unless @ARGV<=1;
sub cmd_convert_from_gbp () {
badusage __ "want only 1 optional argument, the upstream git commitish"
unless @ARGV<=1;
@@
-3031,8
+3032,7
@@
getoptions_main
initdebug('git-debrebase ');
enabledebug if $debuglevel;
initdebug('git-debrebase ');
enabledebug if $debuglevel;
-my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel);
-chdir $toplevel or fail f_ "chdir toplevel %s: %s\n", $toplevel, $!;
+changedir_git_toplevel();
$rd = fresh_playground "$playprefix/misc";
$rd = fresh_playground "$playprefix/misc";