Teach receive-pack not to run update hook for a corrupt or nonexistent ref.
In addition, update the warning message for deleting a corrupt or nonexistent
ref from:
"Allowing deletion of corrupt ref"
to:
"Allowing deletion of corrupt/nonexistent ref"
Noticed-by: Sitaram Chamarty <sitaramc@xxxxxxxxx>
Signed-off-by: Pang Yan Han <pangyanhan@xxxxxxxxx>
---
builtin/receive-pack.c | 50 +++++++++++++++++++++++++++--------------------
t/t5516-fetch-push.sh | 33 +++++++++++++++++++++++++++++++
2 files changed, 62 insertions(+), 21 deletions(-)
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index ae164da..a9385cf 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -346,6 +346,17 @@ static void refuse_unconfigured_deny_delete_current(void)
rp_error("%s", refuse_unconfigured_deny_delete_current_msg[i]);
}
+static const char *delete_null_sha1_ref(const char *namespaced_name,
+ const char *name,
+ unsigned char *old_sha1)
+{
+ if (delete_ref(namespaced_name, old_sha1, 0)) {
+ rp_error("failed to delete %s", name);
+ return "failed to delete";
+ }
+ return NULL; /* good */
+}
+
static const char *update(struct command *cmd)
{
const char *name = cmd->ref_name;
@@ -438,33 +449,30 @@ static const char *update(struct command *cmd)
return "non-fast-forward";
}
}
+
+ /* Don't run update hook for corrupt/nonexistent ref */
+ if (is_null_sha1(new_sha1) && !parse_object(old_sha1)) {
+ rp_warning("Allowing deletion of corrupt/nonexistent ref.");
+ old_sha1 = NULL;
+ return delete_null_sha1_ref(namespaced_name, name, old_sha1);
+ }
+
if (run_update_hook(cmd)) {
rp_error("hook declined to update %s", name);
return "hook declined";
}
- if (is_null_sha1(new_sha1)) {
- if (!parse_object(old_sha1)) {
- rp_warning("Allowing deletion of corrupt ref.");
- old_sha1 = NULL;
- }
- if (delete_ref(namespaced_name, old_sha1, 0)) {
- rp_error("failed to delete %s", name);
- return "failed to delete";
- }
- return NULL; /* good */
- }
- else {
- lock = lock_any_ref_for_update(namespaced_name, old_sha1, 0);
- if (!lock) {
- rp_error("failed to lock %s", name);
- return "failed to lock";
- }
- if (write_ref_sha1(lock, new_sha1, "push")) {
- return "failed to write"; /* error() already called */
- }
- return NULL; /* good */
+ if (is_null_sha1(new_sha1))
+ return delete_null_sha1_ref(namespaced_name, name, old_sha1);
+
+ lock = lock_any_ref_for_update(namespaced_name, old_sha1, 0);
+ if (!lock) {
+ rp_error("failed to lock %s", name);
+ return "failed to lock";
}
+ if (write_ref_sha1(lock, new_sha1, "push"))
+ return "failed to write"; /* error() already called */
+ return NULL; /* good */
}
static char update_post_hook[] = "hooks/post-update";
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 3abb290..b7a74e3 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -40,6 +40,20 @@ mk_test () {
)
}
+mk_test_with_update_hook () {
+ mk_test "$@" &&
+ (
+ cd testrepo &&
+ mkdir .git/hooks &&
+ cd .git/hooks &&
+ cat >update <<'EOF'
+#!/bin/sh
+printf %s "$@" >>update.args
+EOF
+ chmod u+x update
+ )
+}
+
mk_child() {
rm -rf "$1" &&
git clone testrepo "$1"
@@ -559,6 +573,25 @@ test_expect_success 'allow deleting an invalid remote ref' '
'
+test_expect_success 'deleting existing ref triggers update hook' '
+ mk_test_with_update_hook heads/master &&
+ (
+ cd testrepo &&
+ git rev-parse --verify refs/heads/master &&
+ git config receive.denyDeleteCurrent warn
+ ) &&
+ git push testrepo :refs/heads/master &&
+ (cd testrepo && test_must_fail git rev-parse --verify refs/heads/master) &&
+ (cd testrepo/.git && test -s update.args)
+'
+
+test_expect_success 'deleting nonexistent ref does not trigger update hook' '
+ mk_test_with_update_hook heads/master &&
+ rm -f testrepo/.git/objects/??/* &&
+ git push testrepo :refs/heads/master &&
+ (cd testrepo/.git && ! test -f update.args)
+'
+
test_expect_success 'allow deleting a ref using --delete' '
mk_test heads/master &&
(cd testrepo && git config receive.denyDeleteCurrent warn) &&
--
1.7.7.rc3.2.g29f2e6
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html