Two gitweb bugs related to javascript-actions

2014-07-22 Thread Robert Luberda
Hi Some time ago I reported the two following bugs to Debian BTS, could you please look at them? 1. http://bugs.debian.org/741883 -- gitweb blame does not work correctly when $feature{'javascript-actions'} is enabled This should be one-line change fix, which I really would like to be applied t

BUG: git filter-branch does not make tree replacements permanent

2013-04-11 Thread Robert Luberda
Hi, The git filter-branch man page states: NOTE: This command honors .git/info/grafts and .git/refs/replace/. If you have any grafts or replacement refs defined, running this command will make them permanent. However the command does not seem to honor tree (or blob) objects

Re: [PATCH/RFC] git svn: don't introduce new paragraph for git-svn-id

2012-08-24 Thread Robert Luberda
Junio C Hamano wrote: > Eric Wong writes: >> >> I think having "svn" in "svn.trimsvnlog" twice is redundant and not ideal. >> Perhaps just --trim-log and svn.trimlog? > > Do we ever want to trim "our" log when relaying the Git commits back > to subversion? Having "svn" in "trimsvnlog" makes it c

Re: [PATCH/RFC] git svn: optionally trim imported log messages

2012-08-24 Thread Robert Luberda
Junio C Hamano writes: Hi, Junio, for some reason I don't get mails from you, I've just discovered your e-mails on gmane news list. Anyway many thanks for your comments, I'll fix them and send updated patch next week. >> +When committing to svn from git (as part of 'commit-diff', 'set-tree' >>

Re: [PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-24 Thread Robert Luberda
Eric Wong wrote: Hi, > > Oops, I'll push the following out since Junio already merged your > original: I can see that you haven't pushed the change yet. Maybe it would be a good idea to fix other style mistakes (extra spaces after redirections, lack of spaces after function names, `[' used ins

[PATCH] t9164: More style fixes

2012-08-30 Thread Robert Luberda
Make sure t9164 conforms with the coding guidelines: - remove spaces after redirection operators; - insert spaces between function names and parentheses; - split `if ...; then' lines; - use `test' instead of `['. Signed-off-by: Robert Luberda --- t/t9164-git-svn-dcommit-concu

[PATCH/RFC] git svn: don't introduce new paragraph for git-svn-id

2012-08-01 Thread Robert Luberda
iff --git a/t/t9163-git-svn-import-messages.sh b/t/t9163-git-svn-import-messages.sh new file mode 100755 index 000..46b7c5b --- /dev/null +++ b/t/t9163-git-svn-import-messages.sh @@ -0,0 +1,174 @@ +#!/bin/sh +# +# Copyright (c) 2012 Robert Luberda +# + +test_description='git svn check log m

[PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-01 Thread Robert Luberda
working_head_info('HEAD', \@refs); @@ -1019,6 +1050,7 @@ sub cmd_dcommit { } $parents = \%p; $linear_refs = \@l; + undef $last_rev; }

Re: [PATCH/RFC] git svn: don't introduce new paragraph for git-svn-id

2012-08-01 Thread Robert Luberda
Eric Wong wrote: Hi, > > I've long wanted to change this, but it breaks compatibility if folks > are importing from the same repo, sharing changes and one upgrades > git-svn. Yes, I'm aware of this. That's why in our team at work everybody is forced to use the modified version of git-svn:) [ A

Re: [PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-07 Thread Robert Luberda
Eric Wong wrote: Hi, > > A few minor comments inline... > Please ensure all error messages and code are readable in > 80-column terminals. > Also, keep opening "{" on the same line as the if/unless. > Backticks don't nest properly, nowadays, we prefer: > N=$(expr $N + 1) >> +cp

[PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-07 Thread Robert Luberda
ead_info('HEAD', \@refs); @@ -1019,6 +1054,7 @@ sub cmd_dcommit { } $parents = \%p; $linear_refs = \@l; + undef $last_rev; }

Re: [PATCH/RFC] git svn: don't introduce new paragraph for git-svn-id

2012-08-19 Thread Robert Luberda
Eric Wong wrote: Hi, >> I don't think it will be hard to make it configurable. I can try to make >> such a change, do you have any preferences about the option and >> configuration key names? > > No preference off the top of my head. As long as it makes sense to > enough people here and is consi

Re: [PATCH/RFC] git svn: handle errors and concurrent commits in dcommit

2012-08-19 Thread Robert Luberda
Eric Wong wrote: Hi, > Junio C Hamano wrote: >> I should have asked this yesterday, but do you mean you want to have >> your "maint" in the upcoming 1.7.12? This does look like a useful >> thing to do, but does not seem like a regression fix to me. > > Yeah, I wasn't sure what to name it since

[PATCH/RFC] git svn: optionally trim imported log messages

2012-08-19 Thread Robert Luberda
g} .= "\n"; my $author = $log_entry{author} = check_author($log_entry{author}); my ($name, $email) = defined $::users{$author} ? @{$::users{$author}} diff --git a/t/t9165-git-svn-import-messages.sh b/t/t9165-git-svn-import-messages.sh new file mode 100755 index 000..1