Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Junio C Hamano committed Nov 4, 2007
2 parents 2e7a978 + ee78740 commit 2515f93
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Documentation/RelNotes-1.5.3.5.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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".
Expand Down
6 changes: 3 additions & 3 deletions builtin-blame.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions git-cvsimport.perl
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 2515f93

Please sign in to comment.