mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-26 08:16:12 +02:00
Code

Merge branch 'maint' 

* maint:
  Documentation/gitdiffcore: fix order in pickaxe description
  Documentation: fix minor inconsistency
  Documentation: rebase -i ignores options passed to "git am"
  hash_object: correction for zero length file
This commit is contained in:
Junio C Hamano 2010-05-18 22:39:56 -07:00
parent 1c9eecff97 d07ef71575
commit 636e87d705
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config.txt
View File

@ -1525,7 +1525,7 @@ receive.denyDeletes::
the ref. Use this to prevent such a ref deletion via a push. the ref. Use this to prevent such a ref deletion via a push.
receive.denyCurrentBranch:: receive.denyCurrentBranch::
If set to true or "refuse", receive-pack will deny a ref update If set to true or "refuse", git-receive-pack will deny a ref update
to the currently checked out branch of a non-bare repository. to the currently checked out branch of a non-bare repository.
Such a push is potentially dangerous because it brings the HEAD Such a push is potentially dangerous because it brings the HEAD
out of sync with the index and working tree. If set to "warn", out of sync with the index and working tree. If set to "warn",

1
Documentation/git-rebase.txt
View File

@ -295,6 +295,7 @@ link:howto/revert-a-faulty-merge.txt[revert-a-faulty-merge How-To] for details).
--ignore-date:: --ignore-date::
These flags are passed to 'git am' to easily change the dates These flags are passed to 'git am' to easily change the dates
of the rebased commits (see linkgit:git-am[1]). of the rebased commits (see linkgit:git-am[1]).
Incompatible with the --interactive option.
-i:: -i::
--interactive:: --interactive::

4
Documentation/gitdiffcore.txt
View File

@ -227,8 +227,8 @@ changes that touch a specified string, and is controlled by the
commands. commands.
When diffcore-pickaxe is in use, it checks if there are When diffcore-pickaxe is in use, it checks if there are
filepairs whose "original" side has the specified string and filepairs whose "result" side has the specified string and
whose "result" side does not. Such a filepair represents "the whose "origin" side does not. Such a filepair represents "the
string appeared in this changeset". It also checks for the string appeared in this changeset". It also checks for the
opposite case that loses the specified string. opposite case that loses the specified string.

7
sha1_file.c
View File

@ -2448,6 +2448,8 @@ int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object,
else else
ret = -1; ret = -1;
strbuf_release(&sbuf); strbuf_release(&sbuf);
} else if (!size) {
ret = index_mem(sha1, NULL, size, write_object, type, path);
} else if (size <= SMALL_FILE_SIZE) { } else if (size <= SMALL_FILE_SIZE) {
char *buf = xmalloc(size); char *buf = xmalloc(size);
if (size == read_in_full(fd, buf, size)) if (size == read_in_full(fd, buf, size))
@ -2456,12 +2458,11 @@ int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object,
else else
ret = error("short read %s", strerror(errno)); ret = error("short read %s", strerror(errno));
free(buf); free(buf);
} else if (size) { } else {
void *buf = xmmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0); void *buf = xmmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
ret = index_mem(sha1, buf, size, write_object, type, path); ret = index_mem(sha1, buf, size, write_object, type, path);
munmap(buf, size); munmap(buf, size);
} else }
ret = index_mem(sha1, NULL, size, write_object, type, path);
close(fd); close(fd);
return ret; return ret;
} }