Introduce option guilt.diffstat so that we don't have to type "guilt refresh --diffstat" in its full form every time. Signed-off-by: Wu Fengguang <fengguang.wu@xxxxxxxxx> --- Jeff: This patch is against the latest guilt v0.32-rc1. Documentation/guilt-refresh.txt | 10 ++++++++-- guilt | 9 ++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) --- guilt.orig/guilt +++ guilt/guilt @@ -646,7 +646,7 @@ __refresh_patch() [ ! -z "$4" ] && diffopts="-C -M --find-copies-harder" - if [ ! -z "$5" ]; then + if [ -n "$5" -o $diffstat = "true" ]; then ( echo "---" git diff --stat $diffopts "$2" @@ -737,10 +737,17 @@ guilt_hook() # used for: git apply -C <val> guilt_push_diff_context=1 +# default diffstat value: true or false +DIFFSTAT_DEFAULT="false" + # # Parse any part of .git/config that belongs to us # +# generate diffstat? +diffstat=`git config --bool guilt.diffstat` +[ -z "$diffstat" ] && diffstat=$DIFFSTAT_DEFAULT + # # The following gets run every time this file is source'd # --- guilt.orig/Documentation/guilt-refresh.txt +++ guilt/Documentation/guilt-refresh.txt @@ -20,8 +20,14 @@ OPTIONS format (e.g., rename and copy detection). --diffstat:: - Include a diffstat output in the patch file. Useful for cases where - patches will be submitted with other tools. +Include a diffstat output in the patch file. Useful for cases where +patches will be submitted with other tools. ++ +If the command line option is omitted, the corresponding git-config +option "guilt.diffstat" will be queried. So this would enable diffstat +output by default: + + git config --global guilt.diffstat true Author ------ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
