Merge branch 'maint'

* maint:
RelNotes-1.5.3.5: fix typo
Delay pager setup in git blame
git-cvsimport: really convert underscores in branch names to dots with -u

diff --git a/Documentation/RelNotes-1.5.3.5.txt b/Documentation/RelNotes-1.5.3.5.txt
index 4e46d2c2a27cecee0d87461ad08b31cea5dfec2e..f99a2cd65003c06ef5da26a4508b4ce74d6b267f 100644 (file)
--- a/Documentation/RelNotes-1.5.3.5.txt
+++ b/Documentation/RelNotes-1.5.3.5.txt
@@ -63,8 +63,8 @@ Fixes since v1.5.3.4
 
  * Git segfaulted when reading an invalid .gitattributes file.  Fixed.
 
- * post-receive-email example hook fixed was fixed for
-   non-fast-forward updates.
+ * post-receive-email example hook was fixed for non-fast-forward
+   updates.
 
  * Documentation updates for supported (but previously undocumented)
    options of "git-archive" and "git-reflog".

diff --git a/builtin-blame.c b/builtin-blame.c
index 8432b823e6ef6020a897838e7a561c3919c31f0b..aedc294eac276af8d1a3e8c39bf93fa8fda93f94 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -2215,9 +2215,6 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
                        argv[unk++] = arg;
        }
 
-       if (!incremental)
-               setup_pager();
-
        if (!blame_move_score)
                blame_move_score = BLAME_DEFAULT_MOVE_SCORE;
        if (!blame_copy_score)
@@ -2411,6 +2408,9 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 
        read_mailmap(&mailmap, ".mailmap", NULL);
 
+       if (!incremental)
+               setup_pager();
+
        assign_blame(&sb, &revs, opt);
 
        if (incremental)

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 2954fb846e3372a648124d92b7c1a1ccbd44306f..e4bc2b54f68930df217751975e32b4224f8d765c 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -818,6 +818,7 @@ sub commit {
                $state = 4;
        } elsif ($state == 4 and s/^Branch:\s+//) {
                s/\s+$//;
+               tr/_/\./ if ( $opt_u );
                s/[\/]/$opt_s/g;
                $branch = $_;
                $state = 5;