]> git.donarmstrong.com Git - debbugs.git/commitdiff
handle hash options to merge status
authorDon Armstrong <don@donarmstrong.com>
Mon, 19 Mar 2012 17:44:24 +0000 (10:44 -0700)
committerDon Armstrong <don@donarmstrong.com>
Mon, 19 Mar 2012 17:44:24 +0000 (10:44 -0700)
Debbugs/Control.pm

index 78efdf12e512f0c940222508c5163e0990fe8370..c5d73d17b3da4b7f81e8fa7879ce978d7de098a2 100644 (file)
@@ -2402,7 +2402,7 @@ sub __calculate_merge_changes{
                 (exists $force_functions{$field}{modify_value} ?
                  $force_functions{$field}{modify_value}->($merge_status->{$field}):
                  $merge_status->{$field}),
-                value    => $merge_status->{$field},
+                value    => ref($merge_status->{$field}) eq 'HASH'?[sort keys %{$merge_status->{$field}}]:$merge_status->{$field},
                 function => $force_functions{$field}{func},
                 key      => $force_functions{$field}{key},
                 options  => $force_functions{$field}{options},