]> git.ipfire.org Git - thirdparty/git.git/commit - wt-status.c
wt-status: don't show divergence advice when committing
authorAlex Henrie <alexhenrie24@gmail.com>
Thu, 13 Jul 2023 04:41:13 +0000 (22:41 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Jul 2023 16:14:58 +0000 (09:14 -0700)
commitb6f3da51322345a19c259b9359065aa54cda74ff
treed469a545fe9ae41d4bf5f2a218b19801dcc541d1
parenta646b86cd10282de2ceb64ef33b5412e4fb2a54c
wt-status: don't show divergence advice when committing

When the user is in the middle of making a commit, they are not yet at
the point where they are ready to think about integrating their local
branch with the corresponding remote branch or force-pushing over the
remote branch. Don't include advice on how to deal with divergent
branches in the commit template, to avoid giving the impression that the
divergence needs to be dealt with immediately. Similar advice will be
printed when it is most relevant, that is, if the user does try to push
without first reconciling the two branches.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/checkout.c
remote.c
remote.h
t/t7508-status.sh
wt-status.c