[sysadmin-bin: 63/168] Improve messages related to importing
- From: Andrea Veri <av src gnome org>
- To: gnome-sysadmin gnome org,commits-list gnome org
- Subject: [sysadmin-bin: 63/168] Improve messages related to importing
- Date: Thu, 24 May 2012 19:56:44 +0000 (UTC)
commit 53f8df49b2fce55425eb4183a8b539a72b933d59
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Thu Mar 19 19:58:33 2009 -0400
Improve messages related to importing
Add separators around messages to distinguish them from normal git spew
Mention --exec=import
create-repository | 2 +-
gnome-pre-receive | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/create-repository b/create-repository
index 2479cbd..d453973 100755
--- a/create-repository
+++ b/create-repository
@@ -49,7 +49,7 @@ fi
cat <<EOF
You can now import an existing Git repository using:
- git push ssh://$user git gnome org/git/$name refs/heads/* refs/tags/*
+ git push --exec=import ssh://$user git gnome org/git/$name refs/heads/* refs/tags/*
When you are finished importing and everything looks good, run:
diff --git a/gnome-pre-receive b/gnome-pre-receive
index 1d03d18..319b940 100755
--- a/gnome-pre-receive
+++ b/gnome-pre-receive
@@ -24,21 +24,26 @@ projectshort=$(basename ${absdir%.git})
# state.
if [ -e "$GIT_DIR/pending" -a -z "$GNOME_GIT_IMPORT" ] ; then
cat <<EOF 1>&2
+---
$projectshort is still in the process of being imported. To import
into $projectshort use 'git push --exec=import'. If you are done
importing, do:
- ssh USERNAME git gnome org finish-import $projectshort
+ ssh $USER git gnome org finish-import $projectshort
+
+---
EOF
exit 1
fi
if [ \! -e "$GIT_DIR/pending" -a -n "$GNOME_GIT_IMPORT" ] ; then
cat <<EOF 1>&2
+---
$projectshort is no longer in the process of being imported. You
can push to $projectshort normally. If you accidentally ran
finish-import too early, please contact gitmaster gnome org
for assistance.
+----
EOF
exit 1
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]