Merge branch 'ss/mergetools-tortoise'

diff --git a/send-pack.c b/send-pack.c
index 1c375f0a28c6417f1f6cb48afbde681f458c544d..97ab336097bfb45c63aec739a6eef2df26cc4790 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -230,6 +230,8 @@ int send_pack(struct send_pack_args *args,
                switch (ref->status) {
                case REF_STATUS_REJECT_NONFASTFORWARD:
                case REF_STATUS_REJECT_ALREADY_EXISTS:
+               case REF_STATUS_REJECT_FETCH_FIRST:
+               case REF_STATUS_REJECT_NEEDS_FORCE:
                case REF_STATUS_UPTODATE:
                        continue;
                default: