aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-03 23:50:54 -0700
committerJunio C Hamano <gitster@pobox.com>2007-11-03 23:50:54 -0700
commit2515f935b9c1a0afa1b555f173a37d6ad7878fff (patch)
tree98d3b3bd6c8ba32c6508cc3bfc0b43cb68da9cd4
parent2e7a9785c27f00a8f7a06edc1d4c9b2f3fa2eeb9 (diff)
parentee787400de25ed419f40e70698ba35db475b2d61 (diff)
downloadgit-2515f935b9c1a0afa1b555f173a37d6ad7878fff.tar.gz
git-2515f935b9c1a0afa1b555f173a37d6ad7878fff.tar.xz
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
-rw-r--r--Documentation/RelNotes-1.5.3.5.txt4
-rw-r--r--builtin-blame.c6
-rwxr-xr-xgit-cvsimport.perl1
3 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/RelNotes-1.5.3.5.txt b/Documentation/RelNotes-1.5.3.5.txt
index 4e46d2c2a..f99a2cd65 100644
--- 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 8432b823e..aedc294ea 100644
--- 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 2954fb846..e4bc2b54f 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -818,6 +818,7 @@ while (<CVS>) {
$state = 4;
} elsif ($state == 4 and s/^Branch:\s+//) {
s/\s+$//;
+ tr/_/\./ if ( $opt_u );
s/[\/]/$opt_s/g;
$branch = $_;
$state = 5;