From 5f0bc1c7cf242a1f8f2dcb3a9ae4587c4e430ea9 Mon Sep 17 00:00:00 2001 From: Tom Ice Date: Fri, 24 May 2019 23:35:11 -0400 Subject: [PATCH] Removed GPG info from JSON and updated README pics * The GPG settings don't play well with OS X if you don't have certain tools installed, so they were removed from the git log format settings for the JSON output. * Pictures have been updated to reflect the new menu option. --- README.md | 8 ++++---- git-quick-stats | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index d517614..4e76af1 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ > Any git repository contains tons of information about commits, contributors, and files. Extracting this information is not always trivial, mostly because of a gadzillion options to a gadzillion git commands – I don’t think there is a single person alive who knows them all. Probably not even [Linus Torvalds](https://github.com/torvalds) himself :). -![mainMenuScreenshot](https://user-images.githubusercontent.com/8818630/57629726-4704f080-756a-11e9-89cc-f8bdeea3c982.png) +![mainMenuScreenshot](https://user-images.githubusercontent.com/8818630/58364013-61e53800-7e7b-11e9-87f9-790d6744fbd5.png) ## Table of Contents @@ -35,9 +35,9 @@ ## Screenshots -![commitsByWeekdayScreenshot](https://user-images.githubusercontent.com/8818630/57629719-42d8d300-756a-11e9-8031-8132e14aa10f.png) +![commitsByWeekdayScreenshot](https://user-images.githubusercontent.com/8818630/58364011-61e53800-7e7b-11e9-9417-16cbb241ac2e.png) -![commitsByHourScreenshot](https://user-images.githubusercontent.com/8818630/57629717-40767900-756a-11e9-97d4-301ffe7535c7.png) +![commitsByHourScreenshot](https://user-images.githubusercontent.com/8818630/58364010-61e53800-7e7b-11e9-8711-a40b50aebf52.png) ## Usage @@ -124,7 +124,7 @@ You can change to the legacy color scheme by toggling the variable `_MENU_THEME` ```bash export _MENU_THEME=legacy ``` -![legacyThemeScreenshot](https://user-images.githubusercontent.com/8818630/57629724-453b2d00-756a-11e9-9ffc-6a7f53c5fc49.png) +![legacyThemeScreenshot](https://user-images.githubusercontent.com/8818630/58364012-61e53800-7e7b-11e9-910a-aaff836260eb.png) ## Installation diff --git a/git-quick-stats b/git-quick-stats index 15a2119..ea35b7f 100755 --- a/git-quick-stats +++ b/git-quick-stats @@ -319,7 +319,7 @@ function suggestReviewers() { function jsonOutput() { optionPicked "Output log saved to file at: ${json_path:?}/output.json" git -c log.showSignature=false log --use-mailmap --no-merges $_since $_until \ - --pretty=format:'{%n "commit": "%H",%n "abbreviated_commit": "%h",%n "tree": "%T",%n "abbreviated_tree": "%t",%n "parent": "%P",%n "abbreviated_parent": "%p",%n "refs": "%D",%n "encoding": "%e",%n "subject": "%s",%n "sanitized_subject_line": "%f",%n "body": "%b",%n "commit_notes": "%N",%n "verification_flag": "%G?",%n "signer": "%GS",%n "signer_key": "%GK",%n "author": {%n "name": "%aN",%n "email": "%aE",%n "date": "%aD"%n },%n "commiter": {%n "name": "%cN",%n "email": "%cE",%n "date": "%cD"%n }%n},' \ + --pretty=format:'{%n "commit": "%H",%n "abbreviated_commit": "%h",%n "tree": "%T",%n "abbreviated_tree": "%t",%n "parent": "%P",%n "abbreviated_parent": "%p",%n "refs": "%D",%n "encoding": "%e",%n "subject": "%s",%n "sanitized_subject_line": "%f",%n "body": "%b",%n "commit_notes": "%N",%n "author": {%n "name": "%aN",%n "email": "%aE",%n "date": "%aD"%n },%n "commiter": {%n "name": "%cN",%n "email": "%cE",%n "date": "%cD"%n }%n},' \ | sed "$ s/,$//" \ | sed ':a;N;$!ba;s/\r\n\([^{]\)/\\n\1/g' \ | awk 'BEGIN { print("[") } { print($0) } END { print("]") }' \