mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 19:37:02 +00:00
[6979] Updated git_id
Fixed some whitespace errors.
This commit is contained in:
parent
fb9c4a74c0
commit
12753049d1
2 changed files with 6 additions and 6 deletions
|
|
@ -301,7 +301,7 @@ bool write_rev()
|
||||||
system_switch_index(cmd);
|
system_switch_index(cmd);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
@ -341,7 +341,7 @@ bool find_head_msg()
|
||||||
bool amend_commit()
|
bool amend_commit()
|
||||||
{
|
{
|
||||||
printf("+ amending last commit\n");
|
printf("+ amending last commit\n");
|
||||||
|
|
||||||
// commit the contents of the (new) index
|
// commit the contents of the (new) index
|
||||||
if(use_new_index && putenv(new_index_cmd) != 0) return false;
|
if(use_new_index && putenv(new_index_cmd) != 0) return false;
|
||||||
snprintf(cmd, MAX_CMD, "git commit --amend -F-");
|
snprintf(cmd, MAX_CMD, "git commit --amend -F-");
|
||||||
|
|
@ -613,7 +613,7 @@ bool generate_sql_makefile()
|
||||||
for(std::set<std::string>::iterator itr = file_list.begin(); itr != file_list.end(); ++itr)
|
for(std::set<std::string>::iterator itr = file_list.begin(); itr != file_list.end(); ++itr)
|
||||||
fprintf(fout, "\t%s \\\n", itr->c_str());
|
fprintf(fout, "\t%s \\\n", itr->c_str());
|
||||||
|
|
||||||
fprintf(fout,
|
fprintf(fout,
|
||||||
"\n## Additional files to include when running 'make dist'\n"
|
"\n## Additional files to include when running 'make dist'\n"
|
||||||
"# SQL update files, to upgrade database schema from older revisions\n"
|
"# SQL update files, to upgrade database schema from older revisions\n"
|
||||||
"EXTRA_DIST = \\\n"
|
"EXTRA_DIST = \\\n"
|
||||||
|
|
@ -656,7 +656,7 @@ bool change_sql_database()
|
||||||
snprintf(dummy, MAX_CMD, "CREATE TABLE `%s` (\n", db_version_table[i]);
|
snprintf(dummy, MAX_CMD, "CREATE TABLE `%s` (\n", db_version_table[i]);
|
||||||
while(fgets(buffer, MAX_BUF, fin))
|
while(fgets(buffer, MAX_BUF, fin))
|
||||||
{
|
{
|
||||||
fputs(buffer, fout);
|
fputs(buffer, fout);
|
||||||
if(strncmp(buffer, dummy, MAX_BUF) == 0)
|
if(strncmp(buffer, dummy, MAX_BUF) == 0)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -729,7 +729,7 @@ bool change_sql_history()
|
||||||
pclose(cmd_pipe);
|
pclose(cmd_pipe);
|
||||||
|
|
||||||
// make a commit with the same author and message as the original one
|
// make a commit with the same author and message as the original one
|
||||||
|
|
||||||
snprintf(cmd, MAX_CMD, "git commit -C %s", itr->c_str());
|
snprintf(cmd, MAX_CMD, "git commit -C %s", itr->c_str());
|
||||||
system(cmd);
|
system(cmd);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "6978"
|
#define REVISION_NR "6979"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue