projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
2dd96ea
)
Merge branch 'jk/maint-push-tracking-wo-remote' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 8 Mar 2010 08:36:01 +0000
(
00:36
-0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 8 Mar 2010 08:36:01 +0000
(
00:36
-0800)
* jk/maint-push-tracking-wo-remote:
push: fix segfault for odd config
builtin-push.c
patch
|
blob
|
history
diff --git
a/builtin-push.c
b/builtin-push.c
index 5633f0ade49f7c845665b7aab202be18a8cc9d8d..f7bc2b292fb85725d9cc26ce09f2302aaa7167fe 100644
(file)
--- 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)