{"thread":{"id":"1451","subject":"[PATCH] add *--no-merges* flag to suppress display of merge commits","startedAt":"2005-08-08T09:37:21Z","lastAt":"2005-08-08T09:37:21Z","messageCount":1,"participants":["Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"6931","messageId":"Pine.LNX.4.63.0508081136210.31438@wgmdd8.biozentrum.uni-wuerzburg.de","threadId":"1451","inReplyTo":null,"subject":"[PATCH] add *--no-merges* flag to suppress display of merge commits","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-08-08T09:37:21Z","receivedAt":"2005-08-08T09:37:21Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"As requested by Junio (who suggested --single-parents-only, but this\ncould forget a no-parent root).\n\nAlso, adds a few missing options to the usage string.\n\nSigned-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n\n---\n\n rev-list.c |   12 +++++++++++-\n 1 files changed, 11 insertions(+), 1 deletions(-)\n\n4c24c4de403dcb658622590f6f6ef35232bbe709\ndiff --git a/rev-list.c b/rev-list.c\n--- a/rev-list.c\n+++ b/rev-list.c\n@@ -15,12 +15,15 @@ static const char rev_list_usage[] =\n \t\t      \"  --max-count=nr\\n\"\n \t\t      \"  --max-age=epoch\\n\"\n \t\t      \"  --min-age=epoch\\n\"\n+\t\t      \"  --parents\\n\"\n \t\t      \"  --bisect\\n\"\n \t\t      \"  --objects\\n\"\n \t\t      \"  --unpacked\\n\"\n \t\t      \"  --header\\n\"\n \t\t      \"  --pretty\\n\"\n-\t\t      \"  --merge-order [ --show-breaks ]\";\n+\t\t      \"  --no-merges\\n\"\n+\t\t      \"  --merge-order [ --show-breaks ]\\n\"\n+\t\t      \"  --topo-order\";\n \n static int unpacked = 0;\n static int bisect_list = 0;\n@@ -39,6 +42,7 @@ static int merge_order = 0;\n static int show_breaks = 0;\n static int stop_traversal = 0;\n static int topo_order = 0;\n+static int no_merges = 0;\n \n static void show_commit(struct commit *commit)\n {\n@@ -82,6 +86,8 @@ static int filter_commit(struct commit *\n \t}\n \tif (max_count != -1 && !max_count--)\n \t\treturn STOP;\n+\tif (no_merges && (commit->parents && commit->parents->next))\n+\t\treturn CONTINUE;\n \treturn DO;\n }\n \n@@ -498,6 +504,10 @@ int main(int argc, char **argv)\n \t\t\tverbose_header = 1;\n \t\t\thdr_termination = '\\n';\n \t\t\tprefix = \"commit \";\n+\t\t\tcontinue;\n+\t\t}\n+\t\tif (!strncmp(arg, \"--no-merges\", 11)) {\n+\t\t\tno_merges = 1;\n \t\t\tcontinue;\n \t\t}\n \t\tif (!strcmp(arg, \"--parents\")) {\n"}]}