From d3f4fcd36fda8cc56b3fa6931935b91a579d4fa0 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 1 Oct 2023 09:54:22 +0000 Subject: lei rediff: `git diff -O' support We can't use the `-O' switch since it conflicts with --only|-O= to specify externals. Thus we'll introduce a more verbose `--order-file=FILE' option when running `git diff'. --- lib/PublicInbox/LeiRediff.pm | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/PublicInbox/LeiRediff.pm') diff --git a/lib/PublicInbox/LeiRediff.pm b/lib/PublicInbox/LeiRediff.pm index efd24d17..6cc6131b 100644 --- a/lib/PublicInbox/LeiRediff.pm +++ b/lib/PublicInbox/LeiRediff.pm @@ -82,6 +82,7 @@ sub _lei_diff_prepare ($$) { push @$cmd, $c ? "-$c" : "--$o"; } } + push(@$cmd, "-O$opt->{'order-file'}") if $opt->{'order-file'}; } sub diff_ctxq ($$) { -- cgit v1.2.3-24-ge0c7