branch -d: base the "already-merged" safety on the branch it merges with

diff --git a/fetch-pack.h b/fetch-pack.h
index 8bd9c32561e79d194d27fa10cc98a26aa2cb673c..fbe85ac05fd2d945d645365dc086460003fa7f27 100644 (file)
--- a/fetch-pack.h
+++ b/fetch-pack.h
@@ -13,7 +13,8 @@ struct fetch_pack_args
                fetch_all:1,
                verbose:1,
                no_progress:1,
-               include_tag:1;
+               include_tag:1,
+               stateless_rpc:1;
 };
 
 struct ref *fetch_pack(struct fetch_pack_args *args,