допоможіть нашому сайту http://schoolsite.pp.ua/ - будь ласка, відкрийте його для перегляду однієї-двох сторінок

2015-10-06 Thread admin
Доброго дня, будь ласка, просимо переглянути наш сайт, якщо це не важко для вас, http://schoolsite.pp.ua/ - будь ласка, відкрийте його для перегляду однієї-двох сторінок, і на будь-якій сторінці один раз натисніть на рекламний банер, який вам найбільш цікавий, це Ваша допомога, щоб ми могли

Re: [PATCH 8/9] branch: use ref-filter printing APIs

2015-10-06 Thread Karthik Nayak
On Tue, Oct 6, 2015 at 12:13 AM, Matthieu Moy wrote: > Karthik Nayak writes: > >> On Sat, Oct 3, 2015 at 6:11 PM, Matthieu Moy >> wrote: >>> Actually, this is not a performance-cricical piece of code at all, so I

Re: [PATCH] pretend_sha1_file(): Change return type from int to void

2015-10-06 Thread Johannes Schindelin
Hi Tobias, On 2015-10-06 15:51, Tobias Klauser wrote: > On 2015-10-06 at 15:16:12 +0200, Johannes Schindelin > wrote: >> >> On 2015-10-06 14:15, Tobias Klauser wrote: >> > prented_sha1_file() always returns 0 and its only callsite in >> > builtin/blame.c doesn't use

Re: [PATCH] gitk: l10n: Update Catalan translation

2015-10-06 Thread Alex Henrie
2015-10-05 23:38 GMT-06:00 Junio C Hamano : > Alex Henrie writes: > >> The gitk included in git 2.6.0 crashes if run from a Catalan locale. >> I'm hoping that a translation update will fix this. > > I seriously hope that l10n files would not "crash"

Re: Unable to get GIT GUI to start on Windows XP - Git-1.9.4-preview20140929

2015-10-06 Thread Johannes Schindelin
Hi Mr Ithia, On 2015-10-06 15:49, Mr Tava Ithia wrote: > Dear Support Not quite... This is an Open Source project, not a paid-for support ;-) > Can you please assist me, as I've got this issue starting up GIT GUI on > Windows XP, Service Pack 3 Have you tried the current Git for Windows

Re: [BUG?] parallel make interdepencies

2015-10-06 Thread Michael J Gruber
John Keeping venit, vidit, dixit 06.10.2015 15:33: > On Tue, Oct 06, 2015 at 03:13:05PM +0200, Johannes Schindelin wrote: >> Hi Michael, >> >> On 2015-10-06 10:12, Michael J Gruber wrote: >>> "make -j3" just errored out on me, a follow-up "make" succeeded". This >>> looks like an interdependency

Re: [PATCH v2 40/43] refs: allow ref backend to be set for clone

2015-10-06 Thread David Turner
On Mon, 2015-10-05 at 21:58 -0400, Jeff King wrote: > On Mon, Oct 05, 2015 at 09:29:37PM -0400, David Turner wrote: > > > > Therefore, I don't think this can be merged without a bump to > > > core.repositoryformatversion. Such a bump will tell well-behaved older > > > Git clients keep their hands

Re: What's cooking in git.git (Oct 2015, #01; Mon, 5)

2015-10-06 Thread Mike Rappazzo
On Tue, Oct 6, 2015 at 1:55 AM, Junio C Hamano wrote: > Torsten Bögershausen writes: > >> Minor comment from my compiler: >> >> worktree.c:181: warning: assuming signed overflow does not occur when >> assuming >> that (X + c) > X is always true > > Thanks; I

Re: [PATCH v2 34/43] refs.c: make struct ref_transaction generic

2015-10-06 Thread David Turner
On Tue, 2015-10-06 at 10:43 -0700, Michael Blume wrote: > This triggers a lot of build warnings on my mac, basically in every > file that uses refs.h: > > CC archive.o > In file included from archive.c:2: > ./refs.h:635:16: warning: redefinition of typedef > 'ref_transaction_free_fn' is a C11

Re: [PATCH 6/9] ref-filter: introduce format_ref_array_item()

2015-10-06 Thread Karthik Nayak
On Mon, Oct 5, 2015 at 2:19 PM, Matthieu Moy wrote: > Karthik Nayak writes: >> which does not play well with the implementation of --column as done >> in tag.c. Where, If I'm not wrong the --column option captures all >> output, formats it and

Re: [PATCH 6/9] ref-filter: introduce format_ref_array_item()

2015-10-06 Thread Matthieu Moy
Karthik Nayak writes: > On Mon, Oct 5, 2015 at 2:19 PM, Matthieu Moy > wrote: >> Karthik Nayak writes: >>> which does not play well with the implementation of --column as done >>> in tag.c. Where, If I'm not wrong the

Re: git interactive rebase bug?

2015-10-06 Thread Matthieu Moy
Jacob Keller writes: > I've been experiencing a very annoying bug when performing interactive > rebases. The rebase process will stall after I close the editor, and I > have to kill the process and then restart the rebase using "git rebase > --continue" > > I am not sure

Re: What's cooking in git.git (Oct 2015, #01; Mon, 5)

2015-10-06 Thread Matthieu Moy
Junio C Hamano writes: > Torsten Bögershausen writes: > >> On 06.10.15 00:59, Junio C Hamano wrote: >>> * gr/rebase-i-drop-warn (2015-10-02) 2 commits >>> - rebase-i: loosen over-eager check_bad_cmd check >>> - rebase-i: explicitly accept tab as separator in

Re: [BUG?] parallel make interdepencies

2015-10-06 Thread Philip Oakley
From: "John Keeping" On Tue, Oct 06, 2015 at 03:13:05PM +0200, Johannes Schindelin wrote: Hi Michael, On 2015-10-06 10:12, Michael J Gruber wrote: > "make -j3" just errored out on me, a follow-up "make" succeeded". This > looks like an interdependency issue, but I don't

[PATCH] error message typo fixes: unkown -> unknown

2015-10-06 Thread David Turner
Fix two instances of a typo in user-visible error messages. Signed-off-by: David Turner --- connect.c | 2 +- sha1_file.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/connect.c b/connect.c index ced4961..d3283b8 100644 --- a/connect.c +++

Re: [PATCH 6/9] ref-filter: introduce format_ref_array_item()

2015-10-06 Thread Karthik Nayak
On Wed, Oct 7, 2015 at 1:08 AM, Matthieu Moy wrote: > Karthik Nayak writes: > >> On Mon, Oct 5, 2015 at 2:19 PM, Matthieu Moy >> wrote: >>> Karthik Nayak writes: which does not play

Clarification on Submodule/Subproject naming

2015-10-06 Thread Stefan Beller
So a discussing started in a Gerrit change [1] if we want to name it submodule or subproject. We decided to stick with the git core convention of naming it subproject for now. But that lead me to the question: What is the difference of a submodule and a subproject? As far as I can tell they are

Re: Clarification on Submodule/Subproject naming

2015-10-06 Thread Jacob Keller
On Tue, Oct 6, 2015 at 3:00 PM, Stefan Beller wrote: > So a discussing started in a Gerrit change [1] if we want to name it > submodule or subproject. > We decided to stick with the git core convention of naming it > subproject for now. > > But that lead me to the question:

Re: [PATCH] completion: fix completion after 'git -C path'

2015-10-06 Thread Michael J Gruber
SZEDER Gábor venit, vidit, dixit 05.10.2015 14:02: > The main completion function finds the name of the git command by > iterating through all the words on the command line in search for the > first non-option-looking word. As it is not aware of 'git -C's > mandatory path argument, if the '-C

[BUG?] parallel make interdepencies

2015-10-06 Thread Michael J Gruber
"make -j3" just errored out on me, a follow-up "make" succeeded". This looks like an interdependency issue, but I don't know how to track it: GEN git-web--browse GEN git-add--interactive GEN git-difftool mv: der Aufruf von stat für „perl.mak“ ist nicht möglich: Datei oder Verzeichnis

Re: [PATCH v2 42/43] refs: add LMDB refs backend

2015-10-06 Thread David Turner
On Mon, 2015-10-05 at 17:47 +0200, Michael Haggerty wrote: > On 09/29/2015 12:02 AM, David Turner wrote: > > Add a database backend for refs using LMDB. This backend runs git > > for-each-ref about 30% faster than the files backend with fully-packed > > refs on a repo with ~120k refs. It's also

[PATCH] log: Update log.follow doc and add to config.txt

2015-10-06 Thread Eric N. Vander Weele
Documentation/config.txt does not include the documentation for log.follow that is in Documentation/git-log.txt. This commit adds the log.follow documentation to config.txt and also updates the wording to be consistent with the format that is followed by other boolean configuration variables.

Re: [PATCH] log: Update log.follow doc and add to config.txt

2015-10-06 Thread David Turner
On Tue, 2015-10-06 at 21:14 -0400, Eric N. Vander Weele wrote: > Documentation/config.txt does not include the documentation for > log.follow that is in Documentation/git-log.txt. This commit adds the > log.follow documentation to config.txt and also updates the wording to > be consistent with

Re: git rev-list --all --reflog does not include worktree references

2015-10-06 Thread Michael J Gruber
Andreas Schwab venit, vidit, dixit 05.10.2015 21:08: > When running git rev-list --all --reflog in the main worktree it doesn't > include commits only referenced by the worktrees, neither HEAD nor its > reflog. HEAD is per worktree, so other worktrees' HEADs should not be included in "--all", I

Re: [PATCH] completion: fix completion after 'git -C path'

2015-10-06 Thread SZEDER Gábor
Quoting Michael J Gruber : SZEDER Gábor venit, vidit, dixit 05.10.2015 14:02: The main completion function finds the name of the git command by iterating through all the words on the command line in search for the first non-option-looking word. As it is not aware

[PATCH] t2026: rename worktree prune test

2015-10-06 Thread Michael J Gruber
Linked checkouts are known under the name worktree, now. Rename the test accordingly. Specifically, this avoids the confusion that t2026 is actually not about pruning in or with linked checkouts aka worktress but about pruning worktrees, i.e. about "git worktree prune" rather than "git prune".

git diff --check in a bare repository

2015-10-06 Thread Andrei Neculau
Hello I am using "git diff --check" on the "server-side" (i.e. in a bare repository as part of a git hook) with a .gitattributes rule saying *.md text whitespace=-trailing-space # notice the - in front of trailing I can check that the attribute is set/read correctly thanks to another thread on

[PATCH v3 1/2] gc: demonstrate failure with stale remote HEAD

2015-10-06 Thread Johannes Schindelin
Signed-off-by: Johannes Schindelin --- t/t6500-gc.sh | 13 + 1 file changed, 13 insertions(+) diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh index 63194d8..9a3a285 100755 --- a/t/t6500-gc.sh +++ b/t/t6500-gc.sh @@ -30,4 +30,17 @@ test_expect_success 'gc -h

Unable to get GIT GUI to start on Windows XP - Git-1.9.4-preview20140929

2015-10-06 Thread Mr Tava Ithia
Dear Support Can you please assist me, as I've got this issue starting up GIT GUI on Windows XP, Service Pack 3 Whenever I try to start-up GIT GUI, I get the following error message "Error in startup script", please see below. Error in startup script unable to open key: The system cannot

Re: [BUG?] parallel make interdepencies

2015-10-06 Thread John Keeping
On Tue, Oct 06, 2015 at 03:13:05PM +0200, Johannes Schindelin wrote: > Hi Michael, > > On 2015-10-06 10:12, Michael J Gruber wrote: > > "make -j3" just errored out on me, a follow-up "make" succeeded". This > > looks like an interdependency issue, but I don't know how to track it: > > > >

Re: [PATCH] pretend_sha1_file(): Change return type from int to void

2015-10-06 Thread Johannes Schindelin
Hi Tobias, On 2015-10-06 14:15, Tobias Klauser wrote: > prented_sha1_file() always returns 0 and its only callsite in > builtin/blame.c doesn't use the return value, so change the return type > to void. While this commit message is technically correct, it would appear that there are some things

[PATCH v3 0/4] Fix locking issues on Windows with `git clone --dissociate`

2015-10-06 Thread Johannes Schindelin
This is version 3, adding that BUG! message if do_not_close was set. Max, I still hope that this patch series helps also your use case! Interdiff below the diffstat. Johannes Schindelin (4): Demonstrate a Windows file locking issue with `git clone --dissociate` Consolidate code to close a

[PATCH] pretend_sha1_file(): Change return type from int to void

2015-10-06 Thread Tobias Klauser
prented_sha1_file() always returns 0 and its only callsite in builtin/blame.c doesn't use the return value, so change the return type to void. Signed-off-by: Tobias Klauser --- cache.h | 2 +- sha1_file.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff

[PATCH v3 3/4] Add a function to release all packs

2015-10-06 Thread Johannes Schindelin
On Windows, files that are in use cannot be removed or renamed. That means that we have to release pack files when we are about to, say, repack them. Let's introduce a convenient function to close them pack files. While at it, we consolidate the close windows/close fd/close index stanza in

[PATCH v3 2/4] Consolidate code to close a pack's file descriptor

2015-10-06 Thread Johannes Schindelin
There was a lot of repeated code to close the file descriptor of a given pack. Let's just refactor this code into a single function. Signed-off-by: Johannes Schindelin --- sha1_file.c | 38 ++ 1 file changed, 18 insertions(+), 20

[PATCH v3 4/4] clone --dissociate: avoid locking pack files

2015-10-06 Thread Johannes Schindelin
When `git clone` is asked to dissociate the repository from the reference repository whose objects were used, it is quite possible that the pack files need to be repacked. In that case, the pack files need to be deleted that were originally hard-links to the reference repository's pack files. On

[PATCH v3 1/4] Demonstrate a Windows file locking issue with `git clone --dissociate`

2015-10-06 Thread Johannes Schindelin
On Windows, dissociating from a reference can fail very easily due to pack files that are still in use when they want to be removed. Signed-off-by: Johannes Schindelin --- t/t5700-clone-reference.sh | 21 + 1 file changed, 21 insertions(+) diff

Re: [PATCH] pretend_sha1_file(): Change return type from int to void

2015-10-06 Thread Tobias Klauser
Hi Johannes Thanks for your feedback. On 2015-10-06 at 15:16:12 +0200, Johannes Schindelin wrote: > Hi Tobias, > > On 2015-10-06 14:15, Tobias Klauser wrote: > > prented_sha1_file() always returns 0 and its only callsite in > > builtin/blame.c doesn't use the

Re: [PATCH v2 4/4] gc: remove broken symrefs

2015-10-06 Thread Johannes Schindelin
Hi Junio, On 2015-10-06 00:06, Junio C Hamano wrote: > Johannes Schindelin writes: > >> Oh, I appreciate your feedback. I am actually not all *that* certain >> that removing the broken symref is the correct thing. It is this sort >> of fruitful exchange that allows

Branch information (git branch/status) inconsistent when in detached HEAD state

2015-10-06 Thread Stijn De Ruyck
Hello, Consider a repository with a develop branch tracking origin/develop and where HEAD = 545a36f = develop = origin/develop. Tested with Git 2.4.3 and 1.8.3.4 on Linux. 1) git checkout develop 2) git branch | head -1 (or git status) * develop 3) git checkout origin/develop Note: checking out

[PATCH v3 0/2] Fix gc failure when a remote HEAD goes stale

2015-10-06 Thread Johannes Schindelin
There has been a report in the Git for Windows project that gc fails sometimes: https://github.com/git-for-windows/git/issues/423 It turns out that there are cases when a remote HEAD can go stale and it is not the user's fault at all. It can happen, for example, if the active branch in the remote

[PATCH v3 2/2] pack-objects: do not get distracted by broken symrefs

2015-10-06 Thread Johannes Schindelin
It is quite possible for, say, a remote HEAD to become broken, e.g. when the default branch was renamed. We should still be able to pack our objects when such a thing happens; simply ignore broken symrefs (because they cannot matter for the packing process anyway). This fixes

Git mv does not work with recursive submodules

2015-10-06 Thread Bart Bogaerts
For a complete description of this bug, see http://stackoverflow.com/questions/32782382/git-moving-submodules-recursively-nested-submodules/32924692?noredirect=1#comment53760394_32924692 -- Bart Bogaerts -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message

Re: [PATCH v2 2/4] Consolidate code to close a pack's file descriptor

2015-10-06 Thread Johannes Schindelin
Hi Junio, On 2015-10-06 00:15, Junio C Hamano wrote: > Johannes Schindelin writes: > + && !p->do_not_close) + close_pack_fd(p); >>> >>> I wonder how this do_not_close bit should interact with "we are >>>

Re: [BUG?] parallel make interdepencies

2015-10-06 Thread Johannes Schindelin
Hi Michael, On 2015-10-06 10:12, Michael J Gruber wrote: > "make -j3" just errored out on me, a follow-up "make" succeeded". This > looks like an interdependency issue, but I don't know how to track it: > > GEN git-web--browse > GEN git-add--interactive > GEN git-difftool > mv: der

Re: git interactive rebase bug?

2015-10-06 Thread Jacob Keller
On Mon, Oct 5, 2015 at 11:53 PM, Matthieu Moy wrote: > Jacob Keller writes: > >> I've been experiencing a very annoying bug when performing interactive >> rebases. The rebase process will stall after I close the editor, and I >> have to kill

Re: [PATCH v2 34/43] refs.c: make struct ref_transaction generic

2015-10-06 Thread Michael Blume
This triggers a lot of build warnings on my mac, basically in every file that uses refs.h: CC archive.o In file included from archive.c:2: ./refs.h:635:16: warning: redefinition of typedef 'ref_transaction_free_fn' is a C11 feature [-Wtypedef-redefinition] typedef void