chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4128d1a
)
git-debrebase: wip cmd_record_ffq_prev
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 15 Feb 2018 15:36:00 +0000
(15:36 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 18 Feb 2018 12:04:43 +0000
(12:04 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 2f34029a996e3cbeff566806e93789832a67489a..6f89fc26a988edc24e101aa7c583c4b14de300ca 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-1101,6
+1101,17
@@
END
# now it's for the user to sort out
}
+sub cmd_record_ffq_prev () {
+ badusage "no arguments allowed" if @ARGV;
+ my ($status, $msg) = record_ffq_prev();
+ if ($status eq 'exists' && $opt_noop_ok) {
+ print "Previous head already recorded\n" or die $!;
+ } elsif ($status eq 'written') {
+ } else {
+ fail "Could not preserve: $msg";
+ }
+}
+
sub cmd_gbp2debrebase () {
badusage "needs 1 optional argument, the upstream" unless @ARGV<=1;
my ($upstream_spec) = @ARGV;