Good day

2014-01-30 Thread Ms CHIANG Lai Yuen, JP
I am Ms. CHIANG Lai Yuen JP, I have a private business proposal worth $12.5 Million USD, reply to my private e-mail: (mschiang0...@live.com) for more details if you are interested and willing. Thank You, Ms CHIANG Lai Yuen, JP. -- To unsubscribe from this list: send the line unsubscribe git in

Re: [PATCH v4 01/17] Add data structures and basic functions for commit trailers

2014-01-30 Thread Eric Sunshine
On Thu, Jan 30, 2014 at 1:49 AM, Christian Couder chrisc...@tuxfamily.org wrote: We will use a doubly linked list to store all information about trailers and their configuration. This way we can easily remove or add trailers to or from trailer lists while traversing the lists in either

Re: Having Git follow symlinks

2014-01-30 Thread Peter Krefting
Johan Herland: I believe a preferable way to manage dotfiles in Git, is to have a script that does the necessary setup/installation from the repo (that lives in some subdirectory of ~) and into ~. Yeah, but then I have copies of the files, instead of having the files themselves under

Re: Having Git follow symlinks

2014-01-30 Thread Christian Couder
On Thu, Jan 30, 2014 at 10:01 AM, Peter Krefting pe...@softwolves.pp.se wrote: Johan Herland: I believe a preferable way to manage dotfiles in Git, is to have a script that does the necessary setup/installation from the repo (that lives in some subdirectory of ~) and into ~. There are tools

Re: git-draw - draws nearly the full content of a tiny git repository as a graph

2014-01-30 Thread John Szakmeister
On Wed, Jan 29, 2014 at 4:21 PM, Flo sensor...@gmail.com wrote: I just want to present a small tool I wrote. I use it at work to have a tool visualizing the Git basic concepts and data structures which are really really really simple (Linus' words). That helps me teaching my colleagues about

Strange merge output.

2014-01-30 Thread Vincent Bernardi
Hi, I asked about this problem on #git@freenode and someone suggested I submit it to this list. I have a case where the output of a merge gives a conflict and produces the following file: Code Block A HEAD === Code Block B branch-B Code Block B' (similar to code block B but not exactly

Re: Strange merge output.

2014-01-30 Thread David Kastrup
Vincent Bernardi vinc...@kameleoon.com writes: Hi, I asked about this problem on #git@freenode and someone suggested I submit it to this list. I have a case where the output of a merge gives a conflict and produces the following file: Code Block A HEAD === Code Block B branch-B

Re: [PATCH] add: don't complain when adding empty project root

2014-01-30 Thread Torsten Bögershausen
[] filepattern is related to current directory too (e.g. *.sh from t won't cover git-rebase.sh, :/*.sh does). Yes a patch to update git-add.txt to use the term pathspec instead of filepattern would be nice. A pointer to pathspec glossary could help discover case-insensitive matching, negative

Re: Having Git follow symlinks

2014-01-30 Thread Matthieu Moy
Peter Krefting pe...@softwolves.pp.se writes: Yeah, but then I have copies of the files, instead of having the files themselves under version control, meaning I need to copy them back to push changes back, or to merge them. That is undesirable :-/ One option is to have the symlink in the

Re: Questions on local clone and push back

2014-01-30 Thread Andrew Keller
On Jan 30, 2014, at 12:43 AM, Arshavir Grigorian grigor...@gmail.com wrote: 1) is this a good approach to achieving what I need If you do not intend to track the parent projects in Git, then yes - that is a good approach. With that said, I recommend tracking each parent project in its own Git

Re: Feature Request Google Authenticator Support

2014-01-30 Thread Erik Faye-Lund
On Thu, Jan 30, 2014 at 5:07 AM, Max Rahm ac90b...@gmail.com wrote: Github supports google authenticator 2-step authentication. I enabled it and how can't figure out how to connect to my github account through git. I've looked pretty hard in the man pages and on google and can't seem to find

[PATCH 5/5] builtin/commit.c: reduce scope of variables

2014-01-30 Thread Elia Pinto
Signed-off-by: Elia Pinto gitter.spi...@gmail.com --- This a reroll of a previous patch. Corrected the declaration after statement issue. builtin/commit.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 3767478..a684296

[PATCH jn/pager-lv-default-env] pager test: make fake pager consume all its input

2014-01-30 Thread Jonathan Nieder
Otherwise there is a race: if 'git log' finishes writing before the pager terminates and closes the pipe, all is well, and if the pager finishes quickly enough then 'git log' terminates with SIGPIPE. died of signal 13 at /build/buildd/git-1.9~rc1/t/test-terminal.perl line 33. not ok 6 - LESS

Re: Feature Request Google Authenticator Support

2014-01-30 Thread Jakub Narębski
On Thu, 2014-01-30, Erik Faye-Lund wrote: On Thu, Jan 30, 2014 at 5:07 AM, Max Rahm ac90b...@gmail.com wrote: Github supports google authenticator 2-step authentication. I enabled it and how can't figure out how to connect to my github account through git. I've looked pretty hard in the man

Re: Feature Request Google Authenticator Support

2014-01-30 Thread Scott Chacon
Hey, On Thu, Jan 30, 2014 at 6:28 AM, Erik Faye-Lund kusmab...@gmail.com wrote: On Thu, Jan 30, 2014 at 5:07 AM, Max Rahm ac90b...@gmail.com wrote: Github supports google authenticator 2-step authentication. I enabled it and how can't figure out how to connect to my github account through git.

Re: Running make rpm fails on a CentOS 6.3 machine

2014-01-30 Thread Jonathan Nieder
Hi, Erez Zilber wrote: Writing perl.mak for Git Writing perl.mak for Git rename MakeMaker.tmp = perl.mak: No such file or directory at /usr/share/perl5/ExtUtils/MakeMaker.pm line 1024. make[3]: perl.mak: No such file or directory make[3]: perl.mak: No such file or directory make[3]: ***

Re: Running make rpm fails on a CentOS 6.3 machine

2014-01-30 Thread Todd Zullinger
Hello, Jonathan Nieder wrote: Erez Zilber wrote: Writing perl.mak for Git Writing perl.mak for Git rename MakeMaker.tmp = perl.mak: No such file or directory at /usr/share/perl5/ExtUtils/MakeMaker.pm line 1024. make[3]: perl.mak: No such file or directory make[3]: perl.mak: No such file or

inconsistent include behaviour for core.sharedRepository

2014-01-30 Thread Gordon McGregor
After several days of problems with directory permissions in the objects/ directory for shared users, I finally found the cause of an issue that we have been seeing. We are working with several shared repositories. We were trying to use a shared [include] configuration that contained [core]

[PATCH] Ensure __BYTE_ORDER is always set

2014-01-30 Thread Brian Gernhardt
a201c20 (ewah: support platforms that require aligned reads) added a reliance on the existence of __BYTE_ORDER and __BIG_ENDIAN. However, these macros are spelled without the leading __ on some platforms (OS X at least). In this case, the endian-swapping code was added even when unnecessary,

Re: What's cooking in git.git (Jan 2014, #06; Wed, 29)

2014-01-30 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com * po/everyday-doc (2014-01-27) 1 commit - Make 'git help everyday' work This may make the said command to emit something, My initial intention ;-) but the source is not meant to be formatted into a manual pages to begin with, and also its

Re: [PATCH] Ensure __BYTE_ORDER is always set

2014-01-30 Thread Jeff King
On Thu, Jan 30, 2014 at 02:55:41PM -0500, Brian Gernhardt wrote: a201c20 (ewah: support platforms that require aligned reads) added a reliance on the existence of __BYTE_ORDER and __BIG_ENDIAN. However, these macros are spelled without the leading __ on some platforms (OS X at least). In

Re: [PATCH] Ensure __BYTE_ORDER is always set

2014-01-30 Thread Jeff King
On Thu, Jan 30, 2014 at 03:45:38PM -0500, Jeff King wrote: Either way, we should perhaps be more careful in the bitmap code, too, that the values we get are sensible. It's better to die(your bitmap is broken) than to read off the end of the array. I can't seem to trigger the same failure

Re: [PATCH] Ensure __BYTE_ORDER is always set

2014-01-30 Thread Jonathan Nieder
Hi, Brian Gernhardt wrote: a201c20 (ewah: support platforms that require aligned reads) added a reliance on the existence of __BYTE_ORDER and __BIG_ENDIAN. However, these macros are spelled without the leading __ on some platforms (OS X at least). In this case, the endian-swapping code was

Re: [PATCH] Ensure __BYTE_ORDER is always set

2014-01-30 Thread Jonathan Nieder
Hi, Jeff King wrote: I do find the failure mode interesting. The endian-swapping code kicked in when it did not Odd --- wouldn't the #if condition expand to '0 != 0'? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: [ANNOUNCE] Git v1.9-rc0

2014-01-30 Thread Sitaram Chamarty
On 01/28/2014 05:58 PM, Kacper Kornet wrote: On Mon, Jan 27, 2014 at 10:58:29AM -0800, Jonathan Nieder wrote: Hi, Kacper Kornet wrote: The change in release numbering also breaks down gitolite v2 setups. One of the gitolite commands, gl-compile-conf, expects the output of git --version

Re: [PATCH] Ensure __BYTE_ORDER is always set

2014-01-30 Thread Jeff King
On Thu, Jan 30, 2014 at 02:02:33PM -0800, Jonathan Nieder wrote: In an ideal world I would prefer to just rely on ntohll when it's decent (meaning that the '#if __BYTE_ORDER != __BIG_ENDIAN' block could be written as if (ntohll(1) != 1) { ... } or if

Re: [PATCH] Ensure __BYTE_ORDER is always set

2014-01-30 Thread Jeff King
On Thu, Jan 30, 2014 at 02:12:05PM -0800, Jonathan Nieder wrote: Jeff King wrote: I do find the failure mode interesting. The endian-swapping code kicked in when it did not Odd --- wouldn't the #if condition expand to '0 != 0'? I had the same thought. The kicked in when it did not is

Re: [PATCH] Ensure __BYTE_ORDER is always set

2014-01-30 Thread Brian Gernhardt
[Re-send to include the list. Meant to hit reply all, not just reply.] On Jan 30, 2014, at 3:45 PM, Jeff King p...@peff.net wrote: I do find the failure mode interesting. The endian-swapping code kicked in when it did not, meaning your are on a big-endian system. Is this on an ancient PPC

Re: [PATCH] Ensure __BYTE_ORDER is always set

2014-01-30 Thread Eric Sunshine
On Thu, Jan 30, 2014 at 4:50 PM, Jeff King p...@peff.net wrote: I think we could do this with something like the patch below, which checks two things: 1. When we expand the ewah, it has the same number of bits we claimed in the on-disk header. 2. The ewah header matches the number

Re: [PATCH v4 05/17] strbuf: add strbuf_isspace()

2014-01-30 Thread Eric Sunshine
On Thu, Jan 30, 2014 at 1:49 AM, Christian Couder chrisc...@tuxfamily.org wrote: This helper function checks if a strbuf contains only space chars or not. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- diff --git a/strbuf.c b/strbuf.c index 83caf4a..2124bb8 100644 ---

Re: [PATCH v4 12/17] strbuf: add strbuf_replace()

2014-01-30 Thread Eric Sunshine
On Thu, Jan 30, 2014 at 1:49 AM, Christian Couder chrisc...@tuxfamily.org wrote: Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- diff --git a/strbuf.c b/strbuf.c index 2124bb8..e45e513 100644 --- a/strbuf.c +++ b/strbuf.c @@ -197,6 +197,13 @@ void strbuf_splice(struct strbuf

Re: [PATCH v4 02/17] trailer: process trailers from file and arguments

2014-01-30 Thread Eric Sunshine
On Thu, Jan 30, 2014 at 1:49 AM, Christian Couder chrisc...@tuxfamily.org wrote: This patch implements the logic that process trailers from file and arguments. At the beginning trailers from file are in their own infile_tok doubly linked list, and trailers from arguments are in their own

[PATCH] Cleanly redefine (v)snprintf when needed.

2014-01-30 Thread Benoit Sigoure
When we detect that vsnprintf / snprintf are broken, we #define them to an alternative implementation. On OS X, stdio.h already #define's them, which causes a warning to be issued at the point we re-define them in `git-compat-util.h'. --- git-compat-util.h | 6 ++ 1 file changed, 6