about summary refs log tree commit diff
path: root/third_party/git/wt-status.c
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/wt-status.c
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/wt-status.c')
-rw-r--r--third_party/git/wt-status.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/third_party/git/wt-status.c b/third_party/git/wt-status.c
index cc6f94504d9f..9f6c65a58097 100644
--- a/third_party/git/wt-status.c
+++ b/third_party/git/wt-status.c
@@ -1434,8 +1434,6 @@ static void show_cherry_pick_in_progress(struct wt_status *s,
 			status_printf_ln(s, color,
 				_("  (all conflicts fixed: run \"git cherry-pick --continue\")"));
 		status_printf_ln(s, color,
-			_("  (use \"git cherry-pick --skip\" to skip this patch)"));
-		status_printf_ln(s, color,
 			_("  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
 	}
 	wt_longstatus_print_trailer(s);
@@ -1463,8 +1461,6 @@ static void show_revert_in_progress(struct wt_status *s,
 			status_printf_ln(s, color,
 				_("  (all conflicts fixed: run \"git revert --continue\")"));
 		status_printf_ln(s, color,
-			_("  (use \"git revert --skip\" to skip this patch)"));
-		status_printf_ln(s, color,
 			_("  (use \"git revert --abort\" to cancel the revert operation)"));
 	}
 	wt_longstatus_print_trailer(s);
@@ -2029,7 +2025,7 @@ static void wt_porcelain_v2_print_tracking(struct wt_status *s)
 	char eol = s->null_termination ? '\0' : '\n';
 
 	fprintf(s->fp, "# branch.oid %s%c",
-			(s->is_initial ? "(initial)" : oid_to_hex(&s->oid_commit)),
+			(s->is_initial ? "(initial)" : sha1_to_hex(s->sha1_commit)),
 			eol);
 
 	if (!s->branch)