development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-05 16:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
* jk/maint-push-tracking-wo-remote:
  push: fix segfault for odd config
This commit is contained in:
Junio C Hamano 2010-03-08 00:36:01 -08:00
parent 2dd96ea21f db03b55781
commit 57c118c268
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin-push.c
View file

@ -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)