mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'sp/maint-push-sideband' into sp/push-sideband
* sp/maint-push-sideband: receive-pack: Send internal errors over side-band #2 t5401: Use a bare repository for the remote peer Conflicts: builtin-receive-pack.c t/t5401-update-hooks.sh
This commit is contained in:
Junio C Hamano
commit
cc8eb6407e
|
|
@ -139,6 +139,42 @@ static struct command *commands;
|
|||
static const char pre_receive_hook[] = "hooks/pre-receive";
|
||||
static const char post_receive_hook[] = "hooks/post-receive";
|
||||
|
||||
static void rp_error(const char *err, ...) __attribute__((format (printf, 1, 2)));
|
||||
static void rp_warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
|
||||
|
||||
static void report_message(const char *prefix, const char *err, va_list params)
|
||||
{
|
||||
int sz = strlen(prefix);
|
||||
char msg[4096];
|
||||
|
||||
strncpy(msg, prefix, sz);
|
||||
sz += vsnprintf(msg + sz, sizeof(msg) - sz, err, params);
|
||||
if (sz > (sizeof(msg) - 1))
|
||||
sz = sizeof(msg) - 1;
|
||||
msg[sz++] = '\n';
|
||||
|
||||
if (use_sideband)
|
||||
send_sideband(1, 2, msg, sz, use_sideband);
|
||||
else
|
||||
xwrite(2, msg, sz);
|
||||
}
|
||||
|
||||
static void rp_warning(const char *err, ...)
|
||||
{
|
||||
va_list params;
|
||||
va_start(params, err);
|
||||
report_message("warning: ", err, params);
|
||||
va_end(params);
|
||||
}
|
||||
|
||||
static void rp_error(const char *err, ...)
|
||||
{
|
||||
va_list params;
|
||||
va_start(params, err);
|
||||
report_message("error: ", err, params);
|
||||
va_end(params);
|
||||
}
|
||||
|
||||
static int copy_to_sideband(int in, int out, void *arg)
|
||||
{
|
||||
char data[128];
|
||||
|
|
@ -270,7 +306,7 @@ static void refuse_unconfigured_deny(void)
|
|||
{
|
||||
int i;
|
||||
for (i = 0; i < ARRAY_SIZE(refuse_unconfigured_deny_msg); i++)
|
||||
error("%s", refuse_unconfigured_deny_msg[i]);
|
||||
rp_error("%s", refuse_unconfigured_deny_msg[i]);
|
||||
}
|
||||
|
||||
static char *refuse_unconfigured_deny_delete_current_msg[] = {
|
||||
|
|
@ -290,7 +326,7 @@ static void refuse_unconfigured_deny_delete_current(void)
|
|||
for (i = 0;
|
||||
i < ARRAY_SIZE(refuse_unconfigured_deny_delete_current_msg);
|
||||
i++)
|
||||
error("%s", refuse_unconfigured_deny_delete_current_msg[i]);
|
||||
rp_error("%s", refuse_unconfigured_deny_delete_current_msg[i]);
|
||||
}
|
||||
|
||||
static const char *update(struct command *cmd)
|
||||
|
|
@ -302,7 +338,7 @@ static const char *update(struct command *cmd)
|
|||
|
||||
/* only refs/... are allowed */
|
||||
if (prefixcmp(name, "refs/") || check_ref_format(name + 5)) {
|
||||
error("refusing to create funny ref '%s' remotely", name);
|
||||
rp_error("refusing to create funny ref '%s' remotely", name);
|
||||
return "funny refname";
|
||||
}
|
||||
|
||||
|
|
@ -311,11 +347,11 @@ static const char *update(struct command *cmd)
|
|||
case DENY_IGNORE:
|
||||
break;
|
||||
case DENY_WARN:
|
||||
warning("updating the current branch");
|
||||
rp_warning("updating the current branch");
|
||||
break;
|
||||
case DENY_REFUSE:
|
||||
case DENY_UNCONFIGURED:
|
||||
error("refusing to update checked out branch: %s", name);
|
||||
rp_error("refusing to update checked out branch: %s", name);
|
||||
if (deny_current_branch == DENY_UNCONFIGURED)
|
||||
refuse_unconfigured_deny();
|
||||
return "branch is currently checked out";
|
||||
|
|
@ -330,7 +366,7 @@ static const char *update(struct command *cmd)
|
|||
|
||||
if (!is_null_sha1(old_sha1) && is_null_sha1(new_sha1)) {
|
||||
if (deny_deletes && !prefixcmp(name, "refs/heads/")) {
|
||||
error("denying ref deletion for %s", name);
|
||||
rp_error("denying ref deletion for %s", name);
|
||||
return "deletion prohibited";
|
||||
}
|
||||
|
||||
|
|
@ -339,13 +375,13 @@ static const char *update(struct command *cmd)
|
|||
case DENY_IGNORE:
|
||||
break;
|
||||
case DENY_WARN:
|
||||
warning("deleting the current branch");
|
||||
rp_warning("deleting the current branch");
|
||||
break;
|
||||
case DENY_REFUSE:
|
||||
case DENY_UNCONFIGURED:
|
||||
if (deny_delete_current == DENY_UNCONFIGURED)
|
||||
refuse_unconfigured_deny_delete_current();
|
||||
error("refusing to delete the current branch: %s", name);
|
||||
rp_error("refusing to delete the current branch: %s", name);
|
||||
return "deletion of the current branch prohibited";
|
||||
}
|
||||
}
|
||||
|
|
@ -375,23 +411,23 @@ static const char *update(struct command *cmd)
|
|||
break;
|
||||
free_commit_list(bases);
|
||||
if (!ent) {
|
||||
error("denying non-fast-forward %s"
|
||||
" (you should pull first)", name);
|
||||
rp_error("denying non-fast-forward %s"
|
||||
" (you should pull first)", name);
|
||||
return "non-fast-forward";
|
||||
}
|
||||
}
|
||||
if (run_update_hook(cmd)) {
|
||||
error("hook declined to update %s", name);
|
||||
rp_error("hook declined to update %s", name);
|
||||
return "hook declined";
|
||||
}
|
||||
|
||||
if (is_null_sha1(new_sha1)) {
|
||||
if (!parse_object(old_sha1)) {
|
||||
warning ("Allowing deletion of corrupt ref.");
|
||||
rp_warning("Allowing deletion of corrupt ref.");
|
||||
old_sha1 = NULL;
|
||||
}
|
||||
if (delete_ref(name, old_sha1, 0)) {
|
||||
error("failed to delete %s", name);
|
||||
rp_error("failed to delete %s", name);
|
||||
return "failed to delete";
|
||||
}
|
||||
return NULL; /* good */
|
||||
|
|
@ -399,7 +435,7 @@ static const char *update(struct command *cmd)
|
|||
else {
|
||||
lock = lock_any_ref_for_update(name, old_sha1, 0);
|
||||
if (!lock) {
|
||||
error("failed to lock %s", name);
|
||||
rp_error("failed to lock %s", name);
|
||||
return "failed to lock";
|
||||
}
|
||||
if (write_ref_sha1(lock, new_sha1, "push")) {
|
||||
|
|
|
|||
|
|
@ -17,23 +17,22 @@ test_expect_success setup '
|
|||
commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
|
||||
git update-ref refs/heads/master $commit0 &&
|
||||
git update-ref refs/heads/tofail $commit1 &&
|
||||
git clone ./. victim &&
|
||||
GIT_DIR=victim/.git git config receive.denyCurrentBranch warn &&
|
||||
GIT_DIR=victim/.git git update-ref refs/heads/tofail $commit1 &&
|
||||
git clone --bare ./. victim.git &&
|
||||
GIT_DIR=victim.git git update-ref refs/heads/tofail $commit1 &&
|
||||
git update-ref refs/heads/master $commit1 &&
|
||||
git update-ref refs/heads/tofail $commit0
|
||||
'
|
||||
|
||||
cat >victim/.git/hooks/pre-receive <<'EOF'
|
||||
cat >victim.git/hooks/pre-receive <<'EOF'
|
||||
#!/bin/sh
|
||||
printf %s "$@" >>$GIT_DIR/pre-receive.args
|
||||
cat - >$GIT_DIR/pre-receive.stdin
|
||||
echo STDOUT pre-receive
|
||||
echo STDERR pre-receive >&2
|
||||
EOF
|
||||
chmod u+x victim/.git/hooks/pre-receive
|
||||
chmod u+x victim.git/hooks/pre-receive
|
||||
|
||||
cat >victim/.git/hooks/update <<'EOF'
|
||||
cat >victim.git/hooks/update <<'EOF'
|
||||
#!/bin/sh
|
||||
echo "$@" >>$GIT_DIR/update.args
|
||||
read x; printf %s "$x" >$GIT_DIR/update.stdin
|
||||
|
|
@ -41,77 +40,77 @@ echo STDOUT update $1
|
|||
echo STDERR update $1 >&2
|
||||
test "$1" = refs/heads/master || exit
|
||||
EOF
|
||||
chmod u+x victim/.git/hooks/update
|
||||
chmod u+x victim.git/hooks/update
|
||||
|
||||
cat >victim/.git/hooks/post-receive <<'EOF'
|
||||
cat >victim.git/hooks/post-receive <<'EOF'
|
||||
#!/bin/sh
|
||||
printf %s "$@" >>$GIT_DIR/post-receive.args
|
||||
cat - >$GIT_DIR/post-receive.stdin
|
||||
echo STDOUT post-receive
|
||||
echo STDERR post-receive >&2
|
||||
EOF
|
||||
chmod u+x victim/.git/hooks/post-receive
|
||||
chmod u+x victim.git/hooks/post-receive
|
||||
|
||||
cat >victim/.git/hooks/post-update <<'EOF'
|
||||
cat >victim.git/hooks/post-update <<'EOF'
|
||||
#!/bin/sh
|
||||
echo "$@" >>$GIT_DIR/post-update.args
|
||||
read x; printf %s "$x" >$GIT_DIR/post-update.stdin
|
||||
echo STDOUT post-update
|
||||
echo STDERR post-update >&2
|
||||
EOF
|
||||
chmod u+x victim/.git/hooks/post-update
|
||||
chmod u+x victim.git/hooks/post-update
|
||||
|
||||
test_expect_success push '
|
||||
test_must_fail git send-pack --force ./victim/.git \
|
||||
test_must_fail git send-pack --force ./victim.git \
|
||||
master tofail >send.out 2>send.err
|
||||
'
|
||||
|
||||
test_expect_success 'updated as expected' '
|
||||
test $(GIT_DIR=victim/.git git rev-parse master) = $commit1 &&
|
||||
test $(GIT_DIR=victim/.git git rev-parse tofail) = $commit1
|
||||
test $(GIT_DIR=victim.git git rev-parse master) = $commit1 &&
|
||||
test $(GIT_DIR=victim.git git rev-parse tofail) = $commit1
|
||||
'
|
||||
|
||||
test_expect_success 'hooks ran' '
|
||||
test -f victim/.git/pre-receive.args &&
|
||||
test -f victim/.git/pre-receive.stdin &&
|
||||
test -f victim/.git/update.args &&
|
||||
test -f victim/.git/update.stdin &&
|
||||
test -f victim/.git/post-receive.args &&
|
||||
test -f victim/.git/post-receive.stdin &&
|
||||
test -f victim/.git/post-update.args &&
|
||||
test -f victim/.git/post-update.stdin
|
||||
test -f victim.git/pre-receive.args &&
|
||||
test -f victim.git/pre-receive.stdin &&
|
||||
test -f victim.git/update.args &&
|
||||
test -f victim.git/update.stdin &&
|
||||
test -f victim.git/post-receive.args &&
|
||||
test -f victim.git/post-receive.stdin &&
|
||||
test -f victim.git/post-update.args &&
|
||||
test -f victim.git/post-update.stdin
|
||||
'
|
||||
|
||||
test_expect_success 'pre-receive hook input' '
|
||||
(echo $commit0 $commit1 refs/heads/master;
|
||||
echo $commit1 $commit0 refs/heads/tofail
|
||||
) | test_cmp - victim/.git/pre-receive.stdin
|
||||
) | test_cmp - victim.git/pre-receive.stdin
|
||||
'
|
||||
|
||||
test_expect_success 'update hook arguments' '
|
||||
(echo refs/heads/master $commit0 $commit1;
|
||||
echo refs/heads/tofail $commit1 $commit0
|
||||
) | test_cmp - victim/.git/update.args
|
||||
) | test_cmp - victim.git/update.args
|
||||
'
|
||||
|
||||
test_expect_success 'post-receive hook input' '
|
||||
echo $commit0 $commit1 refs/heads/master |
|
||||
test_cmp - victim/.git/post-receive.stdin
|
||||
test_cmp - victim.git/post-receive.stdin
|
||||
'
|
||||
|
||||
test_expect_success 'post-update hook arguments' '
|
||||
echo refs/heads/master |
|
||||
test_cmp - victim/.git/post-update.args
|
||||
test_cmp - victim.git/post-update.args
|
||||
'
|
||||
|
||||
test_expect_success 'all hook stdin is /dev/null' '
|
||||
! test -s victim/.git/update.stdin &&
|
||||
! test -s victim/.git/post-update.stdin
|
||||
! test -s victim.git/update.stdin &&
|
||||
! test -s victim.git/post-update.stdin
|
||||
'
|
||||
|
||||
test_expect_success 'all *-receive hook args are empty' '
|
||||
! test -s victim/.git/pre-receive.args &&
|
||||
! test -s victim/.git/post-receive.args
|
||||
! test -s victim.git/pre-receive.args &&
|
||||
! test -s victim.git/post-receive.args
|
||||
'
|
||||
|
||||
test_expect_success 'send-pack produced no output' '
|
||||
|
|
@ -125,6 +124,7 @@ remote: STDOUT update refs/heads/master
|
|||
remote: STDERR update refs/heads/master
|
||||
remote: STDOUT update refs/heads/tofail
|
||||
remote: STDERR update refs/heads/tofail
|
||||
remote: error: hook declined to update refs/heads/tofail
|
||||
remote: STDOUT post-receive
|
||||
remote: STDERR post-receive
|
||||
remote: STDOUT post-update
|
||||
|
|
@ -132,7 +132,7 @@ remote: STDERR post-update
|
|||
EOF
|
||||
test_expect_success 'send-pack stderr contains hook messages' '
|
||||
grep ^remote: send.err | sed "s/ *\$//" >actual &&
|
||||
test_cmp - actual <expect
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
|||
Loading…
Reference in a new issue