Merge upstreamable patches

Includes commits from these pull requests: git-for-windows#188 Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
jeffhostetler · Jun 1, 2020 · 26f52f4 · 26f52f4
2 parents f5527f0 + e401874
commit 26f52f4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/upload-pack.c b/upload-pack.c
@@ -613,11 +613,12 @@ static void check_non_tip(struct object_array *want_obj,
 	for (i = 0; i < want_obj->nr; i++) {
 		struct object *o = want_obj->objects[i].item;
 		if (!is_our_ref(o)) {
+			warning("git upload-pack: not our ref %s",
+				oid_to_hex(&o->oid));
 			packet_writer_error(writer,
 					    "upload-pack: not our ref %s",
 					    oid_to_hex(&o->oid));
-			die("git upload-pack: not our ref %s",
-			    oid_to_hex(&o->oid));
+			exit(1);
 		}
 	}
 }