diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-07-25 21:05:23 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-25 21:05:23 +0200 |
| commit | 88d08c342af961c5fb57d7ea5f51233770f06639 (patch) | |
| tree | dcc44c2f7942f3ab7e16126d986c9d6c799eaaf4 /wt-status.c | |
| parent | The thirteenth batch (diff) | |
| parent | push: don't imply that integration is always required before pushing (diff) | |
| download | git-88d08c342af961c5fb57d7ea5f51233770f06639.tar.xz git-88d08c342af961c5fb57d7ea5f51233770f06639.zip | |
Merge branch 'ah/advise-force-pushing'
Help newbies by suggesting that there are cases where force-pushing
is a valid and sensible thing to update a branch at a remote
repository, rather than reconciling with merge/rebase.
* ah/advise-force-pushing:
push: don't imply that integration is always required before pushing
remote: don't imply that integration is always required before pushing
wt-status: don't show divergence advice when committing
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c index 8a1a4fb1f0..5b1378965c 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1186,7 +1186,8 @@ static void wt_longstatus_print_tracking(struct wt_status *s) t_begin = getnanotime(); - if (!format_tracking_info(branch, &sb, s->ahead_behind_flags)) + if (!format_tracking_info(branch, &sb, s->ahead_behind_flags, + !s->commit_template)) return; if (advice_enabled(ADVICE_STATUS_AHEAD_BEHIND_WARNING) && |