Differential D8466
Ignore detached git branches. Authored by joshuaspence on Mar 9 2014, 5:28 AM. Tags None Referenced Files
Subscribers
Details
Fixes T4559. It looks like the code currently (at least partially) handles this by checking for (no branch). I suspect that the behaviour of git has changed (I am running version 1.9.0) because I haven't figured out what state to be in to cause git to output (no branch). Ran arc branch when on a detached branch.
Diff Detail
Event TimelineComment Actions I can't immediately get "no branch" either anymore. It looks like several states are possible in the source: static char *get_head_description(void)
{
struct strbuf desc = STRBUF_INIT;
struct wt_status_state state;
memset(&state, 0, sizeof(state));
wt_status_get_state(&state, 1);
if (state.rebase_in_progress ||
state.rebase_interactive_in_progress)
strbuf_addf(&desc, _("(no branch, rebasing %s)"),
state.branch);
else if (state.bisect_in_progress)
strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
state.branch);
else if (state.detached_from)
strbuf_addf(&desc, _("(detached from %s)"),
state.detached_from);
else
strbuf_addstr(&desc, _("(no branch)"));
free(state.branch);
free(state.onto);
free(state.detached_from);
return strbuf_detach(&desc, NULL);
}Those other two seem like very unusual times to run arc commands, though. Comment Actions Closed by commit rARCa2706f653944 (authored by @joshuaspence, committed by @epriestley). |