From: Jiang Xin <zhiyou.jx@xxxxxxxxxxxxxxx>
When pushing a new reference (not a head or tag), report it as a new
reference instead of a new branch.
Signed-off-by: Jiang Xin <zhiyou.jx@xxxxxxxxxxxxxxx>
---
t/t5411-proc-receive-hook.sh | 144 +++++++++++++++++++++++++++++++++++
transport.c | 3 +-
2 files changed, 146 insertions(+), 1 deletion(-)
create mode 100755 t/t5411-proc-receive-hook.sh
diff --git a/t/t5411-proc-receive-hook.sh b/t/t5411-proc-receive-hook.sh
new file mode 100755
index 0000000000..fe2861f2e6
--- /dev/null
+++ b/t/t5411-proc-receive-hook.sh
@@ -0,0 +1,144 @@
+#!/bin/sh
+#
+# Copyright (c) 2020 Jiang Xin
+#
+
+test_description='Test proc-receive hook'
+
+. ./test-lib.sh
+
+# Create commits in <repo> and assign each commit's oid to shell variables
+# given in the arguments (A, B, and C). E.g.:
+#
+# create_commits_in <repo> A B C
+#
+# NOTE: Avoid calling this function from a subshell since variable
+# assignments will disappear when subshell exits.
+create_commits_in () {
+ repo="$1" &&
+ if ! parent=$(git -C "$repo" rev-parse HEAD^{} 2>/dev/null)
+ then
+ parent=
+ fi &&
+ T=$(git -C "$repo" write-tree) &&
+ shift &&
+ while test $# -gt 0
+ do
+ name=$1 &&
+ test_tick &&
+ if test -z "$parent"
+ then
+ oid=$(echo $name | git -C "$repo" commit-tree $T)
+ else
+ oid=$(echo $name | git -C "$repo" commit-tree -p $parent $T)
+ fi &&
+ eval $name=$oid &&
+ parent=$oid &&
+ shift ||
+ return 1
+ done &&
+ git -C "$repo" update-ref refs/heads/master $oid
+}
+
+format_git_output () {
+ sed \
+ -e "s/ *\$//g" \
+ -e "s/$A/<COMMIT-A>/g" \
+ -e "s/$B/<COMMIT-B>/g" \
+ -e "s/$TAG/<COMMIT-T>/g" \
+ -e "s/$ZERO_OID/<ZERO-OID>/g" \
+ -e "s/'/\"/g"
+}
+
+test_expect_success "setup" '
+ git init --bare upstream &&
+ git init workbench &&
+ create_commits_in workbench A B &&
+ (
+ cd workbench &&
+ git remote add origin ../upstream &&
+ git config core.abbrev 7 &&
+ git update-ref refs/heads/master $A &&
+ git tag -m "v1.0.0" v1.0.0 $A &&
+ git push origin \
+ $B:refs/heads/master \
+ $A:refs/heads/next
+ ) &&
+ TAG=$(cd workbench; git rev-parse v1.0.0) &&
+
+ # setup pre-receive hook
+ cat >upstream/hooks/pre-receive <<-EOF &&
+ #!/bin/sh
+
+ printf >&2 "# pre-receive hook\n"
+
+ while read old new ref
+ do
+ printf >&2 "pre-receive< \$old \$new \$ref\n"
+ done
+ EOF
+
+ # setup post-receive hook
+ cat >upstream/hooks/post-receive <<-EOF &&
+ #!/bin/sh
+
+ printf >&2 "# post-receive hook\n"
+
+ while read old new ref
+ do
+ printf >&2 "post-receive< \$old \$new \$ref\n"
+ done
+ EOF
+
+ chmod a+x \
+ upstream/hooks/pre-receive \
+ upstream/hooks/post-receive
+'
+
+test_expect_success "normal git-push command" '
+ (
+ cd workbench &&
+ git push -f origin \
+ refs/tags/v1.0.0 \
+ :refs/heads/next \
+ HEAD:refs/heads/master \
+ HEAD:refs/review/master/topic \
+ HEAD:refs/heads/a/b/c
+ ) >out 2>&1 &&
+ format_git_output <out >actual &&
+ cat >expect <<-EOF &&
+ remote: # pre-receive hook
+ remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/master
+ remote: pre-receive< <COMMIT-A> <ZERO-OID> refs/heads/next
+ remote: pre-receive< <ZERO-OID> <COMMIT-T> refs/tags/v1.0.0
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/review/master/topic
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c
+ remote: # post-receive hook
+ remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/master
+ remote: post-receive< <COMMIT-A> <ZERO-OID> refs/heads/next
+ remote: post-receive< <ZERO-OID> <COMMIT-T> refs/tags/v1.0.0
+ remote: post-receive< <ZERO-OID> <COMMIT-A> refs/review/master/topic
+ remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c
+ To ../upstream
+ + ce858e6...1029397 HEAD -> master (forced update)
+ - [deleted] next
+ * [new tag] v1.0.0 -> v1.0.0
+ * [new reference] HEAD -> refs/review/master/topic
+ * [new branch] HEAD -> a/b/c
+ EOF
+ test_cmp expect actual &&
+ (
+ cd upstream &&
+ git show-ref
+ ) >out &&
+ format_git_output <out >actual &&
+ cat >expect <<-EOF &&
+ <COMMIT-A> refs/heads/a/b/c
+ <COMMIT-A> refs/heads/master
+ <COMMIT-A> refs/review/master/topic
+ <COMMIT-T> refs/tags/v1.0.0
+ EOF
+ test_cmp expect actual
+'
+
+test_done
diff --git a/transport.c b/transport.c
index 1fdc7dac1a..b5b7bb841e 100644
--- a/transport.c
+++ b/transport.c
@@ -501,7 +501,8 @@ static void print_ok_ref_status(struct ref *ref, int porcelain, int summary_widt
else if (is_null_oid(&ref->old_oid))
print_ref_status('*',
(starts_with(ref->name, "refs/tags/") ? "[new tag]" :
- "[new branch]"),
+ (starts_with(ref->name, "refs/heads/") ? "[new branch]" :
+ "[new reference]")),
ref, ref->peer_ref, NULL, porcelain, summary_width);
else {
struct strbuf quickref = STRBUF_INIT;
--
2.26.0.rc1.33.g4914ba4bcf
