Re: Accept-language test fails on Mac OS

2014-12-06 Thread Torsten Bögershausen
On 2014-12-06 00.01, Michael Blume wrote: On Fri, Dec 5, 2014 at 2:51 PM, Junio C Hamano gits...@pobox.com wrote: Michael Blume blume.m...@gmail.com writes: Test #25 'git client sends Accept-Language based on LANGUAGE, LC_ALL, LC_MESSAGES and LANG' in t5550 fails consistently on my mac, and

Cannot reset a repo

2014-12-06 Thread Martin Wendt
Hi, I am facing this problem: - Using git version 1.9.3 (Apple Git-50) - cloned a fork from GitHub to my local machine: https://github.com/mar10/cdnjs/ - This repo seems to be broken in some way. At least it is not clean from the beginning and I am not able to reset `git reset

Re: Cannot reset a repo

2014-12-06 Thread Torsten Bögershausen
On 2014-12-06 11.27, Martin Wendt wrote: Hi, I am facing this problem: - Using git version 1.9.3 (Apple Git-50) - cloned a fork from GitHub to my local machine: https://github.com/mar10/cdnjs/ - This repo seems to be broken in some way. At least it is not clean from the

How to repair a shallow clone (?)

2014-12-06 Thread Torsten Bögershausen
I share a bare repo with Sparkleshare which does an auto-synch. Now the synch had stopped, and trying to push to the central repo by hand gives this: git push origin master fatal: protocol error: expected old/new/ref, got 'shallow 72fb4080921221293e28a97a0e8c78d6100c5186' fatal: The remote

Fetching a specific commit by commit ID

2014-12-06 Thread Olivier Croquette
Hello everyone, I am trying to fetch a commit using a commit ID instead of a reference. According to the documentation of git-fetch, this is not supported, but I found out that this is not entirely true. If the commit is already available in the repository, I get: $ git fetch origin

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-06 Thread Jens Lehmann
Am 05.12.2014 um 02:33 schrieb Duy Nguyen: On Fri, Dec 5, 2014 at 3:06 AM, Jens Lehmann jens.lehm...@web.de wrote: Wow, so the .git/config is shared between all worktrees? I suspect you have very good reasons for that, most of config vars are at repo-level, not worktree-level, except maybe

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-06 Thread Jens Lehmann
Am 05.12.2014 um 07:32 schrieb Max Kirillov: On Thu, Dec 4, 2014 at 10:06 PM, Jens Lehmann jens.lehm...@web.de wrote: But I'd need to have separate settings for our CI server, e.g. to checkout the sources without the largish documentation submodule in one test job (=worktree) while checking out

Re: bug report on update-index --assume-unchanged

2014-12-06 Thread Philip Oakley
From: Sérgio Basto ser...@serjux.com [..] Part of the implied question is why git commit . would notice when when git commit -a didn't appear to. So it's unclear as to what the user should have expected. I agree with this sentence, this is a bug because: git commit -a ( and -a means all ) is

[PATCH v2] doc: make clear --assume-unchanged's user contract

2014-12-06 Thread Philip Oakley
Many users misunderstand the --assume-unchanged contract, believing it means Git won't look at the flagged file. Be explicit that the --assume-unchanged contract is by the user that they will NOT change the file so that Git does not need to look (and expend, for example, lstat(2) cycles)

[PATCH v2] Improve --assume-unchanged in the git update-index man page

2014-12-06 Thread Philip Oakley
This version 2 patch squashes in Junio's comments ($gmane/260915) and tidies up the commit message. Previous series at $gmane/260901. In $gmane/260837 the --assume-unchanged flag was reported as buggy because of a misunderstanding about what it is being promised. This clarifies the current

Re: Fetching a specific commit by commit ID

2014-12-06 Thread brian m. carlson
On Sat, Dec 06, 2014 at 01:39:12PM +0100, Olivier Croquette wrote: That brings up following questions/remarks: - the documentation of git-fetch is not entirely correct, commit ids are partially supported, not only refs This isn't completely true. What you're seeing here is that git fetch

Re: Cannot reset a repo

2014-12-06 Thread Martin Wendt
Am 06.12.2014 um 13:14 schrieb Torsten Bögershausen tbo...@web.de: On 2014-12-06 11.27, Martin Wendt wrote: Hi, I am facing this problem: - Using git version 1.9.3 (Apple Git-50) - cloned a fork from GitHub to my local machine: https://github.com/mar10/cdnjs/ - This repo seems to

Re: Enhancement Request: locale git option

2014-12-06 Thread Ralf Thielow
2014-12-05 16:45 GMT+01:00 Torsten Bögershausen tbo...@web.de: I do not know who was first, and who came later, but http://git-scm.com/book/de/v1/Git-Grundlagen-%C3%84nderungen-am-Repository-nachverfolgen uses versioniert as tracked LANG=de_DE.UTF-8 git status gives: nichts zum Commit

[PATCH] l10n: de.po: translate track as versionieren

2014-12-06 Thread Ralf Thielow
Suggested-by: Torsten Bögershausen tbo...@web.de Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 40 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/po/de.po b/po/de.po index 5a93ea8..bf11225 100644 --- a/po/de.po +++

Re: [PATCH] l10n: de.po: translate track as versionieren

2014-12-06 Thread phillip
Hi, for my feeling Beobachten is better then Versionieren. Its more natural and easier to understand, but okey ;) Phillip On 6 December 2014 20:28:49 CET, Ralf Thielow ralf.thie...@gmail.com wrote: Suggested-by: Torsten Bögershausen tbo...@web.de Signed-off-by: Ralf Thielow

[PATCH v2 1/2] send-email: align RFC 2047 decoding more closely with the spec

2014-12-06 Thread Роман Донченко
More specifically: * Add \ to the list of characters not allowed in a token (see RFC 2047 errata). * Share regexes between unquote_rfc2047 and is_rfc2047_quoted. Besides removing duplication, this also makes unquote_rfc2047 more stringent. * Allow both q and Q to identify the encoding. *

[PATCH v2 2/2] send-email: handle adjacent RFC 2047-encoded words properly

2014-12-06 Thread Роман Донченко
The RFC says that they are to be concatenated after decoding (i.e. the intervening whitespace is ignored). --- git-send-email.perl | 26 -- t/t9001-send-email.sh | 7 +++ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/git-send-email.perl

Re: [PATCH] l10n: de.po: translate track as versionieren

2014-12-06 Thread Ralf Thielow
Hi Phillip Am 6. Dezember 2014 um 20:34 schrieb phillip phillip.sze...@gmail.com: Hi, for my feeling Beobachten is better then Versionieren. Its more natural and easier to understand, but okey ;) I think it's OK as Git is all about versioning content. In other cases beobachten might be

Re: Accept-language test fails on Mac OS

2014-12-06 Thread Yi, EungJun
Could you tell me your locale information from executing 'locale' command and the verbose message you can get by accessing any git repository via HTTP protocol? (e.g. GIT_CURL_VERBOSE=1 git clone http://github.com/foo/bar ) I think the failures are related with your locale information. On Sat,

Re: Accept-language test fails on Mac OS

2014-12-06 Thread Torsten Bögershausen
On 2014-12-06 20.44, Yi, EungJun wrote: Could you tell me your locale information from executing 'locale' command and the verbose message you can get by accessing any git repository via HTTP protocol? (e.g. GIT_CURL_VERBOSE=1 git clone http://github.com/foo/bar ) locale -a C C.UTF-8 en_US.utf8

[PATCH] git-svn: propset support v2

2014-12-06 Thread Alfred Perlstein
I have incorporated Eric Wong's feedback into the git-svn propset support patch. Issues resolved: 1) Test-case written. 2) Remove dead code. 3) Use shorter vars for formatting. 4) Fix bool comparisons. 5) Check for filesystem errors on write to .gitattribute file. 6) Use command_output_pipe()

[PATCH] git-svn: Support for git-svn propset

2014-12-06 Thread Alfred Perlstein
This change allows git-svn to support setting subversion properties. Very useful for manually setting properties when committing to a subversion repo that *requires* properties to be set without requiring moving your changeset to separate subversion checkout in order to set props. This change is

Re: How to repair a shallow clone (?)

2014-12-06 Thread Trần Ngọc Quân
On 06/12/2014 19:23, Torsten Bögershausen wrote: I think I started to clone the repo in a shallow way (SparkleShare asked if I want to clone the complete history, and I probably answered no ) Is there a way to repair this situation ? (Except doing a complete re-clone ?) I think git don't

RE: FW: [cygwin] Cygwin's git says error: failed to read delta-pack base object

2014-12-06 Thread Jason Pyeron
TLDR = Cygwin remote filesystem sometimes has strange failures - workaround is to use rename, not link/unlink; see https://github.com/pdinc-oss/git/commit/5a36824ed01d4335148ca3846e75cc99c11650e2 -Original Message- From: Jason Pyeron Sent: Friday, December 05, 2014 10:30

Re: [PATCH] introduce git root

2014-12-06 Thread Christian Couder
On Fri, Dec 5, 2014 at 10:27 AM, Jeff King p...@peff.net wrote: On Fri, Dec 05, 2014 at 03:27:17AM +0100, Christian Couder wrote: I do not think git var --exec-path is a good idea, nor GIT_EXEC_PATH for the environment-variable confusion you mentioned. I was thinking of just creating a new

Re: [PATCH] git-svn: Support for git-svn propset

2014-12-06 Thread Eric Wong
Alfred Perlstein alf...@freebsd.org wrote: This change allows git-svn to support setting subversion properties. Very useful for manually setting properties when committing to a subversion repo that *requires* properties to be set without requiring moving your changeset to separate subversion

Re: [PATCH] git-svn: Support for git-svn propset

2014-12-06 Thread Torsten Bögershausen
diff --git a/t/t9148-git-svn-propset.sh b/t/t9148-git-svn-propset.sh new file mode 100755 index 000..b36a8a2 --- /dev/null +++ b/t/t9148-git-svn-propset.sh @@ -0,0 +1,71 @@ +#!/bin/sh +# +# Copyright (c) 2014 Alfred Perlstein +# + +test_description='git svn propset tests' + +.

Re: [PATCH/RFC v2] Squashed changes for multiple worktrees vs. submodules

2014-12-06 Thread Max Kirillov
On Sat, Dec 06, 2014 at 02:06:08PM +0100, Jens Lehmann wrote: Am 05.12.2014 um 07:32 schrieb Max Kirillov: Currently I'm estimating approach when submodules which have .git file or directory inside are updated, and those which do not have it are not. I have added a config variable

Re: Accept-language test fails on Mac OS

2014-12-06 Thread Yi, EungJun
Thank you for providing useful information to fix the failures. On Sun, Dec 7, 2014 at 6:04 AM, Torsten Bögershausen tbo...@web.de wrote: On 2014-12-06 20.44, Yi, EungJun wrote: Could you tell me your locale information from executing 'locale' command and the verbose message you can get by

Re: Accept-language test fails on Mac OS

2014-12-06 Thread Jeff King
On Sat, Dec 06, 2014 at 10:04:06PM +0100, Torsten Bögershausen wrote: I get this: expecting success: check_language ko-KR, *;q=0.1 ko_KR.UTF-8 de_DE.UTF-8 ja_JP.UTF-8 en_US.UTF-8 check_language de-DE, *;q=0.1 de_DE.UTF-8 ja_JP.UTF-8 en_US.UTF-8