Re: git-merge-changelog: mention --split-merged-entry in the header comment.

[Bruno Haible]

Hi Ralf,

> I only now became aware of the --split-merged-entry option which
> git-merge-changelog provides, because I never bothered to look at --help
> output

Whereas I was aware of the option, but thought I would never need it,
and was then surprised to have conflicts in ChangeLog at each step while
rebasing a series of 30 patches.

I think this indicates that the option should be on by default. I'm applying
the patch below.

> +     Be sure to use an absolute path, otherwise the driver will not be found.

I think this is pretty clear from the instructions above.

> Also, I noticed that this file is copyrighted by you, not to the FSF
> Oversight?

Some day, I intend to put this into a better place than gnulib, or have it
distributed as a contrib in git. Don't know. - Since git is GPLv2 and the FSF
does not like GPLv2, it's easier to not involve the FSF at this point.

Bruno


2010-05-23  Bruno Haible  <br...@clisp.org>

        git-merge-changelog: Enable --split-merged-entry by default.
        * lib/git-merge-changelog.c (main): Set split_merged_entry to true.
        (usage): Don't mention this option any more.
        Reported by Ralf Wildenhues.

--- lib/git-merge-changelog.c.orig      Sun May 23 18:02:02 2010
+++ lib/git-merge-changelog.c   Sun May 23 17:58:06 2010
@@ -1,5 +1,5 @@
 /* git-merge-changelog - git "merge" driver for GNU style ChangeLog files.
-   Copyright (C) 2008-2009 Bruno Haible <br...@clisp.org>
+   Copyright (C) 2008-2010 Bruno Haible <br...@clisp.org>
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -947,6 +947,7 @@
       printf ("B-FILE-NAME names the user-modified file.\n");
       printf ("Writes the merged file into A-FILE-NAME.\n");
       printf ("\n");
+      #if 0 /* --split-merged-entry is now on by default.  */
       printf ("Operation modifiers:\n");
       printf ("\
       --split-merged-entry    Possibly split a merged entry between 
paragraphs.\n\
@@ -955,6 +956,7 @@
                               newline, just because they happened on the 
same\n\
                               date.\n");
       printf ("\n");
+      #endif
       printf ("Informative output:\n");
       printf ("  -h, --help                  display this help and exit\n");
       printf ("  -V, --version               output version information and 
exit\n");
@@ -980,7 +982,7 @@
   /* Set default values for variables.  */
   do_help = false;
   do_version = false;
-  split_merged_entry = false;
+  split_merged_entry = true;
 
   /* Parse command line options.  */
   while ((optchar = getopt_long (argc, argv, "hV", long_options, NULL)) != EOF)
@@ -995,7 +997,6 @@
       do_version = true;
       break;
     case CHAR_MAX + 1:  /* --split-merged-entry */
-      split_merged_entry = true;
       break;
     default:
       usage (EXIT_FAILURE);