Browse Source

Merge branch 'maint'

* maint:
  git-clone documentation didn't mention --origin as equivalent of -o
  Minor grammar fixes for git-diff-index.txt
  link_temp_to_file: call adjust_shared_perm() only when we created the directory
maint
Junio C Hamano 18 years ago
parent
commit
c954d33da1
  1. 1
      Documentation/git-clone.txt
  2. 4
      Documentation/git-diff-index.txt
  3. 3
      sha1_file.c

1
Documentation/git-clone.txt

@ -75,6 +75,7 @@ OPTIONS @@ -75,6 +75,7 @@ OPTIONS
this option is used, neither the `origin` branch nor the
default `remotes/origin` file is created.

--origin <name>::
-o <name>::
Instead of using the branch name 'origin' to keep track
of the upstream repository, use <name> instead. Note

4
Documentation/git-diff-index.txt

@ -54,7 +54,7 @@ If '--cached' is specified, it allows you to ask: @@ -54,7 +54,7 @@ If '--cached' is specified, it allows you to ask:

For example, let's say that you have worked on your working directory, updated
some files in the index and are ready to commit. You want to see exactly
*what* you are going to commit is without having to write a new tree
*what* you are going to commit, without having to write a new tree
object and compare it that way, and to do that, you just do

git-diff-index --cached HEAD
@ -68,7 +68,7 @@ matches my working directory. But doing a "git-diff-index" does: @@ -68,7 +68,7 @@ matches my working directory. But doing a "git-diff-index" does:
-100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c
+100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 git-commit.c

You can trivially see that the above is a rename.
You can see easily that the above is a rename.

In fact, "git-diff-index --cached" *should* always be entirely equivalent to
actually doing a "git-write-tree" and comparing that. Except this one is much

3
sha1_file.c

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

Loading…
Cancel
Save