diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2012-11-17 22:09:55 -0800 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2012-11-28 20:00:07 +0100 |
| commit | 37849a8ec3aba526570f73f90bccb232ceefc426 (patch) | |
| tree | 099257ccee1b4224170f972aec7ad47867ac0ca3 /src/branch.c | |
| parent | f1bd50d61d3bce63b8db46e906b2ed34ec9545cf (diff) | |
| download | libgit2-37849a8ec3aba526570f73f90bccb232ceefc426.tar.gz | |
tracking: fix retrieval of the tracking ref of branch with empty merge and/or remote entry
Diffstat (limited to 'src/branch.c')
| -rw-r--r-- | src/branch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/branch.c b/src/branch.c index 5d7d443dc..7f73af81c 100644 --- a/src/branch.c +++ b/src/branch.c @@ -257,8 +257,8 @@ int git_branch_tracking( if ((error = retrieve_tracking_configuration(&merge_name, branch, "branch.%s.merge")) < 0) goto cleanup; - - if (remote_name == NULL || merge_name == NULL) { + + if (!*remote_name || !*merge_name) { error = GIT_ENOTFOUND; goto cleanup; } |