Re: [PATCH v1 4/4] hashmap: add string interning API

2014-07-03 Thread Matthieu Moy
Karsten Blees karsten.bl...@gmail.com writes: --- a/t/t0011-hashmap.sh +++ b/t/t0011-hashmap.sh @@ -237,4 +237,17 @@ test_expect_success 'grow / shrink' ' ' +test_expect_success 'string interning' ' + +test_hashmap intern value1 +intern Value1 +intern value2 +intern value2 +

Re: [PATCH v1 0/4] hashmap improvements

2014-07-03 Thread Matthieu Moy
Karsten Blees karsten.bl...@gmail.com writes: Here are a few small hashmap improvements, partly resulting from recent discussion of the config-cache topic. Karsten Blees (4): hashmap: factor out getting an int hash code from a SHA1 hashmap: improve struct hashmap member documentation

Re: [PATCH RFC v2 00/19] Enable options --signoff, --reset-author for pick, reword

2014-07-03 Thread Michael Haggerty
On 07/02/2014 07:47 PM, Fabian Ruch wrote: [...] 2. Add user options to main commands Enable options --signoff, --reset-author for pick, reword (19/19) The last stage was added in this reroll. It enables the parsing of line options for to-do list commands, which is still restricted

Re: [PATCH v5 2/7] replace: add test for --graft

2014-07-03 Thread Christian Couder
On Wed, Jul 2, 2014 at 10:49 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder chrisc...@tuxfamily.org writes: Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t6050-replace.sh | 12 1 file changed, 12

Re: [PATCH v5 5/7] replace: refactor replacing parents

2014-07-03 Thread Christian Couder
On Wed, Jul 2, 2014 at 11:05 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder chrisc...@tuxfamily.org writes: Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/replace.c | 42 +- 1 file changed, 25 insertions(+), 17

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

2014-07-03 Thread Avi Kivity
On 07/02/2014 08:17 PM, Junio C Hamano wrote: Avi Kivity a...@cloudius-systems.com writes: + if test 't' == $message_id + then + grep ^Message-Id: $dotest/info || true + fi if test '' != $ADD_SIGNOFF

Re: [PATCH v5 6/7] replace: remove signature when using --graft

2014-07-03 Thread Christian Couder
On Wed, Jul 2, 2014 at 11:19 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder chrisc...@tuxfamily.org writes: It could be misleading to keep a signature in a replacement commit, so let's remove it. Note that there should probably be a way to sign the replacement commit created

Re: [PATCH v5 7/7] replace: add test for --graft with signed commit

2014-07-03 Thread Christian Couder
On Wed, Jul 2, 2014 at 11:22 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder chrisc...@tuxfamily.org writes: +test_expect_success GPG 'set up a signed commit' ' + echo line 17 hello + echo line 18 hello Style? Yeah, I will change it to: echo line 17 hello

Re: Show containing branches in log?

2014-07-03 Thread Peter Krefting
Robert Dailey: Is there a way to graphically see what is the nearest named ref to the specified commit in the logs? git log --graph --decorate commit.. will display all the commits that happened after the commit commit, with the branch names indicated, with lines indicating the ancestry.

Git for Windows no longer on Google Code

2014-07-03 Thread Johannes Schindelin
Dear friends of Git, the Git for Windows team, myself included, tried quite a couple of times to mark the old home of Git for Windows on Google Code as obsolete. Unfortunately, it is not possible to disable issue trackers nor downloads (and Google Search helpfully insists on listing them as top

[BUG] rebase no longer omits local commits

2014-07-03 Thread Ted Felix
Starting with git 1.9.0, rebase no longer omits local commits that appear in both the upstream and local branches. I've bisected this down to commit bb3f458: rebase: fix fork-point with zero arguments. The attached script reproduces the problem. Reverting the aforementioned commit fixes the

bug in os x - deleted file on clone

2014-07-03 Thread David Salib
Hello, When I clone a repository using git on osx this happens : grandmesse:code dubbed$ git clone ssh://git@[snip]/puppet.git Cloning into 'puppet'... remote: Counting objects: 5313, done. remote: Compressing objects: 100% (4086/4086), done. remote: Total 5313 (delta 2200), reused

Re: bug in os x - deleted file on clone

2014-07-03 Thread Jeff King
On Thu, Jul 03, 2014 at 11:53:28AM -0400, David Salib wrote: When I clone a repository using git on osx this happens : [...] deleted:modules/areversat-nidautoprov/files/dhcp/staticDHCPd/staticDHCPd [...] This does not happen under linux so the repository isn't the issue. Does the

Re: [PATCH v4 1/2] add `config_set` API for caching config files

2014-07-03 Thread Tanay Abhra
On 7/2/2014 10:30 PM, Junio C Hamano wrote: Tanay Abhra tanay...@gmail.com writes: diff --git a/Documentation/technical/api-config.txt b/Documentation/technical/api-config.txt index 230b3a0..2c02fee 100644 --- a/Documentation/technical/api-config.txt +++

Re: Show containing branches in log?

2014-07-03 Thread Jeff King
On Thu, Jul 03, 2014 at 03:18:42PM +0100, Peter Krefting wrote: Robert Dailey: Is there a way to graphically see what is the nearest named ref to the specified commit in the logs? git log --graph --decorate commit.. will display all the commits that happened after the commit commit,

Re: Support for EBCDIC

2014-07-03 Thread Jeff King
On Wed, Jul 02, 2014 at 07:39:12PM -0700, Scott McKellar wrote: Is Git supposed to be usable in an environment where the execution character set is EBCDIC? Not really. In addition to the cases you found (and I would be surprised if there are not more, such as our reimplementation of

Wish bug report: Comments to the state group may be inconsistent with real state

2014-07-03 Thread Олег Ярыгин
Hello to the community! I noticed when HEAD is changed outside the Wish (for example in console) while Amend Last Commit option in the GUI is chosen, committing state becomes inconsistent. Staged files list and commit description looks like New Commit is chosen, but options group still points to

Re: [PATCH v5 2/7] replace: add test for --graft

2014-07-03 Thread Junio C Hamano
Christian Couder christian.cou...@gmail.com writes: On Wed, Jul 2, 2014 at 10:49 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder chrisc...@tuxfamily.org writes: Signed-off-by: Christian Couder chrisc...@tuxfamily.org Signed-off-by: Junio C Hamano gits...@pobox.com ---

Re: [BUG] rebase no longer omits local commits

2014-07-03 Thread John Keeping
On Thu, Jul 03, 2014 at 11:14:26AM -0400, Ted Felix wrote: Starting with git 1.9.0, rebase no longer omits local commits that appear in both the upstream and local branches. I've bisected this down to commit bb3f458: rebase: fix fork-point with zero arguments. The attached script

Re: Show containing branches in log?

2014-07-03 Thread Øyvind A . Holm
On 2 July 2014 16:50, Robert Dailey rcdailey.li...@gmail.com wrote: I know that with the `git branch` command I can determine which branches contain a commit. Is there a way to represent this graphically with `git log`? Sometimes I just have a commit, and I need to find out what branch

RE: Support for EBCDIC

2014-07-03 Thread Jason Pyeron
-Original Message- From: Jeff King Sent: Thursday, July 03, 2014 13:34 On Wed, Jul 02, 2014 at 07:39:12PM -0700, Scott McKellar wrote: Is Git supposed to be usable in an environment where the execution character set is EBCDIC? Not really. If the core uses specific 8bit

Git diff cr+lf inconsistency observations

2014-07-03 Thread Jason Pyeron
(I am on the list cc not needed) jpyeron@black /projects/cipherShed $ git --version uname -a git version 1.8.4.21.g992c386 CYGWIN_NT-5.2-WOW64 black 1.7.30(0.272/5/3) 2014-05-23 10:36 i686 Cygwin jpyeron@black /projects/cipherShed $ git diff src/Format/Format.vcproj diff --git

Re: Compile Error on Git 2.0.1 on Redhat 5.9 with Fix

2014-07-03 Thread Eldon Nelson
Thanks for the tip Jeff. config.mak.autogen is created in the git compile only when you do a ./configure. Mine had the bad reference to gar in it due to the following. It was caused because my path had a reference to a non-related gar executable (some internal command). I saw the compile

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

2014-07-03 Thread Jens Lehmann
Am 03.07.2014 07:56, schrieb Torsten Bögershausen: On 07/02/2014 09:57 PM, Jens Lehmann wrote: Am 02.07.2014 16:54, schrieb Torsten Bögershausen: (Not sure if this is the right thread) (I haven't checked if this is fixed in your latest version) Yes, this is the right thread and no, it isn't

t5150-request-pull.sh fails on newest master in Debian

2014-07-03 Thread Øyvind A . Holm
When compiling newest master (v2.0.1-472-g6f92e5f) on Debian 7.5 (64-bit), t5150-request-pull.sh fails when compiling with $ make configure $ ./configure --prefix=/usr/local/varprg/git.master.v2.0.1-472-g6f92e5f $ make prefix=/usr/local/varprg/git.master.v2.0.1-472-g6f92e5f $ make $ cd t $

Re: t5150-request-pull.sh fails on newest master in Debian

2014-07-03 Thread David Turner
Interesting! I wonder if the problem is with the compiler or with my code. I don't happen to have a Debian box handy; would it be possible for you to compile refs.c to assembly language (gcc -S) and send me the output? That would help me track down the problem. On Thu, 2014-07-03 at 23:55

Re: t5150-request-pull.sh fails on newest master in Debian

2014-07-03 Thread Øyvind A . Holm
On 3 July 2014 23:55, Øyvind A. Holm su...@sunbase.org wrote: When compiling newest master (v2.0.1-472-g6f92e5f) on Debian 7.5 (64-bit), t5150-request-pull.sh fails when compiling with $ make configure $ ./configure --prefix=/usr/local/varprg/git.master.v2.0.1-472-g6f92e5f $ make

[PATCH 0/2] always run all lint targets when running the test suite

2014-07-03 Thread Jens Lehmann
I recently accidentally added a non-portable echo -n to a test suite helper which make test didn't show. This series attempts to detect such problems early when running the test suite. The first patch includes the helper scripts to be tested too when running make test-lint (and thus the

[PATCH 1/2] t/Makefile: check helper scripts for non-portable shell commands too

2014-07-03 Thread Jens Lehmann
Currently only the t[0-9][0-9][0-9][0-9]-*.sh scripts are tested for shell incompatibilities using the check-non-portable-shell.pl script. This makes it easy to miss non-POSIX constructs added to one of the t/*lib*.sh helper scripts, as they aren't automatically detected. Fix that by adding a

[PATCH 2/2] t/Makefile: always test all lint targets when running tests

2014-07-03 Thread Jens Lehmann
Only the two targets test-lint-duplicates and test-lint-executable are currently executed when running the test target. This was done on purpose when the TEST_LINT variable was added in 81127d74. But as this does not include the test-lint-shell-syntax target added the same day in commit c7ce70ac,

Re: [BUG] rebase no longer omits local commits

2014-07-03 Thread John Keeping
On Thu, Jul 03, 2014 at 08:09:17PM +0100, John Keeping wrote: On Thu, Jul 03, 2014 at 11:14:26AM -0400, Ted Felix wrote: Starting with git 1.9.0, rebase no longer omits local commits that appear in both the upstream and local branches. It is the problem that bb3f458 fixes. The change in

[PATCH] trace.h: suppress some sparse warnings and errors

2014-07-03 Thread Ramsay Jones
Commit 07896a5c (trace: improve trace performance, 02-07-2014) added a 'trace_key' structure to the trace.h header file which provokes sparse to issue numerous (837) warnings and errors, like so: SP abspath.c trace.h:8:26: warning: duplicate const trace.h:10:29: error: dubious

Re: t5150-request-pull.sh fails on newest master in Debian

2014-07-03 Thread Øyvind A . Holm
On 4 July 2014 00:34, Øyvind A. Holm su...@sunbase.org wrote: On 4 July 2014 00:16, David Turner dtur...@twopensource.com wrote: On Thu, 2014-07-03 at 23:55 +0200, Øyvind A. Holm wrote: When compiling newest master (v2.0.1-472-g6f92e5f) on Debian 7.5 (64-bit), t5150-request-pull.sh fails

Re: [PATCH v4 1/2] add `config_set` API for caching config files

2014-07-03 Thread Tanay Abhra
Hi, I have cooked up a single hashmap implementation. What are your thoughts about it? I must say it is much cleaner than the previous attempt and it passes all the tests. I will send the revised patch tomorrow with the corrected documentation, till then please say so if you prefer this one or