undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano 2007-11-03 23:50:54 -07:00
commit 2515f935b9
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/RelNotes-1.5.3.5.txt
View File

@ -63,8 +63,8 @@ Fixes since v1.5.3.4
* Git segfaulted when reading an invalid .gitattributes file. Fixed. * Git segfaulted when reading an invalid .gitattributes file. Fixed.
* post-receive-email example hook fixed was fixed for * post-receive-email example hook was fixed for non-fast-forward
non-fast-forward updates. updates.
* Documentation updates for supported (but previously undocumented) * Documentation updates for supported (but previously undocumented)
options of "git-archive" and "git-reflog". options of "git-archive" and "git-reflog".

6
builtin-blame.c
View File

@ -2215,9 +2215,6 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
argv[unk++] = arg; argv[unk++] = arg;
} }
if (!incremental)
setup_pager();
if (!blame_move_score) if (!blame_move_score)
blame_move_score = BLAME_DEFAULT_MOVE_SCORE; blame_move_score = BLAME_DEFAULT_MOVE_SCORE;
if (!blame_copy_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); read_mailmap(&mailmap, ".mailmap", NULL);
if (!incremental)
setup_pager();
assign_blame(&sb, &revs, opt); assign_blame(&sb, &revs, opt);
if (incremental) if (incremental)

1
git-cvsimport.perl
View File

@ -818,6 +818,7 @@ while (<CVS>) {
$state = 4; $state = 4;
} elsif ($state == 4 and s/^Branch:\s+//) { } elsif ($state == 4 and s/^Branch:\s+//) {
s/\s+$//; s/\s+$//;
tr/_/\./ if ( $opt_u );
s/[\/]/$opt_s/g; s/[\/]/$opt_s/g;
$branch = $_; $branch = $_;
$state = 5; $state = 5;