Merge branch 'js/log-abbrev-commit-config'

diff --git a/revision.c b/revision.c
index 7934b2f68bbaf9327ff3957aaa3eb316c2a7fb05..7588a60b8e8ff55e81f29ff09bcde1750f8d0852 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1428,6 +1428,9 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
                        revs->abbrev = 40;
        } else if (!strcmp(arg, "--abbrev-commit")) {
                revs->abbrev_commit = 1;
+               revs->abbrev_commit_given = 1;
+       } else if (!strcmp(arg, "--no-abbrev-commit")) {
+               revs->abbrev_commit = 0;
        } else if (!strcmp(arg, "--full-diff")) {
                revs->diff = 1;
                revs->full_diff = 1;