Re: Deprecation warnings under XCode

2014-12-03 Thread David Aguilar
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, Junio C Hamano gits...@pobox.com wrote: I

Re: [RFC][PATCH] send-email: add --[no-]xmailer option

2014-12-03 Thread Luis Henriques
On Tue, Dec 02, 2014 at 07:22:10PM -0800, Kyle J. McKay wrote: On Dec 2, 2014, at 18:34, Eric Wong wrote: Luis Henriques hen...@camandro.org wrote: On Mon, Mar 24, 2014 at 09:38:27PM +, Luis Henriques wrote: Add --[no-]xmailer that allows a user to disable adding the 'X-Mailer:' header

[PATCH] Documentation: Mention comment syntax in gitattributes.txt

2014-12-03 Thread Michal Sojka
gitattributes documentation does not specify how to include comments in gitattribute files. According to parse_attr_line() in attr.c, # can be used to start a comment. This patch add this to the documentation. Signed-off-by: Michal Sojka sojk...@fel.cvut.cz --- Documentation/gitattributes.txt |

Re: [PATCH] t/lib-gpg: adjust permissions for gnupg 2.1

2014-12-03 Thread Michael J Gruber
Jeff King schrieb am 02.12.2014 um 22:07: On Tue, Dec 02, 2014 at 02:40:27PM +0100, Michael J Gruber wrote: Before gnupg 2.1 (aka modern branch), gpghome would contain only files which allowed t/lib-gpg.sh to set permissions explicitely, and we did that since 28a1b07 (t/lib-gpg: adjust

Re: [PATCH 24/34] checkout: reject if the branch is already checked out elsewhere

2014-12-03 Thread Mark Levedahl
On 12/02/2014 12:30 PM, Junio C Hamano wrote: Duy Nguyen pclo...@gmail.com writes: FWIW git-branch usually can show the original branch of detached head (must not always). I don't think we have a plumbing equivalent for it though. People can tail -1 $GIT_DIR/logs/HEAD| sed .. but that seems

contact me: brianlewi...@outlook.com

2014-12-03 Thread Patricia Hirsch
I am mr, Brian lewis i have a Business Proposal for you contact me: brianlewi...@outlook.commailto:brianlewi...@outlook.com -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at

Re: [PATCH 24/34] checkout: reject if the branch is already checked out elsewhere

2014-12-03 Thread Duy Nguyen
On Wed, Dec 3, 2014 at 12:30 AM, Junio C Hamano gits...@pobox.com wrote: I do like read-only ref concept where we can keep ref name (especially tags) in HEAD until the next commit. But it didn't go anywhere Remind me. That sounds somewhat interesting. Couldn't find anything in my mail

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,

git config option for passing flags to diff

2014-12-03 Thread Debarshi Ray
I have been looking for a git config option to turn on --function-context, and after searching on the Internet and reading the man pages, #git confirmed that it doesn't exist. I am wondering if it would be sensible to introduce such a variable? Or a variable to specify any additional flags to

git stash broken on MS Windows (automatically modify the files again)

2014-12-03 Thread Petr Bena
I have a mysterious problem with one of my git repositories that work fine when I check it out on linux, but not when I do that on windows. On windows, pile of files immediately change themselves - eg when I do git diff I see a lot of changes. What is even more interesting, is that when I do git

Re: git stash broken on MS Windows (automatically modify the files again)

2014-12-03 Thread Petr Bena
I actually can't even commit these changes: petr.bena@MW7H3TP5JJBR0I ~/Documents/repo (export) $ git stash Saved working directory and index state WIP on export: ee21f45 Updated inserts HEAD is now at ee21f45 Updated inserts petr.bena@MW7H3TP5JJBR0I ~/Documents/repo (export) $ git checkout

Re: git stash broken on MS Windows (automatically modify the files again)

2014-12-03 Thread Petr Bena
Only solution so far was to clone on linux, remove the folder which contains these files and push them, then I had to delete the whole repository on windows and clone it again. If I checkout any revision which contains these files repository get broken in a way that only solution is deleting it

Re: [PATCH 24/34] checkout: reject if the branch is already checked out elsewhere

2014-12-03 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Wed, Dec 3, 2014 at 12:30 AM, Junio C Hamano gits...@pobox.com wrote: I do like read-only ref concept where we can keep ref name (especially tags) in HEAD until the next commit. But it didn't go anywhere Remind me. That sounds somewhat interesting.

Re: git status / git diff -C not detecting file copy

2014-12-03 Thread Junio C Hamano
Jeff King p...@peff.net writes: I find that git.git is often a useful and easy thing to time to extrapolate to other projects. It's 1/10th-1/20th the size of the kernel (both in tree size and commit depth), which I do consider a big project (and I have a feeling is what Linus was talking

Re: git status / git diff -C not detecting file copy

2014-12-03 Thread Junio C Hamano
Jeff King p...@peff.net writes: ... I'd consider trying to match diff.renames instead, which takes false/true/copies for its three levels. It may make sense to teach both places copies-harder or something similar, for completeness. Yeah, I think that is a very sensible thing to do. -- To

Re: [PATCH] git add -i: allow list (un)selection by regexp

2014-12-03 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: On Tue, Dec 2, 2014 at 12:26 PM, Junio C Hamano gits...@pobox.com wrote: Aarni Koskela aarni.kosk...@andersinnovations.com writes: From 9096652a71666920ae8d59dd4317d536ba974d5b Mon Sep 17 00:00:00 2001 From: Aarni Koskela a...@iki.fi Date: Tue,

Re: [PATCH 1/3] tree.c: update read_tree_recursive callback to pass strbuf as base

2014-12-03 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: On Tue, Dec 2, 2014 at 7:11 AM, Duy Nguyen pclo...@gmail.com wrote: On Tue, Dec 2, 2014 at 2:32 AM, Junio C Hamano gits...@pobox.com wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: This allows the callback to use 'base' as a temporary

Re: [PATCH] t/lib-gpg: adjust permissions for gnupg 2.1

2014-12-03 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Dec 02, 2014 at 03:57:50PM -0800, Junio C Hamano wrote: Wait. After doing this, $ mkdir -p src/a src/b 2src/a/c chmod a-w src/b src/a/c $ cp -R src dst $ ls -lR dst dst/b and dst/a/c are 0440 (with umask 0027, which makes src/b and

Re: [PATCH] t/lib-gpg: adjust permissions for gnupg 2.1

2014-12-03 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: Orthogonal to that is the pinentry issue: I haven't checked whether gpg2.1 asking for passphrases on passphrase-less secure keys is to be fixed on the gpg side. If yes, I would just wait for that since gpg2.1 is not common yet. If not, we

Re: git stash broken on MS Windows (automatically modify the files again)

2014-12-03 Thread Aneurin Price
On 3 December 2014 at 14:48, Petr Bena benap...@gmail.com wrote: Only solution so far was to clone on linux, remove the folder which contains these files and push them, then I had to delete the whole repository on windows and clone it again. If I checkout any revision which contains these

Re: [RFC][PATCH] send-email: add --[no-]xmailer option

2014-12-03 Thread Junio C Hamano
Eric Wong normalper...@yhbt.net writes: Luis Henriques hen...@camandro.org wrote: On Mon, Mar 24, 2014 at 09:38:27PM +, Luis Henriques wrote: Add --[no-]xmailer that allows a user to disable adding the 'X-Mailer:' header to the email being sent. Ping It's been a while since I

Re: git stash broken on MS Windows (automatically modify the files again)

2014-12-03 Thread Petr Bena
Yay Why doesn't windows git perform some kind of check here, and doesn't tell you a message like: this repository contains multiple files with same name, which I can't checkout on this OS Or something like that? On Wed, Dec 3, 2014 at 5:50 PM, Aneurin Price aneurin.pr...@gmail.com wrote: On 3

Re: [RFC][PATCH] send-email: add --[no-]xmailer option

2014-12-03 Thread Junio C Hamano
Luis Henriques hen...@camandro.org writes: +--xmailer:: + Prevent adding the X-Mailer: header. Default value is + 'sendemail.xmailer'. Two problems here. - git send-email --xmailer would _ADD_, not prevent adding, the header, regardless of the value of sendemail.xmailer. - It

Re: Disabling credential helper?

2014-12-03 Thread Junio C Hamano
Jeff King p...@peff.net writes: Yeah, it's fine (as is GIT_ASKPASS=true). You could also provide a credential helper that gives you an empty username and password. But in both cases, I think that git will then feed the empty password to the server again, resulting in an extra useless

Re: Our cumbersome mailing list workflow

2014-12-03 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: I don't think there's any reason that newcomers should need more iterations than regulars to finish a patch. Regulars are actually held to a higher standard, so they are likely to need more iterations. A common mistake for newcomers, that I haven't

Re: [RFC][PATCH] send-email: add --[no-]xmailer option

2014-12-03 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Two problems here. ... tests? Something like this squashed into the patch you posted earlier, perhaps, would be a good place to start. Documentation/git-send-email.txt | 6 -- git-send-email.perl | 11 +-- 2 files changed, 9

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/RFC] rerere: error out on autoupdate failure

2014-12-03 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: We have been silently tolerating errors by returning early with an error that the caller ignores since rerere.autoupdate was introduced in v1.6.0-rc0~120^2 (2008-06-22). So on error (for example if the index is already locked), rerere can return

Re: [RFC][PATCH] send-email: add --[no-]xmailer option

2014-12-03 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: @@ -177,8 +177,7 @@ sub format_2822_time { my $multiedit; my $editor; -# Usage of X-Mailer email header -my $xmailer; +my $use_xmailer; Just another small thing. The version of SQUASH??? commit I will queue on 'pu' will have this next to where

Re: [PATCH/RFC] rerere: error out on autoupdate failure

2014-12-03 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Instead of crafting a new message, why not just stop passing IGNORE_ERRORS and have add_file_to_cache() report the failure? That is: if (add_file_to_cache(item-string, 0)) return -1; Err, that should be exit(128) to mimic die().

Problems cloning existing (probably old) svn repo

2014-12-03 Thread Cody Goodman
I recently got this error when trying to git svn clone an existing repo: Couldn't open a repository: Unable to connect to a repository at URL 'file:///home/cody/work/SmartPay': Unable to open an ra_local session to URL: Unable to open repository 'file:///home/cody/work/SmartPay' at

Re: [RFC][PATCH] send-email: add --[no-]xmailer option

2014-12-03 Thread Luis Henriques
On Wed, Dec 03, 2014 at 09:23:11AM -0800, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Two problems here. ... tests? Something like this squashed into the patch you posted earlier, perhaps, would be a good place to start. Awesome, thank you for your review. I'll

Re: [PATCHv2 0/4] refs.c: use transactions for the reflog

2014-12-03 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: This is the core part of the refs-transactions-reflog series[1], which was in discussion for a bit already. I think what 3/4 attempts to do is very sensible, but I agree with Jonathan that it needs a bit more polishing. Am planning to queue only the

[PATCH v2] send-email: add --[no-]xmailer option

2014-12-03 Thread Luis Henriques
Add --[no-]xmailer that allows a user to disable adding the 'X-Mailer:' header to the email being sent. Acked-by: Eric Wong normalper...@yhbt.net Signed-off-by: Luis Henriques hen...@camandro.org --- Documentation/config.txt | 1 + Documentation/git-send-email.txt | 5 +

Re: Deprecation warnings under XCode

2014-12-03 Thread Eric Sunshine
On Wed, Dec 3, 2014 at 5:04 AM, David Aguilar dav...@gmail.com wrote: On Tue, Dec 02, 2014 at 10:09:35PM -0500, Eric Sunshine wrote: The potentially lesser evil would be this small patch (minus Gmail whitespace damage) which disables the deprecation warnings only for Apple's headers: - 8

Re: [PATCH v5 1/1] http: Add Accept-Language header if possible

2014-12-03 Thread Junio C Hamano
Yi EungJun semtlen...@gmail.com writes: From: Yi EungJun eungjun...@navercorp.com Add an Accept-Language header which indicates the user's preferred languages defined by $LANGUAGE, $LC_ALL, $LC_MESSAGES and $LANG. Examples: LANGUAGE= - LANGUAGE=ko:en - Accept-Language: ko, en;q=0.9,

[PATCH v2] rerere: error out on autoupdate failure

2014-12-03 Thread Jonathan Nieder
We have been tolerating errors by returning early with an error that the caller ignores since rerere.autoupdate was introduced in v1.6.0-rc0~120^2 (2008-06-22). So on error (for example if the index is already locked), rerere can return success without updating the index or with only some items

Re: [PATCH 12/14] hold_lock_file_for_update: pass error message back through a strbuf

2014-12-03 Thread Jonathan Nieder
Jonathan Nieder wrote: --- a/credential-store.c +++ b/credential-store.c @@ -55,13 +55,17 @@ static void print_line(struct strbuf *buf) static void rewrite_credential_file(const char *fn, struct credential *c, struct strbuf *extra) { -

Re: [PATCH 02/14] add_to_alternates_file: respect GIT_OBJECT_DIRECTORY

2014-12-03 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: The objects directory is spelled as get_object_directory(), not git_path(objects). Some other code still hard-codes the objects/ directory name, so in the long term we may want to get rid of the pretense of support for GIT_OBJECT_DIRECTORY

Re: [PATCH 03/14] copy_fd: pass error message back through a strbuf

2014-12-03 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: -extern int copy_fd(int ifd, int ofd); +extern int copy_fd(int ifd, int ofd, struct strbuf *err); It is not limited to this single function, but what contract do we envision this error messages are given back to the caller via strbuf convention should

Re: [PATCH v5 1/1] http: Add Accept-Language header if possible

2014-12-03 Thread Eric Sunshine
On Tue, Dec 2, 2014 at 7:12 AM, Yi EungJun semtlen...@gmail.com wrote: From: Yi EungJun eungjun...@navercorp.com Add an Accept-Language header which indicates the user's preferred languages defined by $LANGUAGE, $LC_ALL, $LC_MESSAGES and $LANG. Examples: LANGUAGE= - LANGUAGE=ko:en -

Re: [PATCH 09/14] config: use message from lockfile API when locking config file fails

2014-12-03 Thread Junio C Hamano
Up to this point the patches looked sensible (I am not saying that the remainder is junk---I haven't looked at them yet is all I am saying). Thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at

Re: [PATCH 03/14] copy_fd: pass error message back through a strbuf

2014-12-03 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: This way, callers can put the message in context or even avoid printing the message altogether. Currently hold_lock_file_for_append tries to save errno in order to produce a meaningful message about the failure and tries to print a second message

Re: [PATCH 01/14] strbuf: introduce strbuf_prefixf()

2014-12-03 Thread Eric Sunshine
On Wed, Dec 3, 2014 at 12:10 AM, Jonathan Nieder jrnie...@gmail.com wrote: When preparing an error message in a strbuf, it can be convenient to add a formatted string to the beginning: if (transaction_commit(t, err)) { strbuf_prefixf(err, cannot fetch '%s': ,

Re: [PATCH 01/14] strbuf: introduce strbuf_prefixf()

2014-12-03 Thread Jonathan Nieder
Eric Sunshine wrote: On Wed, Dec 3, 2014 at 12:10 AM, Jonathan Nieder jrnie...@gmail.com wrote: +void strbuf_prefixf(struct strbuf *sb, const char *fmt, ...) +{ + va_list ap; + size_t pos, len; + + pos = sb-len; + + va_start(ap, fmt); + strbuf_vaddf(sb,

Re: [PATCH 09/14] config: use message from lockfile API when locking config file fails

2014-12-03 Thread Jonathan Nieder
Junio C Hamano wrote: Up to this point the patches looked sensible (I am not saying that the remainder is junk---I haven't looked at them yet is all I am saying). Nice to hear. Thanks for looking it over. Jonathan -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: [PATCH 03/14] copy_fd: pass error message back through a strbuf

2014-12-03 Thread Jonathan Nieder
Junio C Hamano wrote: By the way, this seems to address the same thing as sb/copy-fd-errno topic that has been cooking in 'pu'? Should we drop that other topic and use this one instead? Yes, please. I'll give it an hour or two to collect more comments and then send a reroll reflecting them.

Re: [PATCH 03/14] copy_fd: pass error message back through a strbuf

2014-12-03 Thread Stefan Beller
On Wed, Dec 3, 2014 at 12:02 PM, Junio C Hamano gits...@pobox.com wrote: Jonathan Nieder jrnie...@gmail.com writes: This way, callers can put the message in context or even avoid printing the message altogether. Currently hold_lock_file_for_append tries to save errno in order to produce a

Re: [PATCH 03/14] copy_fd: pass error message back through a strbuf

2014-12-03 Thread Jonathan Nieder
Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: -extern int copy_fd(int ifd, int ofd); +extern int copy_fd(int ifd, int ofd, struct strbuf *err); It is not limited to this single function, but what contract do we envision this error messages are given back to the caller via

Re: [PATCH 14/14] lockfile: make 'unable_to_lock_message' private

2014-12-03 Thread Stefan Beller
On Tue, Dec 02, 2014 at 09:27:34PM -0800, Jonathan Nieder wrote: The old external callers now use the message passed back by hold_lock_file_for_update / hold_lock_file_for_append instead of trying to interpret errno. Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- That's the end of

Re: [PATCH 03/14] copy_fd: pass error message back through a strbuf

2014-12-03 Thread Jeff King
On Wed, Dec 03, 2014 at 11:01:08AM -0800, Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: -extern int copy_fd(int ifd, int ofd); +extern int copy_fd(int ifd, int ofd, struct strbuf *err); It is not limited to this single function, but what contract do we envision this

What's cooking in git.git (Dec 2014, #01; Wed, 3)

2014-12-03 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. People, coming up with new topics is fine, but please pay attention to what is going around the area you are touching. Does your topic applied

Re: [PATCH] gc: support temporarily preserving garbage

2014-12-03 Thread Brodie Rao
On Mon, Nov 17, 2014 at 1:34 PM, Jeff King p...@peff.net wrote: On Fri, Nov 14, 2014 at 03:01:05PM -0800, Junio C Hamano wrote: 23 files changed, 375 insertions(+), 7 deletions(-) [...] I am not sure if this much of code churn is warranted to work around issues that only happen on

Re: [PATCH v5 1/1] http: Add Accept-Language header if possible

2014-12-03 Thread Junio C Hamano
Eric Sunshine sunsh...@sunshineco.com writes: @@ -515,6 +517,9 @@ void http_cleanup(void) cert_auth.password = NULL; } ssl_cert_password_required = 0; + + if (cached_accept_language) + strbuf_release(cached_accept_language); Junio

Re: [PATCH 03/14] copy_fd: pass error message back through a strbuf

2014-12-03 Thread Jonathan Nieder
Hi, Jeff King wrote: What about a struct that has an errno-like value _and_ a fixed-size buffer? I'm thinking something like: struct error { int code; char msg[1024]; }; My experience with errno is that it is very hard to anticipate what granularity to use with error

Re: [PATCH 03/14] copy_fd: pass error message back through a strbuf

2014-12-03 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: By the way, this seems to address the same thing as sb/copy-fd-errno topic that has been cooking in 'pu'? Should we drop that other topic and use this one instead? Yes, please. OK. It felt strange that two people in a same

Re: [PATCH 01/14] strbuf: introduce strbuf_prefixf()

2014-12-03 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: When preparing an error message in a strbuf, it can be convenient to add a formatted string to the beginning: if (transaction_commit(t, err)) { strbuf_prefixf(err, cannot fetch '%s': , remotename); return -1;

Re: [PATCH 03/14] copy_fd: pass error message back through a strbuf

2014-12-03 Thread Jonathan Nieder
Junio C Hamano wrote: Jonathan Nieder writes: Junio C Hamano wrote: By the way, this seems to address the same thing as sb/copy-fd-errno topic that has been cooking in 'pu'? Should we drop that other topic and use this one instead? Yes, please. OK. It felt strange that two people in a

Re: [PATCH 01/14] strbuf: introduce strbuf_prefixf()

2014-12-03 Thread Jonathan Nieder
Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: +void strbuf_prefixf(struct strbuf *sb, const char *fmt, ...) +{ +va_list ap; +size_t pos, len; + +pos = sb-len; + +va_start(ap, fmt); +strbuf_vaddf(sb, fmt, ap); +va_end(ap); + +len = sb-len

Re: [PATCH v5 1/1] http: Add Accept-Language header if possible

2014-12-03 Thread Michael Blume
On Wed, Dec 3, 2014 at 1:37 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: @@ -515,6 +517,9 @@ void http_cleanup(void) cert_auth.password = NULL; } ssl_cert_password_required = 0; + + if

Re: [PATCH v5 1/1] http: Add Accept-Language header if possible

2014-12-03 Thread Michael Blume
On Wed, Dec 3, 2014 at 2:00 PM, Michael Blume blume.m...@gmail.com wrote: On Wed, Dec 3, 2014 at 1:37 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: @@ -515,6 +517,9 @@ void http_cleanup(void) cert_auth.password = NULL; }

Re: [PATCH 01/14] strbuf: introduce strbuf_prefixf()

2014-12-03 Thread Jonathan Nieder
Jonathan Nieder wrote: Junio C Hamano wrote: In any case, instead of this: struct strbuf tc_err = STRBUF_INIT; if (transaction_commit(t, tc_err)) { strbuf_addf(err, cannot fetch '%s': %s, remotename, tc_err.buf);

Re: Problems cloning existing (probably old) svn repo

2014-12-03 Thread Eric Wong
Cody Goodman codygman.consult...@gmail.com wrote: I recently got this error when trying to git svn clone an existing repo: Couldn't open a repository: Unable to connect to a repository at URL 'file:///home/cody/work/SmartPay': Unable to open an ra_local session to URL: Unable to open

Re: [PATCH 3/4] refs.c: add a transaction function to append a reflog entry

2014-12-03 Thread Stefan Beller
On Tue, Dec 02, 2014 at 07:15:19PM -0800, Jonathan Nieder wrote: I'll think about rewriting the commit message, so it is easier to digest. I'll follow your suggestions except for the following annotations +int transaction_update_reflog(struct transaction *transaction, +

Re: [PATCH 01/14] strbuf: introduce strbuf_prefixf()

2014-12-03 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: +void strbuf_prefixf(struct strbuf *sb, const char *fmt, ...) +{ + va_list ap; + size_t pos, len; + + pos = sb-len; + + va_start(ap, fmt); + strbuf_vaddf(sb, fmt, ap);

Re: [PATCH 3/4] refs.c: add a transaction function to append a reflog entry

2014-12-03 Thread Jonathan Nieder
Stefan Beller wrote: On Tue, Dec 02, 2014 at 07:15:19PM -0800, Jonathan Nieder wrote: Stefan Beller wrote: +int transaction_update_reflog(struct transaction *transaction, + const char *refname, + const unsigned char *new_sha1, +

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: diff --git a/refs.c b/refs.c index 917f8fc..39e43cf 100644 --- a/refs.c +++ b/refs.c @@ -2326,7 +2326,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname, */ goto retry;

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Jonathan Nieder
Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: diff --git a/refs.c b/refs.c index 917f8fc..39e43cf 100644 --- a/refs.c +++ b/refs.c @@ -2326,7 +2326,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname, */ goto

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Jonathan Nieder jrnie...@gmail.com writes: diff --git a/refs.c b/refs.c index 917f8fc..39e43cf 100644 --- a/refs.c +++ b/refs.c @@ -2326,7 +2326,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname, */

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Jonathan Nieder
Junio C Hamano wrote: I tried to merge the 14-patch series with obvious fix-ups after dropping the rerere abortion change you sent separately and in duplicate and also dropping sb/copy-fd, but I've ran out of patience with this step, at least for today's integration cycle. Should we also

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

2014-12-03 Thread Jason Pyeron
I remember hitting this a while ago, but just gave up. It seems to be a problem for others too. Any ideas on how to debug this so it can be patched? -Original Message- From: Dave Lindbergh Sent: Wednesday, December 03, 2014 18:07 To: cygwin Subject: Re: [cygwin] Cygwin's git says error:

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: The 14-patch series may have been internally consistent and its individual patches, when each of them was taken alone by itself, may have made sense, but it appears that the aggregated whole these separate topics took their root from is inconsistent

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Jonathan Nieder jrnie...@gmail.com writes: The 14-patch series may have been internally consistent and its individual patches, when each of them was taken alone by itself, may have made sense, but it appears that the aggregated whole these separate

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Jonathan Nieder
Junio C Hamano wrote: I was under the impression that the purpose of the series was to propose an API update to be used together with the remainder of the system, not just update code in master, breaking unstated set of topics and leaving them behind without updating them for now. Got it ---

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Jeff King
On Wed, Dec 03, 2014 at 03:29:51PM -0800, Jonathan Nieder wrote: Junio C Hamano wrote: I tried to merge the 14-patch series with obvious fix-ups after dropping the rerere abortion change you sent separately and in duplicate and also dropping sb/copy-fd, but I've ran out of patience

Re: Our cumbersome mailing list workflow

2014-12-03 Thread Philip Oakley
From: Michael Haggerty mhag...@alum.mit.edu Sent: Tuesday, November 25, 2014 12:28 AM On 11/21/2014 07:00 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: I don't think that those iterations changed anything substantial that overlaps with my version, but TBH it's such a

Re: Disabling credential helper?

2014-12-03 Thread brian m. carlson
On Tue, Dec 02, 2014 at 08:21:48PM -0500, Jeff King wrote: We could teach the credential-helper code to do that (e.g., a helper returns stop=true and we respect that). But I think you can do it reasonably well today by making the input process fail. Sadly setting GIT_ASKPASS to false just

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

2014-12-03 Thread brian m. carlson
On Wed, Dec 03, 2014 at 06:31:18PM -0500, Jason Pyeron wrote: I remember hitting this a while ago, but just gave up. It seems to be a problem for others too. Any ideas on how to debug this so it can be patched? -Original Message- From: Dave Lindbergh Sent: Wednesday, December

Re: Disabling credential helper?

2014-12-03 Thread Jeff King
On Tue, Dec 02, 2014 at 08:36:07PM -0500, Jeff King wrote: But to answer your question: you can't currently. I would be happy to have a config syntax that means reset this multi-value config option list to nothing, but it does not yet exist. It would be useful for more than just

Re: Our cumbersome mailing list workflow

2014-12-03 Thread Stefan Beller
Editing text files isn't that hard, we do it all the time. It is not indeed. But doing it all over again and again is hard and error prone. I did re-read the man page on git format-patch and found the --notes option, which I am going to try to use in my workflow. That way I only need to update

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

2014-12-03 Thread David Michael
This adds simple wrapper functions around calls to stat(), fstat(), and lstat() that translate the operating system's native file type bits to those used by most operating systems. It also rewrites the S_IF* macros to the common values, so all file type processing is performed using the

[PATCH/RFC] doc: document error handling functions and conventions (Re: [PATCH 03/14] copy_fd: pass error message back through a strbuf)

2014-12-03 Thread Jonathan Nieder
Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: -extern int copy_fd(int ifd, int ofd); +extern int copy_fd(int ifd, int ofd, struct strbuf *err); It is not limited to this single function, but what contract do we

[PATCH 0/2] disabling terminal prompts

2014-12-03 Thread Jeff King
On Thu, Dec 04, 2014 at 12:42:31AM +, brian m. carlson wrote: I'll probably submit a patch to disable the terminal prompting this weekend. Too late. You got me thinking about it, so I wrote the following series. [1/2]: credential: let helpers tell us to quit [2/2]: prompt: respect

Re: Deprecation warnings under XCode

2014-12-03 Thread David Aguilar
On Wed, Dec 03, 2014 at 01:54:51PM +0100, Torsten Bögershausen wrote: 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

[PATCH 1/2] credential: let helpers tell us to quit

2014-12-03 Thread Jeff King
When we are trying to fill a credential, we loop over the set of defined credential-helpers, then fall back to running askpass, and then finally prompt on the terminal. Helpers which cannot find a credential are free to tell us nothing, but they cannot currently ask us to stop prompting. This

[PATCH 2/2] prompt: respect GIT_TERMINAL_PROMPT to disable terminal prompts

2014-12-03 Thread Jeff King
If you run git as part of an automated system, you might prefer git to die rather than try to issue a prompt on the terminal (because there would be nobody to see it and respond, and the process would hang forever). This usually works out of the box because getpass() (and our more featureful

Re: [PATCH 06/14] lockfile: introduce flag for locks outside .git

2014-12-03 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: I tried to merge the 14-patch series with obvious fix-ups after dropping the rerere abortion change you sent separately and in duplicate and also dropping sb/copy-fd, but I've ran out of patience with this step, at least for

Re: Disabling credential helper?

2014-12-03 Thread Junio C Hamano
Jeff King p...@peff.net writes: 1. I chose the value-less boolean as a token to reset the list (since it is otherwise an unmeaningful error). The example above shows its use with -c, but you could also do: [credential] helper helper = foo in a config

Enhancement Request: locale git option

2014-12-03 Thread Ulrich Windl
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 (like LANG= git ...). OTOH Git has a flexible

Re: [PATCH 03/14] copy_fd: pass error message back through a strbuf

2014-12-03 Thread Jeff King
On Wed, Dec 03, 2014 at 01:38:58PM -0800, Jonathan Nieder wrote: What about a struct that has an errno-like value _and_ a fixed-size buffer? I'm thinking something like: struct error { int code; char msg[1024]; }; My experience with errno is that it is very hard to