status: do not depend on rebase reflog messages
[gitweb.git] / wt-status.c
index 251127021cd68b9cad67683c2b7f5c0b98492fa6..85a00f12fded56369111d9462f0fba0b03980003 100644 (file)
@@ -1174,7 +1174,10 @@ void wt_status_print(struct wt_status *s)
                        branch_name += 11;
                else if (!strcmp(branch_name, "HEAD")) {
                        branch_status_color = color(WT_STATUS_NOBRANCH, s);
-                       if (state.detached_from) {
+                       if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
+                               on_what = _("rebase in progress; onto ");
+                               branch_name = state.onto;
+                       } else if (state.detached_from) {
                                unsigned char sha1[20];
                                branch_name = state.detached_from;
                                if (!get_sha1("HEAD", sha1) &&