git-mr-show: don't add mr and commit hash info to tags

MR hash and commit hash tags are now added in mrlib.load_tags, so
there is no need to add them explicitly.

Signed-off-by: Frantisek Hrbata <frantisek@hrbata.com>

diff --git a/git-mr-show b/git-mr-show
index f3ffc8b6bf1f5e0abd3cff76484b71702c022585..c9769590b6e899f7ffa074f232b089bbe950b050 100755 (executable)
--- a/git-mr-show
+++ b/git-mr-show
@@ -156,16 +156,18 @@ tag_desc = {
         "AT": "MR author date, UNIX timestamp",
         "AI": "MR author date, ISO 8601-like format",
         "AD": "MR author date",
+        "m": "commit MR",
         "h": "commit sha",
-        "an": "author name",
-        "ae": "author email",
-        "at": "author date, UNIX timestamp",
-        "ai": "author date, ISO 8601-like format",
-        "ad": "author date",
+        "s": "commit subject",
+        "an": "commit author name",
+        "ae": "commit author email",
+        "at": "commit author date, UNIX timestamp",
+        "ai": "commit author date, ISO 8601-like format",
+        "ad": "commit author date",
         }
 
 if args.tags:
-    tset = {"M", "h"}
+    tset = dict()
     for commits in tags.values():
         for tags in commits.values():
             for tag in tags:
@@ -182,8 +184,6 @@ for mr, dt in mrs_sorted:
     if not mrtags:
         continue
 
-    mrtags["M"] = {("", mr)}
-
     printt(args.mfmt, mrtags)
 
     if args.commits:
@@ -195,7 +195,5 @@ for mr, dt in mrs_sorted:
             ctags = mrlib.get_commit_tags(tags, mr, commit)
             if not ctags:
                 continue
-            ctags["M"] = {("", mr)}
-            ctags["h"] = {("", commit)}
 
             printt(args.cfmt, ctags)