git-debrebase: fix cfg in scalar context (!)

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 3d837272ac1b4f2e4a3aab9cdaa0a19fc0de765a..403fba1ba6bc458099849df521b7d6ebff88e660 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -111,7 +111,8 @@ sub cfg ($;$) {
        fail "missing required git config $k" unless $optional;
        return ();
     }
-    return split /\0/, $out;
+    my @l = split /\0/, $out;
+    return wantarray ? @l : $l[0];
 }
 
 memoize('cfg');
@@ -461,7 +462,8 @@ sub classify ($) {
        } elsif ($order < 0) {
            @bytime = reverse @bytime;
        } else {
-           return $unknown->('merge of two identical same-age parents');
+           # same age, default to order made by -s ours
+           # that is, commit was made by someone who preferred L
        }
        return $classify->(qw(Pseudomerge),
                           SubType => qw(Ambiguous),