mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
Merge branch 'maint'
* maint: whitespace: have SP on both sides of an assignment "=" update-ref: whitespace fix
This commit is contained in:
commit
1952e102b7
|
@ -1103,7 +1103,7 @@ static int show(int argc, const char **argv)
|
||||||
url = states.remote->url;
|
url = states.remote->url;
|
||||||
url_nr = states.remote->url_nr;
|
url_nr = states.remote->url_nr;
|
||||||
}
|
}
|
||||||
for (i=0; i < url_nr; i++)
|
for (i = 0; i < url_nr; i++)
|
||||||
printf(" Push URL: %s\n", url[i]);
|
printf(" Push URL: %s\n", url[i]);
|
||||||
if (!i)
|
if (!i)
|
||||||
printf(" Push URL: %s\n", "(no URL)");
|
printf(" Push URL: %s\n", "(no URL)");
|
||||||
|
|
|
@ -11,7 +11,7 @@ static const char * const git_update_ref_usage[] = {
|
||||||
|
|
||||||
int cmd_update_ref(int argc, const char **argv, const char *prefix)
|
int cmd_update_ref(int argc, const char **argv, const char *prefix)
|
||||||
{
|
{
|
||||||
const char *refname, *oldval, *msg=NULL;
|
const char *refname, *oldval, *msg = NULL;
|
||||||
unsigned char sha1[20], oldsha1[20];
|
unsigned char sha1[20], oldsha1[20];
|
||||||
int delete = 0, no_deref = 0, flags = 0;
|
int delete = 0, no_deref = 0, flags = 0;
|
||||||
struct option options[] = {
|
struct option options[] = {
|
||||||
|
|
2
commit.c
2
commit.c
|
@ -515,7 +515,7 @@ void sort_in_topological_order(struct commit_list ** list, int lifo)
|
||||||
|
|
||||||
commit = work_item->item;
|
commit = work_item->item;
|
||||||
for (parents = commit->parents; parents ; parents = parents->next) {
|
for (parents = commit->parents; parents ; parents = parents->next) {
|
||||||
struct commit *parent=parents->item;
|
struct commit *parent = parents->item;
|
||||||
|
|
||||||
if (!parent->indegree)
|
if (!parent->indegree)
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -1655,7 +1655,7 @@ static int delete_remote_branch(const char *pattern, int force)
|
||||||
return error("Remote HEAD is not a symref");
|
return error("Remote HEAD is not a symref");
|
||||||
|
|
||||||
/* Remote branch must not be the remote HEAD */
|
/* Remote branch must not be the remote HEAD */
|
||||||
for (i=0; symref && i<MAXDEPTH; i++) {
|
for (i = 0; symref && i < MAXDEPTH; i++) {
|
||||||
if (!strcmp(remote_ref->name, symref))
|
if (!strcmp(remote_ref->name, symref))
|
||||||
return error("Remote branch %s is the current HEAD",
|
return error("Remote branch %s is the current HEAD",
|
||||||
remote_ref->name);
|
remote_ref->name);
|
||||||
|
|
|
@ -1084,7 +1084,7 @@ static void show_file(const char * fmt, const char * name, int in_porcelain,
|
||||||
{
|
{
|
||||||
if (in_porcelain && *first && header_msg) {
|
if (in_porcelain && *first && header_msg) {
|
||||||
printf("%s\n", header_msg);
|
printf("%s\n", header_msg);
|
||||||
*first=0;
|
*first = 0;
|
||||||
}
|
}
|
||||||
printf(fmt, name);
|
printf(fmt, name);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue