X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=cache.h;h=f2dabefd9d75fddf0eb48e42a0907db6ac162b08;hb=3eafdc961fa6c44d40382be6a55b62b7e6edb248;hp=39ca875fb54afa8ef31631d6096738c46df02ccc;hpb=bd2700dbdf6551c646bc4d68b6230b63ca6eaea3;p=git.git

diff --git a/cache.h b/cache.h
index 39ca875fb..f2dabefd9 100644
--- a/cache.h
+++ b/cache.h
@@ -607,7 +607,7 @@ enum rebase_setup_type {
 enum push_default_type {
 	PUSH_DEFAULT_NOTHING = 0,
 	PUSH_DEFAULT_MATCHING,
-	PUSH_DEFAULT_TRACKING,
+	PUSH_DEFAULT_UPSTREAM,
 	PUSH_DEFAULT_CURRENT
 };
 
@@ -898,7 +898,8 @@ extern struct packed_git {
 	time_t mtime;
 	int pack_fd;
 	unsigned pack_local:1,
-		 pack_keep:1;
+		 pack_keep:1,
+		 do_not_close:1;
 	unsigned char sha1[20];
 	/* something like ".git/objects/pack/xxxxx.pack" */
 	char pack_name[FLEX_ARRAY]; /* more */