jigen/git-remote-gcrypt
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Simplify informational output to emphasize the new repo URL

Browse source
This commit is contained in:
root 2013-02-14 00:00:00 +00:00
parent 3a7f96671e
commit 6f0af6d0ff
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
README.rst
View file

@ -41,8 +41,7 @@ Quickstart
git remote add cryptremote gcrypt::ssh://example.com:repo git remote add cryptremote gcrypt::ssh://example.com:repo
git push cryptremote master git push cryptremote master
> gcrypt: Setting up new repository at ssh://example.com:repo > gcrypt: Setting up new repository
> gcrypt: Repository ID is KNBr0wKzct52
> gcrypt: Repository URL is gcrypt::ssh://example.com:repo#KNBr0wKzct52 > gcrypt: Repository URL is gcrypt::ssh://example.com:repo#KNBr0wKzct52
> gcrypt: (configuration for cryptremote updated) > gcrypt: (configuration for cryptremote updated)
> [ more lines .. ] > [ more lines .. ]
@ -51,7 +50,7 @@ Quickstart
* Share the updated Repository URL with all participants. * 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 that two repositories signed by the same user can not be maliciously
switched around. It incidentally allows multiple repositories to all switched around. It incidentally allows multiple repositories to all
share location.) share location.)

5
git-remote-gcrypt
View file

@ -276,7 +276,7 @@ safe_git_rev_parse()
make_new_repo() make_new_repo()
{ {
local urlid_= fix_config= local urlid_= fix_config=
echo_info "Setting up new repository at $URL" echo_info "Setting up new repository"
PUTREPO "$URL" PUTREPO "$URL"
# We need a relatively short ID for URL+REPO # 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) # For now, we arbitrarily use 9 random bytes (72 bits)
urlid_=$(genkey 9 | tr '/+' 'Zz') urlid_=$(genkey 9 | tr '/+' 'Zz')
Repoid=$(xecho_n "$urlid_" | pack_hash) Repoid=$(xecho_n "$urlid_" | pack_hash)
echo_info "Repository ID is" "$urlid_"
iseq "${NAME#gcrypt::}" "$URL" || { iseq "${NAME#gcrypt::}" "$URL" || {
git config "remote.$NAME.url" "gcrypt::$URL#$urlid_" git config "remote.$NAME.url" "gcrypt::$URL#$urlid_"
fix_config=1 fix_config=1
@ -515,7 +514,7 @@ EOF
fi fi
# Generate manifest # Generate manifest
echo_info "Encrypting manifest to \"$Recipients\"" echo_info "Participants are: $Signers"
echo_info "Requesting manifest signature" echo_info "Requesting manifest signature"
TmpManifest_Enc="$Localdir/manifest.$$" TmpManifest_Enc="$Localdir/manifest.$$"