Your message dated Wed, 16 Sep 2009 12:02:21 +0000
with message-id <[email protected]>
and subject line Bug#546499: fixed in git-core 1:1.6.4.3-1
has caused the Debian Bug report #546499,
regarding git-core source has mysterious changes outside debian/
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
546499: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=546499
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
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
--- End Message ---
--- Begin Message ---
Source: git-core
Source-Version: 1:1.6.4.3-1
We believe that the bug you reported is fixed in the latest version of
git-core, which is due to be installed in the Debian FTP archive:
git-arch_1.6.4.3-1_all.deb
to pool/main/g/git-core/git-arch_1.6.4.3-1_all.deb
git-core_1.6.4.3-1.diff.gz
to pool/main/g/git-core/git-core_1.6.4.3-1.diff.gz
git-core_1.6.4.3-1.dsc
to pool/main/g/git-core/git-core_1.6.4.3-1.dsc
git-core_1.6.4.3.orig.tar.gz
to pool/main/g/git-core/git-core_1.6.4.3.orig.tar.gz
git-cvs_1.6.4.3-1_all.deb
to pool/main/g/git-core/git-cvs_1.6.4.3-1_all.deb
git-daemon-run_1.6.4.3-1_all.deb
to pool/main/g/git-core/git-daemon-run_1.6.4.3-1_all.deb
git-doc_1.6.4.3-1_all.deb
to pool/main/g/git-core/git-doc_1.6.4.3-1_all.deb
git-email_1.6.4.3-1_all.deb
to pool/main/g/git-core/git-email_1.6.4.3-1_all.deb
git-gui_1.6.4.3-1_all.deb
to pool/main/g/git-core/git-gui_1.6.4.3-1_all.deb
git-svn_1.6.4.3-1_all.deb
to pool/main/g/git-core/git-svn_1.6.4.3-1_all.deb
gitk_1.6.4.3-1_all.deb
to pool/main/g/git-core/gitk_1.6.4.3-1_all.deb
gitweb_1.6.4.3-1_all.deb
to pool/main/g/git-core/gitweb_1.6.4.3-1_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Gerrit Pape <[email protected]> (supplier of updated git-core package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Wed, 16 Sep 2009 11:03:45 +0000
Source: git-core
Binary: git-core git-doc git-arch git-cvs git-svn git-email git-daemon-run
git-gui gitk gitweb
Architecture: all source
Version: 1:1.6.4.3-1
Distribution: unstable
Urgency: low
Maintainer: Gerrit Pape <[email protected]>
Changed-By: Gerrit Pape <[email protected]>
Description:
git-arch - fast, scalable, distributed revision control system (arch interop
git-core - fast, scalable, distributed revision control system
git-cvs - fast, scalable, distributed revision control system (cvs interope
git-daemon-run - fast, scalable, distributed revision control system
(git-daemon s
git-doc - fast, scalable, distributed revision control system (documentatio
git-email - fast, scalable, distributed revision control system (email add-on
git-gui - fast, scalable, distributed revision control system (GUI)
git-svn - fast, scalable, distributed revision control system (svn interope
gitk - fast, scalable, distributed revision control system (revision tre
gitweb - fast, scalable, distributed revision control system (web interfac
Closes: 536067 546499 546709
Changes:
git-core (1:1.6.4.3-1) unstable; urgency=low
.
* new upstream release (closes: #546709).
* git-cvsserver: no longer use deprecated 'git-subcommand' commands
(closes: #536067).
* branch debian-sid: git cherry-pick 098082f, 318b847, 1f9b620 (thx
Anders Kaseorg; closes: #546499).
Checksums-Sha1:
4e43ed6250b228f85274195a7507ff1c728a5455 1295 git-core_1.6.4.3-1.dsc
f7c951111d74a5ba0b37ddb4ca181b55e301a5a7 2628801 git-core_1.6.4.3.orig.tar.gz
86ae939f00b0f60beb357006f4b0070b20dce154 302419 git-core_1.6.4.3-1.diff.gz
8a26598e8a415fd5b490095ace965d145f86f4fc 1401850 git-doc_1.6.4.3-1_all.deb
5a52d64fb90829ef611073ab126a7ff8af4aef87 304754 git-arch_1.6.4.3-1_all.deb
bd124f5fced6e8f2cf9d3951b9b2bbeb3c179c40 368076 git-cvs_1.6.4.3-1_all.deb
b8898232235b9a759c86b5a09cb4cbc9bd6cef29 350490 git-svn_1.6.4.3-1_all.deb
6be9852b16d05b35e6a420bb1979ed9e6c3fc2e3 291096
git-daemon-run_1.6.4.3-1_all.deb
c384ead75687740bf521c8a2599f0a4489987ede 306368 git-email_1.6.4.3-1_all.deb
9dfcb9f877c99614d9ba604011823928180cb190 527946 git-gui_1.6.4.3-1_all.deb
46fdff48160fa4d0c7ee9a9135013437bb8277cb 392160 gitk_1.6.4.3-1_all.deb
5270d17e32845f680afa56459aaf2d60e2114a58 352668 gitweb_1.6.4.3-1_all.deb
Checksums-Sha256:
5d4935914da68322b90ce5058188d0aaabc527b9683b0ab9f41b762b5fe416a3 1295
git-core_1.6.4.3-1.dsc
ca9adf70711b659e981e9c86e5ef8809c2084e9186acf44583978aa4e95718fa 2628801
git-core_1.6.4.3.orig.tar.gz
247f5de906e757e31169bc0caa6825733af7cb091b1f400050bb4bb5333e1f31 302419
git-core_1.6.4.3-1.diff.gz
d8aa7f822a86b7addafd87766ea837caa4025922a84f58fdcf4d8b6647c5ea8b 1401850
git-doc_1.6.4.3-1_all.deb
8067f020a7bd084a9405ef0a39188574a85afa4c8d78f4cb2f6bd7568b6cd0ff 304754
git-arch_1.6.4.3-1_all.deb
d88475bd4ec7cce5f0f0b6aa09b9863fc66dd53ba5b3ef170250a4836839d74d 368076
git-cvs_1.6.4.3-1_all.deb
5c88a485be699670545a62f169d47c0146efdd83291fcad71491611b81a266a0 350490
git-svn_1.6.4.3-1_all.deb
f6e6340bcc8b52af264674022ce9896cd12afc9419a63622d43953d39209a0b3 291096
git-daemon-run_1.6.4.3-1_all.deb
2af76182ff22c75324e199bb8a919097b91469463318b8c35cc8ccf3fd1d5b6a 306368
git-email_1.6.4.3-1_all.deb
c3317a7b9381e8ad5aa919144bfa8cd78536ecc6d04e167e8b3a2e4ecc2770e5 527946
git-gui_1.6.4.3-1_all.deb
d5581df17b6c94ee5363336c7d83bf362dab02c13c661bed3b542ef2ce270e3a 392160
gitk_1.6.4.3-1_all.deb
853a6ffc4c3917365e7de3efe7abae9d91c4fd970e4116bef5cc004f4aa2697b 352668
gitweb_1.6.4.3-1_all.deb
Files:
c21c98da186b315842806139afed5a74 1295 vcs optional git-core_1.6.4.3-1.dsc
95381cd27ad762c645c8e07f922879ce 2628801 vcs optional
git-core_1.6.4.3.orig.tar.gz
1948230d078c935528f8067dafc646a5 302419 vcs optional git-core_1.6.4.3-1.diff.gz
687d5cc3554c32e944876b6049f88015 1401850 doc optional git-doc_1.6.4.3-1_all.deb
b8e39d0caacf798b93ac346d1d80a713 304754 vcs optional git-arch_1.6.4.3-1_all.deb
36f95ca67b263b537e731560b96123e6 368076 vcs optional git-cvs_1.6.4.3-1_all.deb
f507b7782f7d073b9f20467d83722012 350490 vcs optional git-svn_1.6.4.3-1_all.deb
45628c58d0556efcbe1e98724aba8e01 291096 vcs optional
git-daemon-run_1.6.4.3-1_all.deb
69f49df875aeef2785501a5325b5cc52 306368 vcs optional
git-email_1.6.4.3-1_all.deb
68dd8051a63070c312846b246b01542b 527946 vcs optional git-gui_1.6.4.3-1_all.deb
4ff32b9e9dc1a746965fafd181fb23fc 392160 vcs optional gitk_1.6.4.3-1_all.deb
fb31423292037cf9c7476078c750e867 352668 vcs optional gitweb_1.6.4.3-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFKsNCGGJoyQbxwpv8RAqjlAKCjwFjOI4vyVOn04U/bRqTh6MwatgCfUB8W
xW0JfgDAqytyPWbssQanRvI=
=gR9o
-----END PGP SIGNATURE-----
--- End Message ---
