undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tb/repack-fix-renames' (early part)

Browse Source 
Finishing touches to the "rewrite repack in C" series.

* 'tb/repack-fix-renames' (early part):
  repack.c: rename and unlink pack file if it exists
This commit is contained in:
Junio C Hamano 2014-02-05 12:02:29 -08:00
commit 2171c0c36f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/repack.c
View File

@ -258,7 +258,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
for_each_string_list_item(item, &names) { for_each_string_list_item(item, &names) {
for (ext = 0; ext < 2; ext++) { for (ext = 0; ext < 2; ext++) {
char *fname, *fname_old; char *fname, *fname_old;
fname = mkpathdup("%s/%s%s", packdir, fname = mkpathdup("%s/pack-%s%s", packdir,
item->string, exts[ext]); item->string, exts[ext]);
if (!file_exists(fname)) { if (!file_exists(fname)) {
free(fname); free(fname);
@ -335,7 +335,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
for_each_string_list_item(item, &names) { for_each_string_list_item(item, &names) {
for (ext = 0; ext < 2; ext++) { for (ext = 0; ext < 2; ext++) {
char *fname; char *fname;
fname = mkpath("%s/old-pack-%s%s", fname = mkpath("%s/old-%s%s",
packdir, packdir,
item->string, item->string,
exts[ext]); exts[ext]);