aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@localhost>2013-02-14 00:00:00 +0000
committerroot <root@localhost>2013-02-14 00:00:00 +0000
commit6f0af6d0fff47d2cb1325191d24f8fc1ed56d464 (patch)
treeb1a33091a71843d737c554a686ca93b90d519f65
parent3a7f96671ef87c2a8d9bf8aadcabf3e4b76a6229 (diff)
downloadgit-remote-gcrypt-6f0af6d0fff47d2cb1325191d24f8fc1ed56d464.zip
git-remote-gcrypt-6f0af6d0fff47d2cb1325191d24f8fc1ed56d464.tar.gz
git-remote-gcrypt-6f0af6d0fff47d2cb1325191d24f8fc1ed56d464.tar.bz2
Simplify informational output to emphasize the new repo URL
-rw-r--r--README.rst5
-rwxr-xr-xgit-remote-gcrypt5
2 files changed, 4 insertions, 6 deletions
diff --git a/README.rst b/README.rst
index d0329ac..8f4078c 100644
--- a/README.rst
+++ b/README.rst
@@ -41,8 +41,7 @@ Quickstart
git remote add cryptremote gcrypt::ssh://example.com:repo
git push cryptremote master
- > gcrypt: Setting up new repository at ssh://example.com:repo
- > gcrypt: Repository ID is KNBr0wKzct52
+ > gcrypt: Setting up new repository
> gcrypt: Repository URL is gcrypt::ssh://example.com:repo#KNBr0wKzct52
> gcrypt: (configuration for cryptremote updated)
> [ more lines .. ]
@@ -51,7 +50,7 @@ Quickstart
* Share the updated Repository URL with all participants.
-(The generated Repository ID is not secret, it only exists to ensure
+(The generated Repository URL is not secret, it only exists to ensure
that two repositories signed by the same user can not be maliciously
switched around. It incidentally allows multiple repositories to all
share location.)
diff --git a/git-remote-gcrypt b/git-remote-gcrypt
index 0333983..61f8921 100755
--- a/git-remote-gcrypt
+++ b/git-remote-gcrypt
@@ -276,7 +276,7 @@ safe_git_rev_parse()
make_new_repo()
{
local urlid_= fix_config=
- echo_info "Setting up new repository at $URL"
+ echo_info "Setting up new repository"
PUTREPO "$URL"
# We need a relatively short ID for URL+REPO
@@ -285,7 +285,6 @@ make_new_repo()
# For now, we arbitrarily use 9 random bytes (72 bits)
urlid_=$(genkey 9 | tr '/+' 'Zz')
Repoid=$(xecho_n "$urlid_" | pack_hash)
- echo_info "Repository ID is" "$urlid_"
iseq "${NAME#gcrypt::}" "$URL" || {
git config "remote.$NAME.url" "gcrypt::$URL#$urlid_"
fix_config=1
@@ -515,7 +514,7 @@ EOF
fi
# Generate manifest
- echo_info "Encrypting manifest to \"$Recipients\""
+ echo_info "Participants are: $Signers"
echo_info "Requesting manifest signature"
TmpManifest_Enc="$Localdir/manifest.$$"