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

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

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: Enhancement Request: locale git option

2014-12-05 Thread Torsten Bögershausen
On 12/04/2014 09:55 PM, Jeff King wrote: On Thu, Dec 04, 2014 at 06:21:40PM +0100, Ævar Arnfjörð Bjarmason wrote: That is one of the many reasons why I proposed to have a dictionary of the main technical terms for each language before we even localise git in that language. In an ideal word,

Re: error: core.autocrlf=input conflicts with core.eol=crlf

2014-12-05 Thread Torsten Bögershausen
On 12/05/2014 09:10 AM, Torsten Bögershausen wrote: On 05.12.14 06:42, Alex Stangl wrote: Hi, There seems to be problems with the checks in the git code for conflicts between config values of core.autocrlf and core.eol. Because the various config files are read in separate passes

Re: Enhancement Request: locale git option

2014-12-04 Thread Torsten Bögershausen
On 12/04/2014 08:32 AM, Ulrich Windl wrote: Hi! I'm native German, but German git messages confuse me (yopu'll have to correlate them with the man pages). At the moment git uses the locale settings from the environment, so you can only change git's locale settings by changing the environment

Re: [PATCH 12/13] refs.c: use a bit for ref_update have_old

2014-12-04 Thread Torsten Bögershausen
On 12/04/2014 09:29 AM, Stefan Beller wrote: Somewhat short commit message, especially the motivation is missing. What do we gain with this patch ? In the struct the compiler needs to layout 2*20 bytes for the sha's. It follows an int, typically 4 bytes. It follows another int, now with one bit.

Re: Deprecation warnings under XCode

2014-12-03 Thread Torsten Bögershausen
On 12/03/2014 11:04 AM, David Aguilar wrote: On Tue, Dec 02, 2014 at 10:09:35PM -0500, Eric Sunshine wrote: On Tue, Dec 2, 2014 at 8:12 PM, Michael Blume blume.m...@gmail.com wrote: On Tue, Dec 2, 2014 at 4:37 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Mon, Dec 1, 2014 at 1:04 PM,

Re: Our cumbersome mailing list workflow

2014-12-03 Thread Torsten Bögershausen
On 2014-12-03 03.20, Stefan Beller wrote: On Sun, Nov 30, 2014 at 6:46 PM, Junio C Hamano gits...@pobox.com wrote: Michael Haggerty mhag...@alum.mit.edu writes: It seems like a few desirable features are being talked about here, and summarizing the discussion as centralized vs decentralized

Re: [PATCH 04/14] hold_lock_file_for_append: pass error message back through a strbuf

2014-12-02 Thread Torsten Bögershausen
On 12/03/2014 06:14 AM, Jonathan Nieder wrote: This way, the code does not need to carefully safeguard errno to allow callers to print a reasonable error message when they choose to do some cleanup before die()-ing. Fixes a bug waiting to happen where copy_fd would clobber the errno passed back

[PATCH v2] t0027: check the eol conversion warnings

2014-11-30 Thread Torsten Bögershausen
create_file_in_repo() with additional parameters, which will be used to call check_warning(). When a file has eol=lf or eol=crlf in .gitattributes, it is handled as text and should be normalized. Add missing test cases in t0027. Signed-off-by: Torsten Bögershausen tbo...@web.de --- Changes since V1

Re: [PATCH] compat: convert modes to use portable file type values

2014-11-30 Thread Torsten Bögershausen
On 2014-11-30 03.41, David Michael wrote: Some minor comments: +static inline mode_t mode_native_to_git(mode_t native_mode) +{ + if (S_ISREG(native_mode)) + return 010 | (native_mode 0); + else if (S_ISDIR(native_mode)) + return 004 | (native_mode

Re: Deprecation warnings under XCode

2014-11-30 Thread Torsten Bögershausen
On 12/01/2014 04:02 AM, Michael Blume wrote: I have no idea whether this should concern anyone, but my mac build of git shows CC imap-send.o imap-send.c:183:36: warning: 'ERR_error_string' is deprecated: first deprecated in OS X 10.7 [-Wdeprecated-declarations] fprintf(stderr, %s:

Re: [PATCH] compat: convert modes to use portable file type values

2014-11-30 Thread Torsten Bögershausen
On 12/01/2014 04:40 AM, David Michael wrote: On Sun, Nov 30, 2014 at 3:16 PM, Torsten Bögershausen tbo...@web.de wrote: [snip] Could the code be more human-readable ? static inline mode_t mode_native_to_git(mode_t native_mode) { int perm_bits = native_mode 0; if (S_ISREG

Re: Our cumbersome mailing list workflow

2014-11-27 Thread Torsten Bögershausen
On 2014-11-25 01.28, Michael Haggerty wrote: [] Let me list the aspects of our mailing list workflow that I find cumbersome as a contributor and reviewer: * Submitting patches to the mailing list is an ordeal of configuring format-patch and send-email and getting everything just right, using

Re: [PATCH] t1402: check to delete broken refs

2014-11-25 Thread Torsten Bögershausen
On 11/25/2014 11:56 PM, Stefan Beller wrote: From: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Stefan Beller sbel...@google.com --- This was also part of the ongoing series from Ronnie. But I think the patch in this form is

Re: [PATCH RFC] CYGWIN: avoid implicit declaration warning

2014-11-24 Thread Torsten Bögershausen
It depends what we mean with old: cygwin 1.5 is old, and I lost my test installation this summer: One netbook was converted from XP to Linux, the other machine needs to be re-installed and CYGWIN 1.5 is no longer available for download. I can confirm that Ramsays patch works with CYGWIN

Re: [PATCH RFC] CYGWIN: avoid implicit declaration warning

2014-11-24 Thread Torsten Bögershausen
Patch looks good to me. Do you know if this has been reported to the Cygwin maintainers? The behavior seems counterintuitive --- I would expect _GNU_SOURCE to override everything else (since I thought that was the point of _GNU_SOURCE). I don't know, it seems that CYGWIN is now in class

Re: [PATCH] t5000 on Windows: do not mistake sh.exe as sh

2014-11-24 Thread Torsten Bögershausen
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index d01bbdc..4b68bba 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -101,7 +101,7 @@ test_expect_success \ ten=0123456789 hundred=$ten$ten$ten$ten$ten$ten$ten$ten$ten$ten echo long filename

Re: [PATCHv2] add: ignore only ignored files

2014-11-24 Thread Torsten Bögershausen
On 2014-11-24 18.41, Junio C Hamano wrote: ... Do we refer to t/README from CodingGuidelines where we tell the developers to always write tests to prevent other people from breaking tomorrow what you did today? If not, perhaps that is what needs to be added. That might make sense. It might

[PATCH RFC] CYGWIN: avoid implicit declaration warning

2014-11-23 Thread Torsten Bögershausen
-by: Ramsay Jones ram...@ramsay1.demon.co.uk Signed-off-by: Torsten Bögershausen tbo...@web.de --- This may be a start for a patch, tested under CYGWIN-32, both Windows7 and XP git-compat-util.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-compat-util.h b/git-compat

Re: [PATCH RFC] CYGWIN: avoid implicit declaration warning

2014-11-23 Thread Torsten Bögershausen
On 2014-11-24 00.15, Ramsay Jones wrote: On 23/11/14 18:53, Junio C Hamano wrote: Ramsay Jones ram...@ramsay1.demon.co.uk writes: On 23/11/14 14:16, Torsten Bögershausen wrote: gcc under cygwin reports several warnings like this: warning: implicit declaration of function 'memmem

Re: [PATCHv2] add: ignore only ignored files

2014-11-22 Thread Torsten Bögershausen
+test_expect_success 'error out when attempting to add ignored ones but add others' ' +touch a.if +test_must_fail git add a.?? +! (git ls-files | grep \\.ig) +(git ls-files | grep a.if) +' I am somewhat allergic to pipes in our test suite, because they can mask

Re: [PATCHv2] add: ignore only ignored files

2014-11-22 Thread Torsten Bögershausen
On 2014-11-22 20.19, Jeff King wrote: On Sat, Nov 22, 2014 at 03:59:12PM +0100, Torsten Bögershausen wrote: +test_expect_success 'error out when attempting to add ignored ones but add others' ' + touch a.if + test_must_fail git add a.?? + ! (git ls-files | grep \\.ig) + (git ls

[PATCH v3] Improve the filemode trustability check

2014-11-21 Thread Torsten Bögershausen
) are handled by the current code. Case c) qualifies as non trustable executable bit and core.filemode should be false, but this is currently not done. Detect when .git/config has the user executable bit set after creat(.git/config, 0666) and set core.filemode to false. Signed-off-by: Torsten Bögershausen

Re: [PATCH RFC] t0027: check the eol conversion warnings

2014-11-21 Thread Torsten Bögershausen
On 20.11.14 23:37, Junio C Hamano wrote: --- At a glance it is very hard to see what we might be _losing_ with this change that claims to add new kinds of tests on top of existing ones. I am guessing that add-check-warn roughly corresponds to the old create-file-in-repo but they have

[PATCH v2] Improve the filemode trustability check

2014-11-20 Thread Torsten Bögershausen
) are handled by the current code. Case c) qualifies as non trustable executable bit and core.filemode should be false, but this is currently not done. Detect when .git/config has the user executable bit set after creat(.git/config, 0666) and set core.filemode to false. Signed-off-by: Torsten Bögershausen

[PATCH RFC] t0027: check the eol conversion warnings

2014-11-20 Thread Torsten Bögershausen
Add tests to check the warnings when adding file with eol=lf and eol=crlf. Add a function check_warning() to check the warnings on stderr CRLF will be replaced... or LF will be replaced... Signed-off-by: Torsten Bögershausen tbo...@web.de --- t/t0027-auto-crlf.sh | 103

[PATCH] Improve the filemode trustability check

2014-11-19 Thread Torsten Bögershausen
) are handled by the current code. Case c) qualifies as non trustable executable bit and core.filemode should be false, but this is not done. Solution: Detect when .git/config has the user executable bit set after creat(.git/config, 0666) and set core.filemode to false. Signed-off-by: Torsten Bögershausen

Re: [PATCH v2 1/2] create_default_files(): don't set u+x bit on $GIT_DIR/config

2014-11-17 Thread Torsten Bögershausen
this situation yet. Michael, if there is a chance that you integrate my small code changes in your patch ? - commit 3228bedef6d45bfaf8986b6367f9388738476345 Author: Torsten Bögershausen tbo...@web.de Date: Sun Oct 19 00:15:00 2014 +0200 Improve the filemode trustability check

Re: [PATCH 1/2] create_default_files(): don't set u+x bit on $GIT_DIR/config

2014-11-15 Thread Torsten Bögershausen
On 2014-11-15 08.26, Michael Haggerty wrote: The whole thing looks good to me, some minor comments below git_config_set() copies the permissions from the old config file to the new one. This is a good change in and of itself, but it interacts badly with create_default_files()'s sloppiness,

Re: [RFC] On watchman support

2014-11-14 Thread Torsten Bögershausen
On 11/13/2014 01:22 PM, Duy Nguyen wrote: On Thu, Nov 13, 2014 at 12:05 PM, Torsten Bögershausen tbo...@web.de wrote: From a Git user perspective it could be good to have something like this: a) git status -u b) git status -uno c) git status -umtime d) git status -uwatchman We know

Re: [PATCH] allow TTY tests to run under recent Mac OS

2014-11-13 Thread Torsten Bögershausen
On 11/13/2014 11:01 PM, Mike Blume wrote: listed bug doesn't reproduce on Mac OS Yosemite. For now, just enable TTY on Yosemite and higher Signed-off-by: Mike Blume blume.m...@gmail.com --- t/lib-terminal.sh | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git

Re: Set file modification time on checkout

2014-11-12 Thread Torsten Bögershausen
On 2014-11-13 05.45, Patrick Hemmer wrote: The request is to allow git to set the file modification time on checkout to the commit-author-date of the commit which last modified the file. Yes I know this is in the FAQ, but the FAQ entry is missing an increasingly common use case: docker. When

Re: mac test failure -- 2gb clone

2014-11-12 Thread Torsten Bögershausen
On 2014-11-12 22.57, Michael Blume wrote: [t5705-clone-2gb.sh broken on Mac OS] It is most probably even broken on every platform, since we renovated the URL parser in 2013. (More info can be found here:) git log t/t5601-clone.sh I missed t5705-clone-2gb.sh, because it has its own enabler

Re: [RFC] On watchman support

2014-11-12 Thread Torsten Bögershausen
On 2014-11-11 13.49, Duy Nguyen wrote: I've come to the last piece to speed up git status, watchman support. And I realized it's not as good as I thought. Watchman could be used for two things: to avoid refreshing the index, and to avoid searching for ignored files. The first one can be done

[PATCH] t5705: Use the correct file:// URL

2014-11-12 Thread Torsten Bögershausen
A URL like file;//. is (no longer) supported by Git: Typically there is no host, and RFC1738 says that file:///path should be used. Update t5705 to use a working URL. Reported-by: Michael Blume blume.m...@gmail.com Signed-off-by: Torsten Bögershausen tbo...@web.de --- t/t5705-clone-2gb.sh | 2

Re: [PATCH v2 22/22] untracked cache: guard and disable on system changes

2014-11-10 Thread Torsten Bögershausen
On 11/10/2014 12:47 AM, Duy Nguyen wrote: Some updates from the test lab, Windows 7 Working means git update-index --untracked-cache reports Testing...OK Rejected means ..does not change.. cygwin + NTFS: Working cygwin + VFAT: Rejected The same good news for Msysgit, running your github branch

Re: [PATCH v2 21/22] mingw32: add uname()

2014-11-09 Thread Torsten Bögershausen
On 2014-11-09 09.36, Duy Nguyen wrote: On Sun, Nov 9, 2014 at 10:32 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Sat, Nov 8, 2014 at 4:39 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- diff --git a/compat/mingw.c

Re: [PATCH] git-imap-send: use libcurl for implementation

2014-11-09 Thread Torsten Bögershausen
On 2014-08-27 00.40, Bernhard Reiter wrote: Use libcurl's high-level API functions to implement git-imap-send instead of the previous low-level OpenSSL-based functions. This doesn't seem to fully work under Debian 7: /home/tb/projects/git/git.pu/imap-send.c:1546: undefined reference to

Re: What's cooking in git.git (Nov 2014, #01; Wed, 5)

2014-11-09 Thread Torsten Bögershausen
* jt/timer-settime (2014-08-29) 6 commits - use timer_settime() for new platforms - autoconf: check for timer_settime() - autoconf: check for struct itimerspec - autoconf: check for struct sigevent - autoconf: check for struct timespec - autoconf: check for timer_t Reviewed,

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Torsten Bögershausen
On 09.11.14 18:34, Michael Blume wrote: Works for me, thanks =) I'm curious now, is there an automated build of git running on a mac anywhere? There's a mac mini running jenkins in my office and it's possible I could convince someone to let me set up a git build that'll e-mail me if there's

Re: [PATCH v2 22/22] untracked cache: guard and disable on system changes

2014-11-09 Thread Torsten Bögershausen
On 2014-11-08 10.39, Nguyễn Thái Ngọc Duy wrote: If the user enables untracked cache, then - move worktree to an unsupported filesystem How do we detect this move ? Shouldn't we be able to detect an unsupported file system (by probing if stat(root_dir_of_repo) ==

Re: [PATCH] t1410: fix breakage on case-insensitive filesystems

2014-11-09 Thread Torsten Bögershausen
On 2014-11-09 22.36, Michael Blume wrote: Actually I have a build break in pu on my mac right now. Seems to build fine in ubuntu, but: progress.c:66:15: error: use of undeclared identifier 'CLOCK_MONOTONIC' timer_create(CLOCK_MONOTONIC, sev, progress_timer); That is not an unkown

Re: Installed git 2.1.3 on sparc 8, but got core dump during 'git clone'

2014-11-06 Thread Torsten Bögershausen
On 2014-11-06 08.38, victor wrote: Hi Jeff, Thanks for your help, as your suggestion, I can compile/install git with --disable_ptheads now. It seems as if your Git still wants to create a pthread, Did you use --disable-pthreads or --disable_ptheads ? -- To unsubscribe from this list: send

Re: [PATCH 01/19] dir.c: optionally compute sha-1 of a .gitignore file

2014-10-28 Thread Torsten Bögershausen
On 2014-10-27 13.10, Nguyễn Thái Ngọc Duy wrote: [] Nice serious, I can imagine to test benchmark it (so I assume there is a branch on github or so ?) Another thing: Can we switch the feature off? It could be nice to benchmark with and without the cache on the command line, and besides that

Re: [PATCH 18/19] update-index: test the system before enabling untracked cache

2014-10-28 Thread Torsten Bögershausen
On 2014-10-27 13.10, Nguyễn Thái Ngọc Duy wrote: [] +static void xmkdir(const char *path) +{ + if (mkdir(path, 0700)) + die_errno(_(failed to create directory %s), path); +} Does it makes sense to ignore EINTR and do a retry ? Another question is if the function could be

Re: [PATCH 02/19] untracked cache: record .gitignore information and dir hierarchy

2014-10-28 Thread Torsten Bögershausen
On 2014-10-27 13.10, Nguyễn Thái Ngọc Duy wrote: dir.c | 150 -- dir.h | 60 +++ 2 files changed, 189 insertions(+), 21 deletions(-) [] +struct untracked_cache_dir { + struct

[PATCH V2] core.filemode may need manual action

2014-10-17 Thread Torsten Bögershausen
-by: Torsten Bögershausen tbo...@web.de --- Thanks for careful reading. Changes since V1: - The '+' at an otherwise empty line generates an empty line in html, so s/^$/+/ - Changed msygit into Git for Windows - Mention Eclipse - Minor changes in the wording, remove one comma - Remove the The default

[PATCH V2B] core.filemode may need manual action

2014-10-17 Thread Torsten Bögershausen
-by: Torsten Bögershausen tbo...@web.de --- Does this makes more sence ? Documentation/config.txt | 23 ++- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 04a1e2f..3127e5d 100644 --- a/Documentation/config.txt

[PATCH] core.filemode may need manual action

2014-10-16 Thread Torsten Bögershausen
core.filemode is set automatically when a repo is created. But when a repo is exported via CIFS or cygwin is mixed with Git for Windows core.filemode may better be set manually to false. Update and improve the documentation. Helped-by: Junio C Hamano gits...@pobox.com Signed-off-by: Torsten

Re: [PATCH] init - Honour the global core.filemode setting

2014-10-03 Thread Torsten Bögershausen
On 2014-10-02 19.02, Junio C Hamano wrote: Torsten Bögershausen tbo...@web.de writes: On 2014-10-01 19.10, Junio C Hamano wrote: Hilco Wijbenga hilco.wijbe...@gmail.com writes: Perhaps I completely misunderstand the meaning of core.filemode but I thought it determined whether Git cared

Re: [PATCH 1/3] fdopen_lock_file(): access a lockfile using stdio

2014-10-02 Thread Torsten Bögershausen
On 01.10.14 13:14, Michael Haggerty wrote: [] Nice done, small comments inline diff --git a/lockfile.c b/lockfile.c index d27e61c..e046027 100644 --- a/lockfile.c +++ b/lockfile.c @@ -7,20 +7,29 @@ static struct lock_file *volatile lock_file_list; -static void

Re: [PATCH] init - Honour the global core.filemode setting

2014-10-02 Thread Torsten Bögershausen
On 2014-10-01 19.10, Junio C Hamano wrote: Hilco Wijbenga hilco.wijbe...@gmail.com writes: Perhaps I completely misunderstand the meaning of core.filemode but I thought it determined whether Git cared about changes in file properties? By setting it to false, you tell Git that the

Re: Failing tests in t0027-autocrlf.sh under msysgit/git-win-sdk

2014-10-02 Thread Torsten Bögershausen
is correct. Thomas Which version of t0027 do you have: The latest version in git.git is this one, and should pass (but I may have missed something) commit f6975a6b119128de1c5a89e6cd64f75ed1de2177 Author: Torsten Bögershausen tbo...@web.de Date: Sat Aug 16 22:16:58 2014 +0200 t0027: Tests

Re: [PATCH] init - Honour the global core.filemode setting

2014-09-28 Thread Torsten Bögershausen
On 2014-09-28 02.37, Hilco Wijbenga wrote: If ~/.gitconfig contains a core.filemode entry then git init should honour that setting. Signed-off-by: Hilco Wijbenga hilco.wijbe...@gmail.com --- This bit me at work where I have to work with Windows. Git on Cygwin and the Eclipse Git plugin do

Re: [RFC/PATCH] notes: Allow adding empty notes with -C

2014-09-21 Thread Torsten Bögershausen
On 2014-09-21 05.00, Johan Herland wrote: [] diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh index cfd67ff..a6c399b 100755 --- a/t/t3301-notes.sh +++ b/t/t3301-notes.sh @@ -1239,4 +1239,23 @@ test_expect_success 'git notes get-ref (--ref)' ' test $(GIT_NOTES_REF=refs/notes/bar git

Re: [Bug] git status -unormal -- 'foo[b]/' won't display content of 'foo[b]/

2014-09-21 Thread Torsten Bögershausen
On 2014-09-21 20.04, Rémi Vanicat wrote: Hello, I found what look like a bug in git status: `git status -unormal foo[b]/` won't output the content of the directory foo[b] when `git status -unormal foo/` will output the content of the directory foo: $ mkdir 'foo[b]' $ touch

Re: Broken handling of URL with literal IPv6 address

2014-09-18 Thread Torsten Bögershausen
On 2014-09-18 13.29, Christian Taube wrote: Hello, I was sent here from the IRC channel. Using git 2.1.0, the command git clone ssh://[2001:db8::1]/repo.git succeeds, but adding a username to the URL like this git clone ssh://user@[2001:db8::1]/repo.git fails with an

Re: [PATCH v5 08/35] lock_file(): always add lock_file object to lock_file_list

2014-09-17 Thread Torsten Bögershausen
On 09/16/2014 09:33 PM, Michael Haggerty wrote: [] diff --git a/lockfile.c b/lockfile.c index 983c3ec..00c972c 100644 --- a/lockfile.c +++ b/lockfile.c @@ -129,6 +129,22 @@ static int lock_file(struct lock_file *lk, const char *path, int flags) */ static const size_t

Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream

2014-09-14 Thread Torsten Bögershausen
On 12.09.14 20:19, Rom Walton wrote: Try: git checkout -f master git pull origin I committed fixes for that stuff this morning. - Rom It seems as if we added CRLF's to the repo: od -c html/languages/translations/hu.po | grep \\\r 0577300# # \r \n # P r i v

Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream

2014-09-14 Thread Torsten Bögershausen
On 09/14/2014 10:51 AM, Torsten Bögershausen wrote: It may be that there is a bug in the tools you are using. I use git 2.1.0 The question was how the commit had been produced: Rom, what are you using ? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message

Re: Issue with 'git diff' and non ascii characters

2014-09-12 Thread Torsten Bögershausen
On 2014-09-12 08.53, Giulio Cesare Solaroli wrote: Hello, I have spotted a problem using 'git diff' when non ascii characters are involved. Not sure if the problem is due to the name of the file, or its content. Cheers, Giulio Cesare Steps to reproduce the problem: $ sw_vers

Re: Check out git-author

2014-09-08 Thread Torsten Bögershausen
On 09/08/2014 07:19 AM, Jeff King wrote: Have you tried git log -L 2235,2235:fs/ext4/mballoc.c -- fs/ext4/mballoc.c? Can you compare your approach to that of log -L? -Peff Nice, but it doesn't seem to work 100 % (?) tb@linux:~/projects/git/git.pu/t$ git log t3910-mac-os-precompose.sh |

Re: Git improvement for line feed processing: LF versus CR-LF

2014-09-08 Thread Torsten Bögershausen
On 09/08/2014 10:55 AM, Francis ANDRE wrote: Hi [] All text file line endings in the repository must be Unix-style (LF). This includes Visual Studio project and solution files (.sln, .vcproj, .vcxproj, .vcxproj.filters). But git-gui translates states: warning: LF will be replaced by CRLF in

Re: [RFH] renaming strcmp/strncmp-icase

2014-09-08 Thread Torsten Bögershausen
On 2014-09-08 20.52, Junio C Hamano wrote: There are these two functions in dir.c that has only a handful of callers outside: int strcmp_icase(const char *a, const char *b); int strncmp_icase(const char *a, const char *b, size_t count); How many of you would think these are about

Re: [PATCH v4 00/32] Lockfile correctness and refactoring

2014-09-07 Thread Torsten Bögershausen
On 2014-09-06 09.50, Michael Haggerty wrote: Sorry for the long delay since v3. This version mostly cleans up a couple more places where the lockfile object was left in an ill-defined state. No problem with the delay. The most important question is if we do the lk-active handling right. Set

Re: [RFC PATCHv3 1/4] am: avoid re-directing stdin twice

2014-09-06 Thread Torsten Bögershausen
On 2014-09-06 09.34, Junio C Hamano wrote: Stephen Boyd bebar...@gmail.com writes: I see Stephen who wrote the original Thunderbird save-as is already on the Cc list. How about doing it this way instead? It was so long ago I can't even remember writing that patch. But I googled the thread

Re: Bug-directors upper letters names.

2014-09-06 Thread Torsten Bögershausen
On 2014-09-06 08.05, Mateusz M wrote: Last days I found special case. A changed packages name (all letter to lowercase). After merge with other branch there were still uppercase letters.All the rest code is after refactoring. Is it a bug ? Unless you provide more information what had been

progress.c does not compile under Mac OS X

2014-08-30 Thread Torsten Bögershausen
progress.c:66: error: ‘CLOCK_MONOTONIC’ undeclared (first use in this function) You can not cast a undeclared into void in git-compat-uitl.h: #define timer_create(clockid, sevp, timerp) ((void) (clockid), (void) (sevp), (void) (timerp), errno Removing the cast of a define into (void) makes

Re: [PATCH] contrib/svn-fe: fix Makefile

2014-08-26 Thread Torsten Bögershausen
On 08/26/2014 02:44 PM, Maxim Bublis wrote: Fixes several problems: * include config.mak.uname, config.mak.autogen and config.mak in order to use settings for prefix and other such things; * link xdiff/lib.a as it is a requirement for libgit.a; * fix CFLAGS and EXTLIBS for Linux

Re: [PATCH] Undefine strlcpy if needed.

2014-08-24 Thread Torsten Bögershausen
On 2014-08-24 18.18, Ramsay Jones wrote: On 24/08/14 12:13, tsuna wrote: On Sun, Aug 24, 2014 at 4:10 AM, Ramsay Jones ram...@ramsay1.demon.co.uk wrote: Hmm, which version of OS X are we talking about? OS X 10.9.4: $ uname -a Darwin damogran.local 13.3.0 Darwin Kernel Version 13.3.0: Tue

Re: [PATCH v2 1/3] Push the NATIVE_CRLF Makefile variable to C and added a test for native.

2014-08-23 Thread Torsten Bögershausen
On 2014-08-23 00.54, Junio C Hamano wrote: Torsten Bögershausen tbo...@web.de writes: Commit 95f31e9a correctly points out that the NATIVE_CRLF setting is incorrectly set on Mingw git. However, the Makefile variable is not propagated to the C preprocessor and results in no change. This patch

[PATCH v2 1/3] Push the NATIVE_CRLF Makefile variable to C and added a test for native.

2014-08-22 Thread Torsten Bögershausen
as native is crlf, we actually normalize text files to this line ending convention when core.autocrlf is false. Signed-off-by: Pat Thoyts pattho...@users.sourceforge.net Signed-off-by: Stepan Kasal ka...@ucw.cz Signed-off-by: Torsten Bögershausen tbo...@web.de --- This mini series mainly updates git.git

[PATCH v2 3/3] t0026: Add missing

2014-08-22 Thread Torsten Bögershausen
Fix the broken chain Reported-By: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Torsten Bögershausen tbo...@web.de --- t/t0026-eol-config.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t0026-eol-config.sh b/t/t0026-eol-config.sh index 43a580a..4806969

[PATCH v2 2/3] MinGW: Update tests to handle a native eol of crlf

2014-08-22 Thread Torsten Bögershausen
Some of the tests were written with the assumption that the native eol would always be lf. After defining NATIVE_CRLF on MinGW, these tests began failing. This change will update the tests to also handle a native eol of crlf. Signed-off-by: Brice Lambson brice...@live.com Signed-off-by: Torsten

[PATCH] Push the NATIVE_CRLF Makefile variable to C and added a test for native.

2014-08-18 Thread Torsten Bögershausen
as native is crlf, we actually normalize text files to this line ending convention when core.autocrlf is false. Signed-off-by: Pat Thoyts pattho...@users.sourceforge.net Signed-off-by: Stepan Kasal ka...@ucw.cz Signed-off-by: Torsten Bögershausen tbo...@web.de --- (This is from MINGW, and some part of my

Re: [PATCH v3 03/10] setup: convert setup_git_directory_gently_1 et al. to strbuf

2014-08-16 Thread Torsten Bögershausen
On 2014-07-28 20.26, René Scharfe wrote: Convert setup_git_directory_gently_1() and its helper functions setup_explicit_git_dir(), setup_discovered_git_dir() and setup_bare_git_dir() to use a struct strbuf to hold the current working directory. Replacing the PATH_MAX-sized buffer used before

[PATCH 2/2] Push the Makefile variable NATIVE_CRLF to C

2014-08-16 Thread Torsten Bögershausen
Re-do the fix in 757543ae0c5d8d: Propagate the Makefile variable NATIVE_CRLF to the C preprocessor Signed-off-by: Torsten Bögershausen tbo...@web.de --- Makefile | 4 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 63a210d..00ba537 100644 --- a/Makefile +++ b

[PATCH 1/2] t0027: Tests for core.eol=native, eol=lf, eol=crlf

2014-08-16 Thread Torsten Bögershausen
for shell functions according to the coding guide lines - Replace txtbin with attr Signed-off-by: Torsten Bögershausen tbo...@web.de --- t/t0027-auto-crlf.sh | 220 --- 1 file changed, 120 insertions(+), 100 deletions(-) diff --git a/t/t0027-auto

t5534 broken when gpg not installed

2014-08-16 Thread Torsten Bögershausen
(I couldn't find a post for this patch) The following is needed for systems without gpg to make t5534 pass: diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh index 3acc864..ee5aaff 100755 --- a/t/t5534-push-signed.sh +++ b/t/t5534-push-signed.sh @@ -45,7 +45,7 @@ test_expect_success

Re: Git on Mac OS X 10.4.10

2014-08-14 Thread Torsten Bögershausen
On 08/14/2014 02:13 PM, Markus Hitter wrote: I'm new to this list, so: Hello everybody! My backup servers run Mac OS X 10.4.10. Yes, these are old, but very reliable and easily up to the task. And Mac OS X 10.4 is the latest OS supported there (PowerPC G3). Recently I tried to upgrade to

Re: [PATCH v3 1/3] lockfile.c: remove PATH_MAX limitation (except in resolve_symlink)

2014-08-02 Thread Torsten Bögershausen
On 08/01/2014 07:55 PM, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Somewhat underexplained, given that it seems to add some new semantics. +static void

Re: error: Tweaking file descriptors doesn't work with this MSVCRT.dll on wine

2014-07-29 Thread Torsten Bögershausen
On 07/28/2014 12:39 PM, Duy Nguyen wrote: I know wine is kind of second citizen but is there a cheap trick to make it work on wine? Reverting fcd428f (Win32: fix broken pipe detection - 2012-03-01) could result in conflicts in compat that I'm not comfortable resolving. I don't have Windows at

Re: git add -i failed in 2.0.3

2014-07-29 Thread Torsten Bögershausen
On 07/27/2014 05:26 PM, Guang Chen wrote: I use brew upgrade git to this version on OSX. And when I use git add -i, it says: Which version did you use before? Was it installed with brew as well ? Can't locate Git.pm in @INC (@INC contains: @@@/git/2.0.3/lib/perl5/site_perl

Re: git add -i failed in 2.0.3

2014-07-29 Thread Torsten Bögershausen
says: perl is /usr/bin/perl Additionally, perl --version says: This is perl 5, version 16, subversion 2 (v5.16.2) built for darwin-thread-multi-2level (with 3 registered patches, see perl -V for more detail) On Jul 29, 2014, at 14:37, Torsten Bögershausen tbo...@web.de wrote: On 07/27/2014 05

Re: git_inetd_server: run git-http-backend using inetd

2014-07-20 Thread Torsten Bögershausen
On 07/19/2014 07:06 PM, Jonathan Nieder wrote: Torsten Bögershausen wrote: Jonathan, (I'm good in searching, but bad in finding) could you point out where the source code for the git package for debian is ? I recently learned about mDNS, and will probably do some tests and experiments later

Re: git_inetd_server: run git-http-backend using inetd

2014-07-20 Thread Torsten Bögershausen
On 07/20/2014 08:10 AM, Torsten Bögershausen wrote: On 07/19/2014 07:06 PM, Jonathan Nieder wrote: Torsten Bögershausen wrote: Jonathan, (I'm good in searching, but bad in finding) could you point out where the source code for the git package for debian is ? I recently learned about mDNS

Re: git_inetd_server: run git-http-backend using inetd

2014-07-19 Thread Torsten Bögershausen
On 07/18/2014 12:10 AM, Jonathan Nieder wrote: Hi, Kyle J. McKay wrote: When I then try to fetch using a git://host/... URL where host is an mDNS host name, the 0010 patch causes git to attempt to lookup a DNS SRV record on the non-mDNS regular DNS service (a violation of RFC 6762 [4] section

Re: [PATCH v9 1/4] cache-tree: Create/update cache-tree on checkout

2014-07-15 Thread Torsten Bögershausen
On 07/13/2014 10:28 PM, David Turner wrote: From: David Turner dtur...@twopensource.com [] diff --git a/cache-tree.c b/cache-tree.c index 7fa524a..f951d7d 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -239,9 +239,12 @@ static int update_one(struct cache_tree *it, struct strbuf

Re: git pull crash

2014-07-11 Thread Torsten Bögershausen
On 2014-07-11 12.49, Ronald Bos wrote: Hi all, I am running git on Windows 8.1 (with all the latest updates installed), and it consequently crashes when I run git pull in my cloned working copy. I attached a screen shot of the message window (it is in Dutch...) This is my git version:

No fchmd. was: Re: [PATCH 00/14] Add submodule test harness

2014-07-10 Thread Torsten Bögershausen
On 07/09/2014 11:57 PM, Junio C Hamano wrote: Eric Wong normalper...@yhbt.net writes: Junio C Hamano gits...@pobox.com wrote: Johannes Sixt j...@kdbg.org writes: Am 08.07.2014 21:34, schrieb Jens Lehmann: And Msysgit complains error: fchmod on c:/xxxt/trash

Re: No fchmd. was: Re: [PATCH 00/14] Add submodule test harness

2014-07-10 Thread Torsten Bögershausen
On 2014-07-10 21.49, Junio C Hamano wrote: [] If we limit the case to Inherit permissions from the file we are replacing by taking a lock on it, which is the topic of discussion in this thread, we do not have to worry about how to configure the value (we do not have to) and adding a new

Re: [PATCH 00/14] Add submodule test harness

2014-07-09 Thread Torsten Bögershausen
There seems to be some other trouble under Mac OS, not yet fully tracked down, (may be related to the diff -r) Torsten sees failures of this kind under Mac OS: diff -r .git/modules/sub1/config sub1/.git/config 6d5 worktree = ../../../sub1 8a8 worktree = ../../../sub1 So the config

No fchmod() under msygit - Was: Re: [PATCH 00/14] Add submodule test harness

2014-07-09 Thread Torsten Bögershausen
On 07/08/2014 10:25 PM, Ramsay Jones wrote: On 08/07/14 20:34, Jens Lehmann wrote: Am 07.07.2014 21:40, schrieb Torsten Bögershausen: On 2014-07-07 19.05, Junio C Hamano wrote: Jens Lehmann jens.lehm...@web.de writes: Junio, do you want me to resend 02/14 without the non-portable echo -n

Re: [PATCH 00/14] Add submodule test harness

2014-07-07 Thread Torsten Bögershausen
On 2014-07-07 19.05, Junio C Hamano wrote: Jens Lehmann jens.lehm...@web.de writes: Junio, do you want me to resend 02/14 without the non-portable echo -n or could you just squash the following diff in? Amended locally here already; thanks, both. There seems to be some other trouble under

Re: [PATCH v2] git-am: add option to extract email Message-Id: tag into commit log

2014-07-02 Thread Torsten Bögershausen
--- a/git-am.sh +++ b/git-am.sh @@ -39,6 +39,7 @@ committer-date-is-author-datelie about committer date ignore-date use current timestamp for author date rerere-autoupdate update the index with reused conflict resolution if possible S,gpg-sign? GPG-sign commits

Re: [PATCH 00/14] Add submodule test harness

2014-07-02 Thread Torsten Bögershausen
(Not sure if this is the right thread) (I haven't checked if this is fixed in your latest version) On what I have on pu 7a0da7902cbbc9a876b90c9, Tue Jul 1 14:51:53 2014 -0700 Many submodule tests are broken. One problem is here: lib-submodule-update.sh:264: possible problem: echo -n is not

Re: [PATCH v4] git-am: add option to extract email Message-Id: tag into commit log

2014-07-02 Thread Torsten Bögershausen
diff --git a/git-am.sh b/git-am.sh index ee61a77..fd0181f 100755 --- a/git-am.sh +++ b/git-am.sh @@ -39,6 +39,7 @@ committer-date-is-author-datelie about committer date ignore-date use current timestamp for author date rerere-autoupdate update the index with reused conflict

<    3   4   5   6   7   8   9   10   11   12   >