summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-17 11:46:35 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 16:03:11 +0100
commitca03bca3d0443c539de63050693de56c9b2e0c03 (patch)
tree26deffec380a9616885b1806de733cd380a6ec29 /git-debrebase
parent3d90aa0ebc9d1a48dc7300572fbd58311e0d0ef1 (diff)
git-debrebase: classify: provide Why for Unknown
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase7
1 files changed, 5 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase
index 5adbb8f..3273726 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -317,7 +317,6 @@ sub any_fproblems () {
# Upstream
# AddPatches
# Mixed
-# Unknown
#
# Pseudomerge
# has additional entres in classification result
@@ -331,6 +330,10 @@ sub any_fproblems () {
# BreakwaterUpstreamMerge
# has additional entry in classification result
# OrigParents = [ subset of Parents ] # singleton list
+#
+# Unknown
+# has additional entry in classification result
+# Why => "prose"
sub parsecommit ($;$) {
my ($objid, $p_ref) = @_;
@@ -389,7 +392,7 @@ sub classify ($) {
};
my $unknown = sub {
my ($why) = @_;
- $r = { %$r, Type => qw(Unknown) };
+ $r = { %$r, Type => qw(Unknown), Why => $why };
printdebug " ** Unknown\n";
return $r;
};