diff options
| -rw-r--r-- | Documentation/RelNotes/2.21.0.txt | 16 | ||||
| -rw-r--r-- | imap-send.c | 2 | ||||
| -rw-r--r-- | sequencer.c | 2 | ||||
| -rw-r--r-- | sequencer.h | 2 |
4 files changed, 10 insertions, 12 deletions
diff --git a/Documentation/RelNotes/2.21.0.txt b/Documentation/RelNotes/2.21.0.txt index 8a9a8dd496..702ebfcdc3 100644 --- a/Documentation/RelNotes/2.21.0.txt +++ b/Documentation/RelNotes/2.21.0.txt @@ -26,7 +26,7 @@ UI, Workflows & Features the fast-export side has been made. * "git push $there $src:$dst" rejects when $dst is not a fully - qualified refname and not clear what the end user meant. The + qualified refname and it is not clear what the end user meant. The codepath has been taught to give a clearer error message, and also guess where the push should go by taking the type of the pushed object into account (e.g. a tag object would want to go under @@ -77,9 +77,9 @@ UI, Workflows & Features * A new date format "--date=human" that morphs its output depending on how far the time is from the current time has been introduced. - "--date=auto" can be used to use this new format when the output is - going to the pager or to the terminal and otherwise the default - format. + "--date=auto:human" can be used to use this new format (or any + existing format) when the output is going to the pager or to the + terminal, and otherwise the default format. Performance, Internal Implementation, Development Support etc. @@ -88,7 +88,7 @@ Performance, Internal Implementation, Development Support etc. (non-)existence of loose objects. * More codepaths have become aware of working with in-core repository - instance other than the default "the_repository". + instances other than the default "the_repository". * The "strncat()" function is now among the banned functions. @@ -125,13 +125,13 @@ Performance, Internal Implementation, Development Support etc. * The in-core repository instances are passed through more codepaths. * Update the protocol message specification to allow only the limited - use of scaled quantities. This is ensure potential compatibility - issues will not go out of hand. + use of scaled quantities. This is to ensure potential compatibility + issues will not get out of hand. * Micro-optimize the code that prepares commit objects to be walked by "git rev-list" when the commit-graph is available. - * "git fetch" and "git upload-pack" learned to send all exchange over + * "git fetch" and "git upload-pack" learned to send all exchanges over the sideband channel while talking the v2 protocol. * The codepath to write out commit-graph has been optimized by diff --git a/imap-send.c b/imap-send.c index 18ca6ba10a..6c54d8c29d 100644 --- a/imap-send.c +++ b/imap-send.c @@ -1114,7 +1114,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *f if (!strcmp(srvc->auth_method, "CRAM-MD5")) { if (!CAP(AUTH_CRAM_MD5)) { - fprintf(stderr, "You specified" + fprintf(stderr, "You specified " "CRAM-MD5 as authentication method, " "but %s doesn't support it.\n", srvc->host); goto bail; diff --git a/sequencer.c b/sequencer.c index 972402e8c0..0db410d590 100644 --- a/sequencer.c +++ b/sequencer.c @@ -35,7 +35,7 @@ #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION" -const char sign_off_header[] = "Signed-off-by: "; +static const char sign_off_header[] = "Signed-off-by: "; static const char cherry_picked_prefix[] = "(cherry picked from commit "; GIT_PATH_FUNC(git_path_commit_editmsg, "COMMIT_EDITMSG") diff --git a/sequencer.h b/sequencer.h index 93e891309b..4d505b3590 100644 --- a/sequencer.h +++ b/sequencer.h @@ -107,8 +107,6 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla unsigned autosquash); int rearrange_squash(struct repository *r); -extern const char sign_off_header[]; - /* * Append a signoff to the commit message in "msgbuf". The ignore_footer * parameter specifies the number of bytes at the end of msgbuf that should |