Merge branch 'jk/maint-push-tracking-wo-remote'

* jk/maint-push-tracking-wo-remote: push: fix segfault for odd config
15 years ago · 796a01c41c
1 changed files with 1 additions and 1 deletions
--- a/builtin-push.c
+++ b/builtin-push.c
@ -68,7 +68,7 @@ static void setup_push_tracking(void)
				@@ -68,7 +68,7 @@ static void setup_push_tracking(void)
 	struct branch *branch = branch_get(NULL);
 	if (!branch)
 		die("You are not currently on a branch.");
-	if (!branch->merge_nr)
+	if (!branch->merge_nr || !branch->merge)
 		die("The current branch %s is not tracking anything.",
 		    branch->name);
 	if (branch->merge_nr != 1)