diff options
| author | Ronnie Sahlberg <sahlberg@google.com> | 2014-11-07 11:42:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-07 15:46:56 -0800 |
| commit | eeb3f55c165e1a92d8fc85819035247fefe7971a (patch) | |
| tree | 00482fe976a9cbb4c6a5771e89fab04266a41748 /builtin/branch.c | |
| parent | 688b1310ed3277e9578495f816a7caffeb15f0e5 (diff) | |
| download | git-rs/ref-transaction-send-pack.tar.gz | |
refs.c: add an err argument to create_symrefrs/ref-transaction-send-pack
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 04f57d441f..ab6d9f43f5 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -698,6 +698,7 @@ static void rename_branch(const char *oldname, const char *newname, int force) { struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT; struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT; + struct strbuf err = STRBUF_INIT; int recovery = 0; int clobber_head_ok; @@ -734,8 +735,10 @@ static void rename_branch(const char *oldname, const char *newname, int force) warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11); /* no need to pass logmsg here as HEAD didn't really move */ - if (!strcmp(oldname, head) && create_symref("HEAD", newref.buf, NULL)) - die(_("Branch renamed to %s, but HEAD is not updated!"), newname); + if (!strcmp(oldname, head) && + create_symref("HEAD", newref.buf, NULL, &err)) + die(_("Branch renamed to %s, but HEAD is not updated!. %s"), + newname, err.buf); strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11); strbuf_release(&oldref); |