summaryrefslogtreecommitdiff
path: root/wt-status.h
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2015-03-06 16:04:06 +0100
committerJunio C Hamano <gitster@pobox.com>2015-03-06 11:52:35 -0800
commit970399e74c14df4dc82f10e1fcd0f12531e9b305 (patch)
treebf5f0c9e68a055ad2d2ce88edff4be690b45c82a /wt-status.h
parent9874fca7122563e28d699a911404fc49d2a24f1c (diff)
downloadgit-970399e74c14df4dc82f10e1fcd0f12531e9b305.tar.gz
wt-status: refactor detached HEAD analysis
wt_status_print() is the only caller of wt_status_get_detached_from(). The latter performs most of the analysis of a detached HEAD, including finding state->detached_from; the caller checks whether the detached HEAD is still at state->detached_from or has moved away. Move that last bit of analysis to wt_status_get_detached_from(), too, and store the boolean result in state->detached_at. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.h')
-rw-r--r--wt-status.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/wt-status.h b/wt-status.h
index 283a9fef03..e0a99f75c7 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -84,6 +84,7 @@ struct wt_status_state {
int cherry_pick_in_progress;
int bisect_in_progress;
int revert_in_progress;
+ int detached_at;
char *branch;
char *onto;
char *detached_from;