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

* jk/maint-push-tracking-wo-remote: push: fix segfault for odd config
git-mirror · Mar 8, 2010 · 57c118c · 57c118c
2 parents 2dd96ea + db03b55
commit 57c118c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/builtin-push.c b/builtin-push.c
@@ -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)