diff options
| author |  Jeff King <peff@peff.net> | 2010-02-24 12:08:53 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-02-24 11:16:14 -0800 |
| commit | db03b55781f23a9276234faf9a21922ff8c5678d (patch) | |
| tree | 6fbba79fe0bb29f19acb0ecc0528dcd25560cae8 /git-gui/lib/tools.tcl | |
| parent | New config push.default to decide default behavior for push (diff) | |
| download | tgif-db03b55781f23a9276234faf9a21922ff8c5678d.tar.xz | |
push: fix segfault for odd config
If you have a branch.$X.merge config option, but no branch.$X.remote, and
your configuration tries to push tracking branches, git will segfault.
The problem is that even though branch->merge_nr is 1, you don't actually
have an upstream since there is no remote. Other callsites generally
check explicitly that branch->merge is not NULL, so let's do that here,
too.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/lib/tools.tcl')
0 files changed, 0 insertions, 0 deletions