Merge branch 'maint'

* maint:
Remove usernames from all commit messages, not just when using svmprops
applymbox & quiltimport: typofix.
Create a sysconfdir variable, and use it for ETC_GITCONFIG

diff --git a/Makefile b/Makefile
index 65bd2dbf9d8089ba8c7bf20479605ef3b02b6a49..60c41fd0d830f3c2b9e37d80800a9e7e6b3e7445 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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 3efd6a746407bdc38ba9d251332427c508e5ee40..c18e80ff8cd5a66a64e22cf96e77fad519d33b5d 100755 (executable)
--- 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 018cc75bd032fd337b559c14b85f51f0418447ff..a7a6757dd8a3e0ff2635537a83591169c259986f 100755 (executable)
--- 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 efc4c88a4ea158bd630a6f53a8346e344b360ed6..077d6b3a134fcb6c8f74f1473cbb9d36bdb7c6f9 100755 (executable)
--- 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;
        }