git-svn: always use --first-parent

This makes git-svn unconditionally invoke git-log with --first-parent when
it is trying to discover its upstream subversion branch and collecting the
commit ids which should be pushed to it with dcommit. The reason for always
using --first-parent is to make git-svn behave in a predictable way when the
ancestry chain contains merges with other git-svn branches.

Since git-svn now always uses 'git-log --first-parent' there is no longer
any need for the --first-parent option to git-svn, so this is removed.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 42d7b82a3791421324be301689ecb108edd72b64..be2e34eb8f63e265d7fa185d78743b6289ad74ab 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -317,16 +317,6 @@ This is only used with the 'dcommit' command.
 Print out the series of git arguments that would show
 which diffs would be committed to SVN.
 
 Print out the series of git arguments that would show
 which diffs would be committed to SVN.
 

---first-parent::
-
-This is only used with the 'dcommit', 'rebase', 'log', 'find-rev' and
-'show-ignore' commands.
-
-These commands tries to detect the upstream subversion branch by means of
-the embedded 'git-svn-id' line in commit messages. When --first-parent is
-specified, git-svn only follows the first parent of each commit, effectively
-ignoring commits brought into the current branch through merge-operations.
-

 --
 
 ADVANCED OPTIONS
 --
 
 ADVANCED OPTIONS

diff --git a/git-svn.perl b/git-svn.perl
index d21eb7fa9e32b1b41943b5bc24e84928c41edf96..badcd33c2cd48c29f4a6662508953f732f9aaba0 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -59,7 +59,7 @@ BEGIN
        $_template, $_shared,
        $_version, $_fetch_all, $_no_rebase,
        $_merge, $_strategy, $_dry_run, $_local,
        $_template, $_shared,
        $_version, $_fetch_all, $_no_rebase,
        $_merge, $_strategy, $_dry_run, $_local,

-       $_prefix, $_no_checkout, $_verbose, $_first_parent);
+       $_prefix, $_no_checkout, $_verbose);

 $Git::SVN::_follow_parent = 1;
 my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
                     'config-dir=s' => \$Git::SVN::Ra::config_dir,
 $Git::SVN::_follow_parent = 1;
 my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
                     'config-dir=s' => \$Git::SVN::Ra::config_dir,


@@ -119,14 +119,12 @@ BEGIN
                          'dry-run|n' => \$_dry_run,
                          'fetch-all|all' => \$_fetch_all,
                          'no-rebase' => \$_no_rebase,
                          'dry-run|n' => \$_dry_run,
                          'fetch-all|all' => \$_fetch_all,
                          'no-rebase' => \$_no_rebase,

-                         'first-parent' => \$_first_parent,

                        %cmt_opts, %fc_opts } ],
        'set-tree' => [ \&cmd_set_tree,
                        "Set an SVN repository to a git tree-ish",
                        { 'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ],
        'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",
                        %cmt_opts, %fc_opts } ],
        'set-tree' => [ \&cmd_set_tree,
                        "Set an SVN repository to a git tree-ish",
                        { 'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ],
        'show-ignore' => [ \&cmd_show_ignore, "Show svn:ignore listings",

-                       { 'revision|r=i' => \$_revision,
-                         'first-parent' => \$_first_parent
+                       { 'revision|r=i' => \$_revision

                        } ],
        'multi-fetch' => [ \&cmd_multi_fetch,
                           "Deprecated alias for $0 fetch --all",
                        } ],
        'multi-fetch' => [ \&cmd_multi_fetch,
                           "Deprecated alias for $0 fetch --all",


@@ -147,20 +145,16 @@ BEGIN
                          'non-recursive' => \$Git::SVN::Log::non_recursive,
                          'authors-file|A=s' => \$_authors,
                          'color' => \$Git::SVN::Log::color,
                          'non-recursive' => \$Git::SVN::Log::non_recursive,
                          'authors-file|A=s' => \$_authors,
                          'color' => \$Git::SVN::Log::color,

-                         'pager=s' => \$Git::SVN::Log::pager,
-                         'first-parent' => \$_first_parent
+                         'pager=s' => \$Git::SVN::Log::pager

                        } ],
        'find-rev' => [ \&cmd_find_rev, "Translate between SVN revision numbers and tree-ish",
                        } ],
        'find-rev' => [ \&cmd_find_rev, "Translate between SVN revision numbers and tree-ish",

-                       {
-                         'first-parent' => \$_first_parent
-                       } ],
+                       {} ],

        'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory",
                        { 'merge|m|M' => \$_merge,
                          'verbose|v' => \$_verbose,
                          'strategy|s=s' => \$_strategy,
                          'local|l' => \$_local,
                          'fetch-all|all' => \$_fetch_all,
        'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory",
                        { 'merge|m|M' => \$_merge,
                          'verbose|v' => \$_verbose,
                          'strategy|s=s' => \$_strategy,
                          'local|l' => \$_local,
                          'fetch-all|all' => \$_fetch_all,

-                         'first-parent' => \$_first_parent,

                          %fc_opts } ],
        'commit-diff' => [ \&cmd_commit_diff,
                           'Commit a diff between two trees',
                          %fc_opts } ],
        'commit-diff' => [ \&cmd_commit_diff,
                           'Commit a diff between two trees',


@@ -818,8 +812,7 @@ sub cmt_metadata {
 
 sub working_head_info {
        my ($head, $refs) = @_;
 
 sub working_head_info {
        my ($head, $refs) = @_;

-       my @args = ('log', '--no-color');
-       push @args, '--first-parent' if $_first_parent;
+       my @args = ('log', '--no-color', '--first-parent');

        my ($fh, $ctx) = command_output_pipe(@args, $head);
        my $hash;
        my %max;
        my ($fh, $ctx) = command_output_pipe(@args, $head);
        my $hash;
        my %max;