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

Merge branch 'maint'

Browse Source 
* maint:
  pack-objects doesn't create random pack names
  link_temp_to_file: don't leave the path truncated on adjust_shared_perm failure
This commit is contained in:
Junio C Hamano 2006-11-01 15:09:55 -08:00
commit 7854e526ff
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-pack-objects.txt
View File

@ -47,9 +47,8 @@ base-name::
<base-name> to determine the name of the created file. <base-name> to determine the name of the created file.
When this option is used, the two files are written in When this option is used, the two files are written in
<base-name>-<SHA1>.{pack,idx} files. <SHA1> is a hash <base-name>-<SHA1>.{pack,idx} files. <SHA1> is a hash
of object names (currently in random order so it does of the sorted object names to make the resulting filename
not have any useful meaning) to make the resulting based on the pack content, and written to the standard
filename reasonably unique, and written to the standard
output of the command. output of the command.
--stdout:: --stdout::

4
sha1_file.c
View File

@ -1400,8 +1400,10 @@ static int link_temp_to_file(const char *tmpfile, const char *filename)
if (dir) { if (dir) {
*dir = 0; *dir = 0;
mkdir(filename, 0777); mkdir(filename, 0777);
if (adjust_shared_perm(filename)) if (adjust_shared_perm(filename)) {
*dir = '/';
return -2; return -2;
}
*dir = '/'; *dir = '/';
if (!link(tmpfile, filename)) if (!link(tmpfile, filename))
return 0; return 0;