diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rwxr-xr-x | git-applymbox.sh | 2 | ||||
| -rwxr-xr-x | git-quiltimport.sh | 2 | ||||
| -rwxr-xr-x | git-svn.perl | 5 |
4 files changed, 13 insertions, 5 deletions
@@ -141,7 +141,12 @@ prefix = $(HOME) bindir = $(prefix)/bin gitexecdir = $(bindir) template_dir = $(prefix)/share/git-core/templates/ -ETC_GITCONFIG = $(prefix)/etc/gitconfig +ifeq ($(prefix),/usr) +sysconfdir = /etc +else +sysconfdir = $(prefix)/etc +endif +ETC_GITCONFIG = $(sysconfdir)/gitconfig # DESTDIR= # default configuration for gitweb @@ -160,7 +165,7 @@ GITWEB_FAVICON = git-favicon.png GITWEB_SITE_HEADER = GITWEB_SITE_FOOTER = -export prefix bindir gitexecdir template_dir +export prefix bindir gitexecdir template_dir sysconfdir CC = gcc AR = ar diff --git a/git-applymbox.sh b/git-applymbox.sh index 3efd6a7464..c18e80ff8c 100755 --- a/git-applymbox.sh +++ b/git-applymbox.sh @@ -78,7 +78,7 @@ do git-mailinfo $keep_subject $utf8 \ .dotest/msg .dotest/patch <$i >.dotest/info || exit 1 test -s .dotest/patch || { - echo "Patch is empty. Was is split wrong?" + echo "Patch is empty. Was it split wrong?" exit 1 } git-stripspace < .dotest/msg > .dotest/msg-clean diff --git a/git-quiltimport.sh b/git-quiltimport.sh index 018cc75bd0..a7a6757dd8 100755 --- a/git-quiltimport.sh +++ b/git-quiltimport.sh @@ -74,7 +74,7 @@ for patch_name in $(cat "$QUILT_PATCHES/series" | grep -v '^#'); do echo $patch_name (cat $QUILT_PATCHES/$patch_name | git-mailinfo "$tmp_msg" "$tmp_patch" > "$tmp_info") || exit 3 test -s .dotest/patch || { - echo "Patch is empty. Was is split wrong?" + echo "Patch is empty. Was it split wrong?" exit 1 } diff --git a/git-svn.perl b/git-svn.perl index efc4c88a4e..077d6b3a13 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -1866,11 +1866,14 @@ sub make_log_entry { } elsif ($self->use_svnsync_props) { my $full_url = $self->svnsync->{url}; $full_url .= "/$self->{path}" if length $self->{path}; + remove_username($full_url); my $uuid = $self->svnsync->{uuid}; $log_entry{metadata} = "$full_url\@$rev $uuid"; $email ||= "$author\@$uuid" } else { - $log_entry{metadata} = $self->metadata_url. "\@$rev " . + my $url = $self->metadata_url; + remove_username($url); + $log_entry{metadata} = "$url\@$rev " . $self->ra->get_uuid; $email ||= "$author\@" . $self->ra->get_uuid; } |