[PATCH v3 0/3] diff: Add diff.orderfile configuration variable
- From
Samuel Bronson <naesten@gmail.com>
- Date
- Dec 14, 2013, 22:18 UTC
- Message-ID
- <1387059521-23616-1-git-send-email-naesten@gmail.com>
- In-Reply-To
- <CADsOX3DBmNituJsiYEBRENQeosASXtV_hd0zUW13cBoDZWHRhg@mail.gmail.com>
The original purpose of this patch [series] was to allow specifying the "-O" option for "git diff" in the config, but I need help with the relative path handling [RFC 3].
It also added tests for "git diff -O", which I have split out because they are independantly useful [PATCH 1].
I also noticed that -O had terrible error handling and could only read mmappable files, so I fixed that [PATCH 2].
Samuel Bronson (3):
diff: Tests for "git diff -O"
diff: Let "git diff -O" read orderfile from any file, failing when
appropriate
diff: Add diff.orderfile configuration variableDocumentation/diff-config.txt | 5 ++ Documentation/diff-options.txt | 3 ++ diff.c | 5 ++ diffcore-order.c | 23 ++++----- t/t4056-diff-order.sh | 105 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 126 insertions(+), 15 deletions(-) create mode 100755 t/t4056-diff-order.sh
-- 1.8.4.3