{"thread":{"id":"2438","subject":"[PATCH] cg-log: add --no-merges option to be passed to git-rev-list","startedAt":"2005-11-10T20:46:30Z","lastAt":"2005-11-10T21:03:10Z","messageCount":2,"participants":["Frank Sorenson"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"11517","messageId":"4373B1A6.8000706@tuxrocks.com","threadId":"2438","inReplyTo":null,"subject":"[PATCH] cg-log: add --no-merges option to be passed to git-rev-list","fromName":"Frank Sorenson","fromEmail":"frank@tuxrocks.com","sentAt":"2005-11-10T20:46:30Z","receivedAt":"2005-11-10T20:46:30Z","isPatch":true,"sender":{"key":"frank@tuxrocks.com","avatar":null},"body":"-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA1\n\nThis patch allows cg-log to ignore merges.\n\nSigned-off-by: Frank Sorenson <frank@tuxrocks.com>\n\n cg-log |   10 ++++++++--\n 1 files changed, 8 insertions(+), 2 deletions(-)\n\ndiff --git a/cg-log b/cg-log\nindex 7d955e3..2cebf04 100755\n- --- a/cg-log\n+++ b/cg-log\n@@ -58,6 +58,9 @@\n #\tby their author. This is also known as a \"shortlog\", suitable\n #\te.g. for contribution summaries of announcements.\n #\n+# --no-merges::\n+#\tDon't display merges in the log.\n+#\n # -uUSERNAME::\n #\tList only commits where author or committer contains 'USERNAME'.\n #\tThe search for 'USERNAME' is case-insensitive.\n@@ -255,6 +258,7 @@ user=\n mergebase=\n date_from=\n date_to=\n+no_merges=\n\n while optparse; do\n \tif optparse -c; then\n@@ -300,6 +304,8 @@ while optparse; do\n \t\tsummary=1\n \telif optparse --summary; then\n \t\tshortlog=1\n+\telif optparse --no-merges; then\n+\t\tno_merges=\"--no-merges\"\n \telse\n \t\toptfail\n \tfi\n@@ -315,9 +321,9 @@ if [ \"$mergebase\" ]; then\n fi\n\n if [ \"$shortlog\" ]; then\n- -\trevls=\"git-rev-list --pretty=short $date_from $date_to\"\n+\trevls=\"git-rev-list --pretty=short $no_merges $date_from $date_to\"\n else\n- -\trevls=\"git-rev-list --pretty=raw $date_from $date_to\"\n+\trevls=\"git-rev-list --pretty=raw $no_merges $date_from $date_to\"\n fi\n revls=\"$revls $date_from $date_to\"\n\n\nFrank\n- --\nFrank Sorenson - KD7TZK\nSystems Manager, Computer Science Department\nBrigham Young University\nfrank@tuxrocks.com\n-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1.2.7 (GNU/Linux)\nComment: Using GnuPG with Fedora - http://enigmail.mozdev.org\n\niD8DBQFDc7GmaI0dwg4A47wRAosOAJ4k7ObTH9dc0me1SEGZFib0KsceqQCdHxX8\nw7WXZzCR5dLKgyA0LV49YFU=\n=6kA3\n-----END PGP SIGNATURE-----\n"},{"id":"11518","messageId":"4373B58E.6030606@tuxrocks.com","threadId":"2438","inReplyTo":"4373B1A6.8000706@tuxrocks.com","subject":"[PATCH] cg-log: ignore merges by default, and add --show-merges option","fromName":"Frank Sorenson","fromEmail":"frank@tuxrocks.com","sentAt":"2005-11-10T21:03:10Z","receivedAt":"2005-11-10T21:03:10Z","isPatch":true,"sender":{"key":"frank@tuxrocks.com","avatar":null},"body":"-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA1\n\nThis patch allows cg-log to ignore merges by default,but will display\nthem if requested (with \"--show-merges\").\n\nSigned-off-by: Frank Sorenson <frank@tuxrocks.com>\n\n cg-log |   10 ++++++++--\n 1 files changed, 8 insertions(+), 2 deletions(-)\n\ndiff --git a/cg-log b/cg-log\nindex 7d955e3..ed2278e 100755\n- --- a/cg-log\n+++ b/cg-log\n@@ -58,6 +58,9 @@\n #\tby their author. This is also known as a \"shortlog\", suitable\n #\te.g. for contribution summaries of announcements.\n #\n+# --show-merges::\n+#\tDisplay merges in the log as well (ignored by default).\n+#\n # -uUSERNAME::\n #\tList only commits where author or committer contains 'USERNAME'.\n #\tThe search for 'USERNAME' is case-insensitive.\n@@ -255,6 +258,7 @@ user=\n mergebase=\n date_from=\n date_to=\n+no_merges=\"--no-merges\"\n\n while optparse; do\n \tif optparse -c; then\n@@ -300,6 +304,8 @@ while optparse; do\n \t\tsummary=1\n \telif optparse --summary; then\n \t\tshortlog=1\n+\telif optparse --show-merges; then\n+\t\tno_merges=\"\"\n \telse\n \t\toptfail\n \tfi\n@@ -315,9 +321,9 @@ if [ \"$mergebase\" ]; then\n fi\n\n if [ \"$shortlog\" ]; then\n- -\trevls=\"git-rev-list --pretty=short $date_from $date_to\"\n+\trevls=\"git-rev-list --pretty=short $no_merges $date_from $date_to\"\n else\n- -\trevls=\"git-rev-list --pretty=raw $date_from $date_to\"\n+\trevls=\"git-rev-list --pretty=raw $no_merges $date_from $date_to\"\n fi\n revls=\"$revls $date_from $date_to\"\n\n\n\nFrank\n- --\nFrank Sorenson - KD7TZK\nSystems Manager, Computer Science Department\nBrigham Young University\nfrank@tuxrocks.com\n-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1.2.7 (GNU/Linux)\nComment: Using GnuPG with Fedora - http://enigmail.mozdev.org\n\niD8DBQFDc7WOaI0dwg4A47wRAsPuAJ0W0s82jfxu+c/oHRPULaa5l9ITagCdEkhz\nNZAE2w8SnNbHl3/8MDtFT3w=\n=4cRS\n-----END PGP SIGNATURE-----\n"}]}