Merge branch 'maint'
* maint: Documentation: Remove an odd "instead" fix portability problem with IS_RUN_COMMAND_ERR mailmap: resurrect lower-casing of email addresses
This commit is contained in:
commit
02c62b10de
@ -117,7 +117,7 @@ then the cloned repository will become corrupt.
|
|||||||
--origin <name>::
|
--origin <name>::
|
||||||
-o <name>::
|
-o <name>::
|
||||||
Instead of using the remote name 'origin' to keep track
|
Instead of using the remote name 'origin' to keep track
|
||||||
of the upstream repository, use <name> instead.
|
of the upstream repository, use <name>.
|
||||||
|
|
||||||
--upload-pack <upload-pack>::
|
--upload-pack <upload-pack>::
|
||||||
-u <upload-pack>::
|
-u <upload-pack>::
|
||||||
|
@ -50,6 +50,15 @@ static void add_mapping(struct string_list *map,
|
|||||||
{
|
{
|
||||||
struct mailmap_entry *me;
|
struct mailmap_entry *me;
|
||||||
int index;
|
int index;
|
||||||
|
char *p;
|
||||||
|
|
||||||
|
if (old_email)
|
||||||
|
for (p = old_email; *p; p++)
|
||||||
|
*p = tolower(*p);
|
||||||
|
if (new_email)
|
||||||
|
for (p = new_email; *p; p++)
|
||||||
|
*p = tolower(*p);
|
||||||
|
|
||||||
if (old_email == NULL) {
|
if (old_email == NULL) {
|
||||||
old_email = new_email;
|
old_email = new_email;
|
||||||
new_email = NULL;
|
new_email = NULL;
|
||||||
|
@ -10,7 +10,7 @@ enum {
|
|||||||
ERR_RUN_COMMAND_WAITPID_SIGNAL,
|
ERR_RUN_COMMAND_WAITPID_SIGNAL,
|
||||||
ERR_RUN_COMMAND_WAITPID_NOEXIT,
|
ERR_RUN_COMMAND_WAITPID_NOEXIT,
|
||||||
};
|
};
|
||||||
#define IS_RUN_COMMAND_ERR(x) ((x) <= -ERR_RUN_COMMAND_FORK)
|
#define IS_RUN_COMMAND_ERR(x) (-(x) >= ERR_RUN_COMMAND_FORK)
|
||||||
|
|
||||||
struct child_process {
|
struct child_process {
|
||||||
const char **argv;
|
const char **argv;
|
||||||
|
Loading…
Reference in New Issue
Block a user