Source: git-core
Version: 1:1.6.3~rc3-1
Tags: patch
The git-core .diff.gz has some changes outside of debian/, introduced by
commit 57578158b8527053f405d5bced1b418b87cbba82, which was a merge of
v1.6.3-rc3 into debian-1.6.3_rc1-1.
Because v1.6.2.4 was an ancestor of both debian-1.6.3_rc1-1 (via
debian-1.6.2.4-1) and v1.6.3-rc3, while it was not an ancestor of
v1.6.3-rc1, git used the wrong merge base to construct the merge. This
caused the following changes to be lost:
098082f Update docs on behaviour of 'core.sharedRepository' and 'git init
--shared'
Documentation/config.txt | 6 ++++--
Documentation/git-init.txt | 16 +++++++++++-----
318b847 Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins
Makefile | 2 --
1f9b620 GIT 1.6.2.4
Documentation/RelNotes-1.6.2.4.txt | 10 +++++++++-
GIT-VERSION-GEN | 2 +-
This patch restores the affected files from upstream (generated by `git
checkout upstream -- Documentation Makefile`):
diff --git a/Documentation/RelNotes-1.6.2.4.txt
b/Documentation/RelNotes-1.6.2.4.txt
index 21bf4f3..f4bf1d0 100644
--- a/Documentation/RelNotes-1.6.2.4.txt
+++ b/Documentation/RelNotes-1.6.2.4.txt
@@ -7,9 +7,17 @@ Fixes since v1.6.2.3
* The configuration parser had a buffer overflow while parsing an overlong
value.
+* pruning reflog entries that are unreachable from the tip of the ref
+ during "git reflog prune" (hence "git gc") was very inefficient.
+
+* "git-add -p" lacked a way to say "q"uit to refuse staging any hunks for
+ the remaining paths. You had to say "d" and then ^C.
+
* "git-checkout <tree-ish> <submodule>" did not update the index entry at
the named path; it now does.
+* "git-fast-export" choked when seeing a tag that does not point at commit.
+
* "git init" segfaulted when given an overlong template location via
the --template= option.
@@ -27,5 +35,5 @@ Many small documentation updates are included as well.
---
exec >/var/tmp/1
echo O=$(git describe maint)
-O=v1.6.2.3-21-ga51609a
+O=v1.6.2.3-38-g318b847
git shortlog --no-merges $O..maint
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9297a85..5dcad94 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -295,8 +295,10 @@ core.sharedRepository::
group-shareable. When 'umask' (or 'false'), git will use permissions
reported by umask(2). When '0xxx', where '0xxx' is an octal number,
files in the repository will have this mode value. '0xxx' will override
- user's umask value, and thus, users with a safe umask (0077) can use
- this option. Examples: '0660' is equivalent to 'group'. '0640' is a
+ user's umask value (whereas the other options will only override
+ requested parts of the user's umask value). Examples: '0660' will make
+ the repo read/write-able for the owner and group, but inaccessible to
+ others (equivalent to 'group' unless umask is e.g. '0022'). '0640' is a
repository that is group-readable but not group-writable.
See linkgit:git-init[1]. False by default.
diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
index 71749c0..7151d12 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -54,15 +54,21 @@ is given:
- 'group' (or 'true'): Make the repository group-writable, (and g+sx, since
the git group may be not the primary group of all users).
+ This is used to loosen the permissions of an otherwise safe umask(2) value.
+ Note that the umask still applies to the other permission bits (e.g. if
+ umask is '0022', using 'group' will not remove read privileges from other
+ (non-group) users). See '0xxx' for how to exactly specify the repository
+ permissions.
- 'all' (or 'world' or 'everybody'): Same as 'group', but make the repository
readable by all users.
- - '0xxx': '0xxx' is an octal number and each file will have mode '0xxx'
- Any option except 'umask' can be set using this option. '0xxx' will
- override users umask(2) value, and thus, users with a safe umask (0077)
- can use this option. '0640' will create a repository which is group-readable
- but not writable. '0660' is equivalent to 'group'.
+ - '0xxx': '0xxx' is an octal number and each file will have mode '0xxx'.
+ '0xxx' will override users' umask(2) value (and not only loosen permissions
+ as 'group' and 'all' does). '0640' will create a repository which is
+ group-readable, but not group-writable or accessible to others. '0660' will
+ create a repo that is readable and writable to the current user and group,
+ but inaccessible to others.
By default, the configuration flag receive.denyNonFastForwards is enabled
in shared repositories, so that you cannot force a non fast-forwarding push
diff --git a/Makefile b/Makefile
index c9ee11c..d21b4eb 100644
--- a/Makefile
+++ b/Makefile
@@ -330,7 +330,6 @@ EXTRA_PROGRAMS =
# ... and all the rest that could be moved out of bindir to gitexecdir
PROGRAMS += $(EXTRA_PROGRAMS)
PROGRAMS += git-fast-import$X
-PROGRAMS += git-fetch-pack$X
PROGRAMS += git-hash-object$X
PROGRAMS += git-index-pack$X
PROGRAMS += git-merge-index$X
@@ -339,7 +338,6 @@ PROGRAMS += git-mktag$X
PROGRAMS += git-mktree$X
PROGRAMS += git-pack-redundant$X
PROGRAMS += git-patch-id$X
-PROGRAMS += git-send-pack$X
PROGRAMS += git-shell$X
PROGRAMS += git-show-index$X
PROGRAMS += git-unpack-file$X
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
