[PATCHv2 1/3] builtin/notes: Fix premature failure when trying to add the empty blob

2014-11-05 Thread Johan Herland
This fixes a small buglet when trying to explicitly add the empty blob as a note object using the -c or -C option to git notes add/append. Instead of failing with a nonsensical error message indicating that the empty blob does not exist, we should rather behave as if an empty notes message was

Re: [PATCH 1/2] t3312-notes-empty: Test that 'git notes' removes empty notes by default

2014-11-05 Thread Johan Herland
On Wed, Nov 5, 2014 at 5:10 AM, Eric Sunshine sunsh...@sunshineco.com wrote: [...] write_script() would allow you to drop the #!/bin/sh and chmod lines. [...] Rather than hard-coding this output, generating it would make the test script less fragile: git log -1 expect_missing [...]

[PATCHv2 2/3] t3312-notes-empty: Test that 'git notes' removes empty notes by default

2014-11-05 Thread Johan Herland
Add test cases documenting the current behavior when trying to add/append/edit empty notes. This is in preparation for adding --allow-empty; to allow empty notes to be stored. Improved-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Johan Herland jo...@herland.net ---

[PATCHv2 3/3] notes: Add --allow-empty, to allow storing empty notes

2014-11-05 Thread Johan Herland
Although the git notes man page advertises that we support binary-safe notes addition (using the -C option), we currently do not support adding the empty note (i.e. using the empty blob to annotate an object). Instead, an empty note is always treated as an intent to remove the note altogether.

Re: Odd git am behavior rewriting subject, adding ASoC: prefix

2014-11-05 Thread Chris Packham
On Wed, Nov 5, 2014 at 2:12 PM, Joe Perches j...@perches.com wrote: I have a patch file created by git format-patch. Applying it via git am changes the subject prefix. Anyone know why? $ git --version git version 2.1.2 $ git am -i 0002-staging-ft1000-Logging-message-neatening.patch

[Opinions] Integrated tickets

2014-11-05 Thread Fredrik Gustafsson
Hi, many developers rely on ticket systems (githubs issues, trac, bugzilla, etc.). To me a ticket often has a relation to one or more commits. Hence, even if git is functional in an offline enviroment, I can't work fully since none of the ticket systems above is distributed. This can be solved

Re: [PATCH] use child_process_init() to initialize struct child_process variables

2014-11-05 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Monday, November 03, 2014 11:42 PM Jeff King p...@peff.net writes: I peeked at libgit2 and I think it does not support bundles at all yet, so that is safe. Grepping for bundle in dulwich turns up no hits, either. Looks like JGit does support them.

Re: [PATCH] use child_process_init() to initialize struct child_process variables

2014-11-05 Thread Philip Oakley
From: Jeff King p...@peff.net Subject: Re: [PATCH] use child_process_init() to initialize struct child_process variables On Tue, Nov 04, 2014 at 01:56:15PM -0800, Junio C Hamano wrote: 2. Including two lines, like: $sha1 HEAD\0symref=refs/heads/master $sha1 HEAD

Re: Odd git am behavior rewriting subject, adding ASoC: prefix

2014-11-05 Thread Joe Perches
On Wed, 2014-11-05 at 22:12 +1300, Chris Packham wrote: On Wed, Nov 5, 2014 at 2:12 PM, Joe Perches j...@perches.com wrote: I have a patch file created by git format-patch. [] ASoC:? where does that come from? [] Looks like you have an apply-patch-msg hook installed. What does the output of

Re: [PATCH v5] lockfile.c: store absolute path

2014-11-05 Thread Michael Haggerty
On 11/05/2014 03:23 AM, Scott Schmit wrote: On Sun, Nov 02, 2014 at 07:24:37AM +0100, Michael Haggerty wrote: Locked paths can be saved in a linked list so that if something wrong happens, *.lock are removed. For relative paths, this works fine if we keep cwd the same, which is true 99% of

imap-send: Use parse options API to determine verbosity

2014-11-05 Thread Bernhard Reiter
Signed-off-by: Bernhard Reiter ock...@raz.or.at --- As requested per xmqqzjcewq6p@gitster.dls.corp.google.com. Documentation/git-imap-send.txt | 14 +- imap-send.c | 25 +++-- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git

fatal unresolved deltas error

2014-11-05 Thread Konstantin Khomoutov
Hi, I'm posting on behalf of Anjib Mulepati (Cc'ed) whose mails have troubles getting in here. Originally posted to git-users [*] but the problem appears to be too complicated for that list. [*] https://groups.google.com/d/topic/git-users/fnU3JtRuwH8/discussion Below is the original Anjib's

Re: [PATCH 1/2] t3312-notes-empty: Test that 'git notes' removes empty notes by default

2014-11-05 Thread Junio C Hamano
Johan Herland jo...@herland.net writes: Add test cases documenting the current behavior when trying to add/append/edit empty notes. This is in preparation for adding --allow-empty; to allow empty notes to be stored. Signed-off-by: Johan Herland jo...@herland.net --- t/t3312-notes-empty.sh

Re: [PATCHv2 2/3] t3312-notes-empty: Test that 'git notes' removes empty notes by default

2014-11-05 Thread Junio C Hamano
Johan Herland jo...@herland.net writes: Add test cases documenting the current behavior when trying to add/append/edit empty notes. This is in preparation for adding --allow-empty; to allow empty notes to be stored. Improved-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Johan

Re: [PATCH] use child_process_init() to initialize struct child_process variables

2014-11-05 Thread Jeff King
On Wed, Nov 05, 2014 at 01:35:21PM -, Philip Oakley wrote: 2. Including two lines, like: [...] I believe that the 'two HEADs' mechanism would also fall foul of the 'duplicate refs' warning (untested). It didn't in my very brief testing of what I posted above, but maybe there is some

Re: Bug in log for path in case of identical commit

2014-11-05 Thread Alexandre Garnier
2014-11-04 17:21 GMT+01:00 Phil Hord phil.h...@gmail.com: On Fri, Oct 31, 2014 at 4:40 AM, Alexandre Garnier zigarn+...@gmail.com wrote: When merging 2 branches with the same modifications on the both sides, depending the merge side, one branch disappear from the file history. To be more

Re: imap-send: Use parse options API to determine verbosity

2014-11-05 Thread Junio C Hamano
Bernhard Reiter ock...@raz.or.at writes: Signed-off-by: Bernhard Reiter ock...@raz.or.at --- As requested per xmqqzjcewq6p@gitster.dls.corp.google.com. Heh, I didn't quite request it, but thanks for a patch anyway. diff --git a/imap-send.c b/imap-send.c index 70bcc7a..7f40960 100644

[PATCH v2] imap-send: Use parse options API to determine verbosity

2014-11-05 Thread Bernhard Reiter
Signed-off-by: Bernhard Reiter ock...@raz.or.at --- In reply to xmqqk339ibal@gitster.dls.corp.google.com. Thanks for bearing with me. I should've given the corresponding verbosity values more thought myself in the first place. Documentation/git-imap-send.txt | 14 +- imap-send.c

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

2014-11-05 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'. You can find the changes described here in the integration branches of the repositories listed at

Re: [PATCH] use child_process_init() to initialize struct child_process variables

2014-11-05 Thread Philip Oakley
From: Jeff King p...@peff.net On Wed, Nov 05, 2014 at 01:35:21PM -, Philip Oakley wrote: 2. Including two lines, like: [...] I believe that the 'two HEADs' mechanism would also fall foul of the 'duplicate refs' warning (untested). It didn't in my very brief testing of what I posted

Re: [PATCH v2] imap-send: Use parse options API to determine verbosity

2014-11-05 Thread Junio C Hamano
Bernhard Reiter ock...@raz.or.at writes: Signed-off-by: Bernhard Reiter ock...@raz.or.at --- In reply to xmqqk339ibal@gitster.dls.corp.google.com. Thanks for bearing with me. I should've given the corresponding verbosity values more thought myself in the first place. The original

Re: [PATCH v2] imap-send: Use parse options API to determine verbosity

2014-11-05 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Thanks. This version looks more sensible. -if (argc != 1) -usage(imap_send_usage); - setup_git_directory_gently(nongit_ok); git_imap_config(); + argc = parse_options(argc, (const char **)argv, , imap_send_options,

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

2014-11-05 Thread victor
Hi, I installed git 2.1.3 on sparc 8 by source code with make install, however I got git core dump during 'git clone'. I used command as below to compile and install: ./configure --prefix=/usr/local/git-2.1.3/ --enable-pthreads sudo gmake NO_GETTEXT=1 install Below I pasted the gdb bt full

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

2014-11-05 Thread Jeff King
On Wed, Nov 05, 2014 at 09:19:04PM -0800, victor wrote: (gdb) bt full #0 0xff0332ec in strlen () from /usr/lib/libc.so.1 No symbol table info available. #1 0xff0866b8 in _doprnt () from /usr/lib/libc.so.1 No symbol table info available. #2 0xff088ac0 in vsnprintf () from

Re: smart http push setup/egit win7

2014-11-05 Thread Jeff King
On Wed, Nov 05, 2014 at 07:11:29PM +, Jonathan wrote: The client can connect to and successfully fetch the repo from the server over https. However, when trying to push egit gives the error remote does not support http push. When attempting a push via bash, I get return code 22 - fatal:

Re: [Opinions] Integrated tickets

2014-11-05 Thread Jeff King
On Wed, Nov 05, 2014 at 01:44:29PM +0100, Fredrik Gustafsson wrote: So my question is: what's your opinions on building an integrated ticket system on top of git? I think it's a nice concept, but there have been several implementations, and AFAIK none of them is incredibly popular. I do not

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

2014-11-05 Thread victor
Hi, Thanks for the input. With below command, I got new error as below: ./configure --prefix=/usr/local/git-2.1.3/ --disable-pthreads sudo gmake NO_GETTEXT=1 install Undefined first referenced symbol in file type_cas_unlock

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

2014-11-05 Thread Jeff King
On Wed, Nov 05, 2014 at 10:34:27PM -0800, victor wrote: Thanks for the input. With below command, I got new error as below: ./configure --prefix=/usr/local/git-2.1.3/ --disable-pthreads sudo gmake NO_GETTEXT=1 install Undefined first referenced symbol

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

2014-11-05 Thread victor
Hi Jeff, Thanks for your help, as your suggestion, I can compile/install git with --disable_ptheads now. While ran 'git clone', it still got core dump. Would you please have a look at it? (gdb) bt full #0 0xff0332ec in strlen () from /usr/lib/libc.so.1 No symbol table info available. #1

[PATCH] docs/credential-store: s/--store/--file/

2014-11-05 Thread Jeff King
On Thu, Oct 23, 2014 at 05:14:56PM +, Hopkins, Jesse wrote: The man page for git-credential-store at http://git-scm.com/docs/git-credential-store and https://www.kernel.org/pub/software/scm/git/docs/git-credential-store.html incorrectly state that the option to change the credential