diff options
author | Linquize <linquize@yahoo.com.hk> | 2014-02-27 23:56:25 +0800 |
---|---|---|
committer | Linquize <linquize@yahoo.com.hk> | 2014-02-27 23:56:25 +0800 |
commit | 59b1dbcd7acf6aa7dd6d81d0386ab15f46ce6ac7 (patch) | |
tree | f1f3a0671dc0a17151375faa3600a7b8e9e77efd | |
parent | 40e10630cfbdddd878a6347c1751092bab7f7a28 (diff) | |
download | libgit2-59b1dbcd7acf6aa7dd6d81d0386ab15f46ce6ac7.tar.gz |
Do not allow git_branch_create() to force update branch
-rw-r--r-- | src/branch.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/branch.c b/src/branch.c index 133d6f6d4..1ebaf8e24 100644 --- a/src/branch.c +++ b/src/branch.c @@ -58,6 +58,7 @@ int git_branch_create( const git_signature *signature, const char *log_message) { + int is_head = 0; git_reference *branch = NULL; git_buf canonical_branch_name = GIT_BUF_INIT, log_message_buf = GIT_BUF_INIT; @@ -65,7 +66,19 @@ int git_branch_create( assert(branch_name && commit && ref_out); assert(git_object_owner((const git_object *)commit) == repository); + if (git_branch_lookup(&branch, repository, branch_name, GIT_BRANCH_LOCAL) == 0) { + if ((is_head = git_branch_is_head(branch)) < 0) { + error = is_head; + goto cleanup; + } + } + if (is_head && force) { + giterr_set(GITERR_REFERENCE, "Cannot force update branch '%s' as it is " + "the current HEAD of the repository.", git_reference_name(branch)); + goto cleanup; + } + if (git_buf_joinpath(&canonical_branch_name, GIT_REFS_HEADS_DIR, branch_name) < 0) goto cleanup; |