[PATCH v3 2/3] config: Introduce diff.algorithm variable

Some users or projects prefer different algorithms over others, e.g. patience over myers or similar. However, specifying appropriate argument every time diff is to be used is impractical. Moreover, creating an alias doesn't play nicely with other tools based on diff (git-show for instance). Hence,

[PATCH v3 1/3] git-completion.bash: Autocomplete --minimal and --histogram for git-diff

Even though --patience was already there, we missed --minimal and --histogram for some reason. Signed-off-by: Michal Privoznik --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completi

[PATCH v3 3/3] diff: Introduce --diff-algorithm command line option

Since command line options have higher priority than config file variables and taking previous commit into account, we need a way how to specify myers algorithm on command line. However, inventing `--myers` is not the right answer. We need far more general option, and that is `--diff-algorithm`. S

[PATCH v3 0/3] Rework git-diff algorithm selection

It's been a while I was trying to get this in. Recently, I realized how important this is. Please keep me CC'ed as I am not subscribed to the list. diff to v1: -Junio's suggestions worked in diff to v2: -yet more Junio's suggestions included Michal Privoznik (3): git-completion.bash: Autocomp

Pandora charms together with Way Earrings to your Holiday season

On a occasion, for anybody who is attired that will remove, basically add more pandora charms canada to your solution utilizing wineglass beads. That's it all!! You are definitely that will swipe any clearly show as soon as the wineglass beads replicate any t

Re: [PATCH] Allow custom "comment char"

Junio C Hamano writes: > Ralf Thielow writes: > ... > Looks like a good progress overall, except for nits here and there. > >> diff --git a/builtin/notes.c b/builtin/notes.c >> index 453457a..5e84e35 100644 >> --- a/builtin/notes.c >> +++ b/builtin/notes.c >> @@ -92,10 +92,7 @@ static const char

Re: t9902 fails (Was: [PATCH] attr: fix off-by-one directory component length calculation)

On 01/16/2013 12:24 AM, Jeff King wrote: On Tue, Jan 15, 2013 at 12:49:05PM -0800, Junio C Hamano wrote: "Jean-Noël AVILA" writes: Btw, the test 10 to t9902 is failing on my Debian testing. Is it a known issue? Which branch? t9902.10 is overly sensitive to extra git commands in your PATH

Re: [PATCH] attr: fix off-by-one directory component length calculation

On Tue, Jan 15, 2013 at 09:35:21PM -0800, Junio C Hamano wrote: > >> Also the original only > >> scanned the string from the beginning once (instead of letting > >> strlen() to scan once and go back). > > > > But we do need to strlen() anyway in collect_all_attrs(). > > That is exactly my point, i

git fetch without --recurse-submodules option

Hi, With git pull or git fetch without specifying --recurse-submodules, what is the default action? It seems git fetches submodules wtihout specifying --recurse-submodules. If this is not clear, please update documentation. In git pull document --recurse-submodules option, it tells users to see gi

Re: [PATCH] attr: fix off-by-one directory component length calculation

Duy Nguyen writes: > On Wed, Jan 16, 2013 at 9:33 AM, Junio C Hamano wrote: >> Duy Nguyen writes: >> >>> On Wed, Jan 16, 2013 at 08:08:03AM +0700, Duy Nguyen wrote: Actually I'd like to remove that function. >>> >>> This is what I had in mind: >> >> I think the replacement logic to find th

Re: [PATCH 3/7] contrib/subtree: Add --unannotate

gree...@obbligato.org writes: > gree...@obbligato.org writes: > >>> I think this paragraph inherits existing breakage from the beginning >>> of time, but I do not think the above will format the second and >>> subsequent paragraphs correctly. >> >> Ok, I'll take a look. > > I don't know what "corr

Re: [PATCH 3/7] contrib/subtree: Add --unannotate

gree...@obbligato.org writes: >> I think this paragraph inherits existing breakage from the beginning >> of time, but I do not think the above will format the second and >> subsequent paragraphs correctly. > > Ok, I'll take a look. I don't know what "correctly" is but it is at least formatted in

Re: [PATCH 0/7] guilt patches, including git 1.8 support

On Tue, Jan 15, 2013 at 06:26:06PM -0800, Jonathan Nieder wrote: > Hi Jeff and other guilty parties, > > I collected all the guilt patches I could find on-list and added one > of my own. Completely untested, except for running the regression > tests. These are also available via git protocol fro

Re: [PATCH 4/7] contrib/subtree: Better Error Handling for add

Junio C Hamano writes: > "David A. Greene" writes: > >> From: "David A. Greene" >> >> Check refspecs for validity before passing them on to other commands. >> This lets us generate more helpful error messages. >> >> Signed-off-by: David A. Greene >> --- >> contrib/subtree/git-subtree.sh | 1

Re: [PATCH 3/7] contrib/subtree: Add --unannotate

Junio C Hamano writes: > "David A. Greene" writes: > >> diff --git a/contrib/subtree/git-subtree.txt >> b/contrib/subtree/git-subtree.txt >> index c5bce41..75aa690 100644 >> --- a/contrib/subtree/git-subtree.txt >> +++ b/contrib/subtree/git-subtree.txt >> @@ -198,6 +198,21 @@ OPTIONS FOR split

Re: [PATCH 2/7] contrib/subtree: Use %B for Split Subject/Body

Junio C Hamano writes: > David, how would you like to handle a reroll of this piece? I'll just get the test fix from Techlive Zheng, apply it to my branch and re-send. Are you incorporating the other patches? Should I drop them from my list? -David -- To unsubscribe fr

Re: [PATCH 2/7] contrib/subtree: Use %B for Split Subject/Body

Junio C Hamano writes: > "David A. Greene" writes: > >> From: Techlive Zheng >> >> Use %B to format the commit message and body to avoid an extra newline >> if a commit only has a subject line. >> >> Signed-off-by: Techlive Zheng >> >> Signed-off-by: David A. Greene >> --- > > This time (only

Re: [PATCH] attr: fix off-by-one directory component length calculation

On Wed, Jan 16, 2013 at 9:33 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >> On Wed, Jan 16, 2013 at 08:08:03AM +0700, Duy Nguyen wrote: >>> Actually I'd like to remove that function. >> >> This is what I had in mind: > > I think the replacement logic to find the basename is moderately > infe

Re: [PATCH 0/3] Update HTTPD/daemon tests for new push.default

These are tests that I do not usually run myself. Thanks for catching and correcting them. -- 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 http://vger.kernel.org/majordomo-info.html

Re: What's cooking in git.git (Jan 2013, #06; Mon, 14)

Adam Spiers writes: > On Mon, Jan 14, 2013 at 10:23 PM, Junio C Hamano wrote: >> * as/check-ignore (2013-01-10) 12 commits >> (merged to 'next' on 2013-01-14 at 9df2afc) >> + t0008: avoid brace expansion >> + add git-check-ignore sub-command >> + setup.c: document get_pathspec() >> + add.c

Re: [PATCH] attr: fix off-by-one directory component length calculation

Duy Nguyen writes: > On Wed, Jan 16, 2013 at 08:08:03AM +0700, Duy Nguyen wrote: >> Actually I'd like to remove that function. > > This is what I had in mind: I think the replacement logic to find the basename is moderately inferiour to the original. For one thing (this may be somewhat subjecti

[GUILT] [PATCH 7/7] Drop unneeded git version check.

Git's compatibility record is pretty good, so there's no need to worry that newer versions of git will break the "git config" command. Without this change, guilt errors out for git 1.8. With it, all tests pass. Signed-off-by: Jonathan Nieder --- Thanks for reading. guilt | 11 --- 1 f

[GUILT] [PATCH 6/7] Change git branch when patches are applied.

From: Per Cederqvist Date: Mon, 30 Apr 2012 12:24:06 +0200 Apply patches on a separate branch. The separate branch is automatically created when Guilt pushes something, and removed when no patches are applied. The name is formed by prepending "guilt/" to the original branch. This breaks the "ups

[GUILT] [PATCH 5/7] Fix fatal "guilt graph" error in sha1sum invocation.

From: Per Cederqvist Date: Wed, 14 Mar 2012 14:34:38 +0100 Fix the compatibility function sha1 so that it reads from stdin (and not a file with a zero-length file name) when no argument is supplied. [jn: adapted to also handle newer versions of OpenSSL, based on reports from Andreas Schwab and

[GUILT] [PATCH 4/7] Handle empty patches and patches with only a header.

From: Per Cederqvist Date: Mon, 30 Apr 2012 12:29:55 +0200 "git apply --numstat" in Git 1.7.10 gives an error message unless the patch contains a diff, so don't attempt to apply it unless we find a '^diff'. Signed-off-by: Per Cederqvist Acked-by: Jeff Sipek Signed-off-by: Jonathan Nieder ---

[GUILT] [PATCH 3/7] Testsuite: get rid of "Broken pipe" errors from yes.

From: Per Cederqvist Date: Mon, 30 Apr 2012 12:27:21 +0200 Signed-off-by: Per Cederqvist Acked-by: Jeff Sipek Signed-off-by: Jonathan Nieder --- regression/t-029.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/regression/t-029.sh b/regression/t-029.sh index 83e1d2

[GUILT] [PATCH 2/7] The tests should not fail if log.date or log.decorate are set.

From: Per Cederqvist Date: Mon, 30 Apr 2012 12:25:49 +0200 Explicitly set log.date and log.decorate to their Git default values, so that git produces the expected output even if log.date and log.decorate are set by the user in his .gitconfig. Signed-off-by: Per Cederqvist Acked-by: Jeff Sipek

[GUILT] [PATCH 1/7] get rid of "cat: write error: Broken pipe" error message

From: Per Cederqvist Date: Tue, 13 Mar 2012 14:39:44 +0100 In some circumstances (like running guilt in a M-x shell buffer in Emacs) cat may give the above error message when the reader of the output from cat exits without reading all input from cat. (In other circumstances cat is just silently

[PATCH 0/7] guilt patches, including git 1.8 support

Hi Jeff and other guilty parties, I collected all the guilt patches I could find on-list and added one of my own. Completely untested, except for running the regression tests. These are also available via git protocol from git://repo.or.cz/guilt/mob.git mob Thoughts? Jonathan Nieder (1):

[PATCH 3/3] t5570: do not assume the "matching" push is the default

Signed-off-by: Brian Gernhardt --- t/t5570-git-daemon.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh index a3a4e47..f01edff 100755 --- a/t/t5570-git-daemon.sh +++ b/t/t5570-git-daemon.sh @@ -8,6 +8,7 @@ LIB_GIT_DAEMON_PORT=${LIB_GIT_DAEMON_POR

[PATCH 1/3] t5550: do not assume the "matching" push is the default

Signed-off-by: Brian Gernhardt --- t/t5550-http-fetch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t5550-http-fetch.sh b/t/t5550-http-fetch.sh index 80d20c8..f7d0f14 100755 --- a/t/t5550-http-fetch.sh +++ b/t/t5550-http-fetch.sh @@ -13,6 +13,7 @@ LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5550'

[PATCH 2/3] t5551: do not assume the "matching" push is the default

Signed-off-by: Brian Gernhardt --- t/t5551-http-fetch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t5551-http-fetch.sh b/t/t5551-http-fetch.sh index c5cd2e3..1b55086 100755 --- a/t/t5551-http-fetch.sh +++ b/t/t5551-http-fetch.sh @@ -13,6 +13,7 @@ LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5551'

[PATCH 0/3] Update HTTPD/daemon tests for new push.default

I saw a string of these commits already, but found a few more when running the test suite. Brian Gernhardt (3): t5550: do not assume the "matching" push is the default t5551: do not assume the "matching" push is the default t5570: do not assume the "matching" push is the default t/t5550-ht

Re: [PATCH] attr: fix off-by-one directory component length calculation

On Wed, Jan 16, 2013 at 08:08:03AM +0700, Duy Nguyen wrote: > Actually I'd like to remove that function. This is what I had in mind: -- 8< -- Subject: [PATCH] attr: avoid calling find_basename() twice per path find_basename() is only used inside collect_all_attrs(), called once in prepare_attr_s

Re: [PATCH 3/3] Avoid non-portable strftime format specifiers in git-cvsimport

On Tue, Jan 15, 2013 at 5:10 PM, Ben Walton wrote: > Neither %s or %z are portable strftime format specifiers. There is no > need for %s in git-cvsimport as the supplied time is already in > seconds since the epoch. For %z, use the function get_tz_offset > provided by Git.pm instead. Out of cur

Re: What's cooking in git.git (Jan 2013, #06; Mon, 14)

On Mon, Jan 14, 2013 at 10:23 PM, Junio C Hamano wrote: > * as/check-ignore (2013-01-10) 12 commits > (merged to 'next' on 2013-01-14 at 9df2afc) > + t0008: avoid brace expansion > + add git-check-ignore sub-command > + setup.c: document get_pathspec() > + add.c: extract new die_if_path_beyo

Re: [PATCH] attr: fix off-by-one directory component length calculation

On Wed, Jan 16, 2013 at 2:29 AM, Junio C Hamano wrote: > "Jean-Noël AVILA" writes: > >> Thank you for the explanation. >> >> I did not monitor the system calls when writing that patch. >> Where is the perf framework? >> >> As the mistake is located in the "find_basename" function, I would propose

Re: [RFC/PATCH] ignore memcmp() overreading in bsearch() callback

Am 15.01.2013 21:27, schrieb Andreas Schwab: > René Scharfe writes: > >> +return '\0' - ent->name[key->len]; > > You need to cast to unsigned char first to make it consistent with > memcmp and strcmp. Thanks for catching this! -- >8 -- Subject: [PATCH] refs: use strncmp() instead of strlen

Re: [PATCH] attr: fix off-by-one directory component length calculation

On Wed, Jan 16, 2013 at 2:14 AM, Jean-Noël AVILA wrote: > I did not monitor the system calls when writing that patch. > Where is the perf framework? It's in t/perf. I think you can do: ./run HEAD . to run and compare performance of HEAD and working directory (assume you haven't commit yet). Che

Re: real git pull grief

git diff shows a list of files that I have made some changes to and the diff for files that I have not changed. The files I have made changes to (config files), I never want to commit or push and sometimes I may want them overwritten. for now I simply want to leave them there (changes to .sql fil

Re: real git pull grief

Hi Jay, Jay Vee wrote: > I HAVE NOT CHANGED THIS FILE. It is telling me that my local > changes huh? I have not changed or modified the file. > > > When I do a $git status I see a lot of other files that begin with: > > # modified: > Two questions: * what does "git diff"

Re: [RFC/PATCH 2/8 v3] git_remote_helpers: fix input when running under Python 3

j...@keeping.me.uk wrote on Tue, 15 Jan 2013 22:40 +: > This is what keeping the refs as byte strings looks like. As John knows, it is not possible to interpret text from a byte string without talking about the character encoding. Git is (largely) a C program and uses the character set define

Re: [PATCH] remote-hg: fix handling of file perms when pushing

Max Horn writes: > On 15.01.2013, at 14:02, Max Horn wrote: > >> Previously, when changing and committing an executable file, the file >> would loose its executable bit on the hg side. Likewise, symlinks ended >> up as "normal" files". This was not immediately apparent on the git side >> unless o

Re: --simplify-merges returns too many references

Phil Hord writes: > But with --simplify-merges, I see _more_ commits. > > $ git log --simplify-merges --oneline -- builtin/stripspace.c > 634392b Add 'contrib/subtree/' from commit ... > 497215d Update documentation for stripspace > c2857fb stripspace: fix outdated comment

Re: [PATCH 0/3] Fix a portability issue with git-cvsimport

Ben Walton writes: > This patch series started as a quick fix for the use of %s and %z in > git-cvsimport but grew slightly when I realized that the get_tz > (get_tz_offset after this series) function used by Git::SVN didn't > properly handle DST boundary conditions. > > I realize that Eric Raymo

Re: [PATCH] attr: fix off-by-one directory component length calculation

On Tue, Jan 15, 2013 at 12:49:05PM -0800, Junio C Hamano wrote: > "Jean-Noël AVILA" writes: > > > Btw, the test 10 to t9902 is failing on my Debian testing. Is it a known > > issue? > > Which branch? t9902.10 is overly sensitive to extra git commands in your PATH, as well as cruft in your bui

--simplify-merges returns too many references

I thought I understood the intent of the various history simplification switches, but maybe I am still confused. In git.git, I see three commits which touch stripspace.c: $ git log --oneline -- builtin/stripspace.c 497215d Update documentation for stripspace c2857fb stripspace: fix outdated comm

[PATCH 0/3] Fix a portability issue with git-cvsimport

This patch series started as a quick fix for the use of %s and %z in git-cvsimport but grew slightly when I realized that the get_tz (get_tz_offset after this series) function used by Git::SVN didn't properly handle DST boundary conditions. I realize that Eric Raymond is working to deprecate the c

[PATCH 2/3] Allow Git::get_tz_offset to properly handle DST boundary times

The Git::get_tz_offset is meant to provide a workalike replacement for the GNU strftime %z format specifier. The algorithm used failed to properly handle DST boundary cases. For example, the unix time 1162105199 in CST6CDT saw set_tz_offset improperly return -0600 instead of -0500. TZ=CST6CDT da

[PATCH 3/3] Avoid non-portable strftime format specifiers in git-cvsimport

Neither %s or %z are portable strftime format specifiers. There is no need for %s in git-cvsimport as the supplied time is already in seconds since the epoch. For %z, use the function get_tz_offset provided by Git.pm instead. Signed-off-by: Ben Walton --- git-cvsimport.perl |5 - 1 fil

[PATCH 1/3] Move Git::SVN::get_tz to Git::get_tz_offset

This function has utility outside of the SVN module for any routine that needs the equivalent of GNU strftime's %z formatting option. Move it to the top-level Git.pm so that non-SVN modules don't need to import the SVN module to use it. The rename makes the purpose of the function clearer. Signed

Re: [PATCH v2 06/14] imap-send.c: remove some unused fields from struct store

Junio C Hamano wrote: > Jonathan Nieder writes: >> Since actually fixing that is probably too aggressive for this patch, >> how about a FIXME comment like the following? [...] > Hmph; it seems that it is not worth rerolling the whole thing only > for this, so let me squash this in, replacing the

Re: [PATCH 3/8] git_remote_helpers: Force rebuild if python version changes

On Sun, Jan 13, 2013 at 05:52:38PM +, John Keeping wrote: > On Sun, Jan 13, 2013 at 12:14:02PM -0500, Pete Wyckoff wrote: >> j...@keeping.me.uk wrote on Sun, 13 Jan 2013 16:26 +: >>> On Sat, Jan 12, 2013 at 06:30:44PM -0500, Pete Wyckoff wrote: >>> > j...@keeping.me.uk wrote on Sat, 12 Jan

[RFC/PATCH 2/8 v3] git_remote_helpers: fix input when running under Python 3

Although 2to3 will fix most issues in Python 2 code to make it run under Python 3, it does not handle the new strict separation between byte strings and unicode strings. There is one instance in git_remote_helpers where we are caught by this, which is when reading refs from "git for-each-ref". Fi

Re: [PATCH v2 06/14] imap-send.c: remove some unused fields from struct store

Jonathan Nieder writes: > Michael Haggerty wrote: > >> -else if ((arg1 = next_arg(&cmd))) { >> -if (!strcmp("EXISTS", arg1)) >> -ctx->gen.count = atoi(arg); >> -else if (!strcmp("RECENT

Re: [RFC/PATCH 2/8 v2] git_remote_helpers: fix input when running under Python 3

John Keeping writes: >> That really feels wrong. Displaying is a separate issue and it is >> the _right_ thing to punt the problem at the lower-level machinery >> level. > > But the display will require decoding the ref name to a Unicode string, > which depends on the encoding of the underlying

Re: [RFC/PATCH 2/8 v2] git_remote_helpers: fix input when running under Python 3

On Tue, Jan 15, 2013 at 12:51:13PM -0800, Junio C Hamano wrote: > John Keeping writes: >> Although 2to3 will fix most issues in Python 2 code to make it run under >> Python 3, it does not handle the new strict separation between byte >> strings and unicode strings. There is one instance in >> git

Re: [PATCH] config.txt: Document help.htmlpath config parameter

Thanks. This will eventually go to the maintenance track as well. -- 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 http://vger.kernel.org/majordomo-info.html

[PATCH] config.txt: Document help.htmlpath config parameter

Signed-off-by: Sebastian Staudt --- Documentation/config.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index bf8f911..e452ff8 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1351,6 +1351,12 @@ help.autoco

Re: [RFC/PATCH 2/8 v2] git_remote_helpers: fix input when running under Python 3

John Keeping writes: > Although 2to3 will fix most issues in Python 2 code to make it run under > Python 3, it does not handle the new strict separation between byte > strings and unicode strings. There is one instance in > git_remote_helpers where we are caught by this, which is when reading >

Re: [PATCH v2 00/14] Remove unused code from imap-send.c

Michael Haggerty wrote: > imap-send.c | 308 > +++- > 1 file changed, 55 insertions(+), 253 deletions(-) Patch 14 is lovely. Except for patch 6, for what it's worth these are all Reviewed-by: Jonathan Nieder Nicely done. -- To unsubscr

Re: [PATCH] attr: fix off-by-one directory component length calculation

"Jean-Noël AVILA" writes: > Btw, the test 10 to t9902 is failing on my Debian testing. Is it a known > issue? Which branch? If you mean "'master' with the patch in this discussion applied", I didn't even have a chance to start today's integration cycle, so I don't know (it is not known to me).

Re: [PATCH] tests: turn on test-lint-shell-syntax by default

Torsten Bögershausen writes: > What do we think about something like this for fishing for which: > > --- a/t/test-lib.sh > +++ b/t/test-lib.sh > @@ -644,6 +644,10 @@ yes () { > : > done > } > +which () { > + echo >&2 "which is not portable (please use type)" > +

Re: [PATCH v2 06/14] imap-send.c: remove some unused fields from struct store

Michael Haggerty wrote: > - else if ((arg1 = next_arg(&cmd))) { > - if (!strcmp("EXISTS", arg1)) > - ctx->gen.count = atoi(arg); > - else if (!strcmp("RECENT", arg1)) > -

Re: [RFC/PATCH] ignore memcmp() overreading in bsearch() callback

René Scharfe writes: > + return '\0' - ent->name[key->len]; You need to cast to unsigned char first to make it consistent with memcmp and strcmp. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for somethi

Re: [PATCH] tests: turn on test-lint-shell-syntax by default

On 13.01.13 23:38, Junio C Hamano wrote: > Jonathan Nieder writes: > >> Hi, >> >> Torsten Bögershausen wrote: >> >>> - /^\s*[^#]\s*which\s/ and err 'which is not portable (please use type)'; >>> + /^\s*[^#]\s*which\s+[-a-zA-Z0-9]+$/ and err 'which is not portable >>> (please use type)'; >> >

Re: [PATCH] remote-hg: store converted URL

Max Horn writes: > So far, all I look at do not deal with this at all. Any attempts > to deal with it should be pretty easy to recognize: The > remote-$backend would have to store something into the git config, > or else, verify the opaque token and refuse to work with it under > certain conditio

Re: [PATCH] attr: fix off-by-one directory component length calculation

Le mardi 15 janvier 2013 20:29:16, Junio C Hamano a écrit : > "Jean-Noël AVILA" writes: > > Thank you for the explanation. > > > > I did not monitor the system calls when writing that patch. > > Where is the perf framework? > > > > As the mistake is located in the "find_basename" function, I wou

[RFC/PATCH 2/8 v2] git_remote_helpers: fix input when running under Python 3

Although 2to3 will fix most issues in Python 2 code to make it run under Python 3, it does not handle the new strict separation between byte strings and unicode strings. There is one instance in git_remote_helpers where we are caught by this, which is when reading refs from "git for-each-ref". Wh

Re: [PATCH v2] test-lib.sh: unfilter GIT_PERF_*

Nguyễn Thái Ngọc Duy writes: > These variables are user parameters to control how to run the perf > tests. Allow users to do so. > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- I think the Subject makes more sense, so I'd suggest replacing the current one with "PERF_", not with "PERF". > t/tes

Re: [PATCH] attr: fix off-by-one directory component length calculation

"Jean-Noël AVILA" writes: > Thank you for the explanation. > > I did not monitor the system calls when writing that patch. > Where is the perf framework? > > As the mistake is located in the "find_basename" function, I would propose a > fix directly into it so that the output fits what the othe

Re: [PATCH] attr: fix off-by-one directory component length calculation

Thank you for the explanation. I did not monitor the system calls when writing that patch. Where is the perf framework? As the mistake is located in the "find_basename" function, I would propose a fix directly into it so that the output fits what the other functions expect. Something in the li

Re: [PATCH] am: invoke perl's strftime in C locale

"Dmitry V. Levin" writes: > On Tue, Jan 15, 2013 at 08:50:59AM -0800, Jeff King wrote: >> On Tue, Jan 15, 2013 at 05:42:12PM +0100, Antoine Pelisse wrote: >> >> > > This puts all of perl into the C locale, which would mean error messages >> > > from perl would be in English rather than the user'

Re: [PATCH] Allow custom "comment char"

Ralf Thielow writes: > From: Junio C Hamano > > Some users do want to write a line that begin with a pound sign, #, > in their commit log message. Many tracking system recognise > a token of # form, for example. > > The support we offer these use cases is not very friendly to the end > users.

[PATCH v3] am: invoke perl's strftime in C locale

This fixes "hg" patch format support for locales other than C and en_*. Before the change, git-am was making "Date:" line from hg changeset metadata according to the current locale, and this line was rejected later with "invalid date format" diagnostics because localized date strings are not suppor

Re: [PATCH v2 07/14] imap-send.c: inline imap_parse_list() in imap_list()

On Tue, Jan 15, 2013 at 09:06:25AM +0100, Michael Haggerty wrote: > -static struct imap_list *parse_imap_list(struct imap *imap, char **sp) > +static struct imap_list *parse_list(char **sp) The commit subject refers to imap_parse_list and imap_list whereas the code refers to parse_imap_list and pa

Re: Version 1.8.1 does not compile on Cygwin 1.7.14

Mark Levedahl wrote: > On 01/11/2013 03:17 PM, Alex Riesen wrote: >> On Fri, Jan 11, 2013 at 9:08 PM, Alex Riesen wrote: >>> This short discussion on GitHub (file git-compat-util.h) might be relevant: >>> >>> https://github.com/msysgit/git/commit/435bdf8c7ffa493f8f6f2e8f329f8cc22db16ce6#commitcomm

[PATCH] Allow custom "comment char"

From: Junio C Hamano Some users do want to write a line that begin with a pound sign, #, in their commit log message. Many tracking system recognise a token of # form, for example. The support we offer these use cases is not very friendly to the end users. They have a choice between - Don't

Re: [PATCH v2 06/19] reset.c: remove unnecessary variable 'i'

I suppose this was meant for everyone. Adding back the others. On Tue, Jan 15, 2013 at 10:27 AM, Holding, Lawrence (NZ) wrote: > Maybe use *argv instead of argv[0]? Sure. Everywhere? Also in the lines added in patch 17/19 that refer to both argv[0] and argv[1], such as "argv[1] && !get_sha1_tree

Re: [PATCH] remote-hg: store converted URL

On 15.01.2013, at 17:51, Junio C Hamano wrote: > Junio C Hamano writes: > >> Max Horn writes: >> ... >>> See also the discussion (yeah, this time a real one ;-) leading to this: >>> https://github.com/felipec/git/issues/2 >>> ... > > If I understand correctly, the $backend::$opaqueToken is a

Re: [PATCH] remote-hg: store converted URL

On 15.01.2013, at 17:05, Junio C Hamano wrote: > Max Horn writes: > >> On 14.01.2013, at 19:14, Junio C Hamano wrote: >> >>> What is lacking from this description is why it even needs to work >>> from a different working directory > > In your rewrite below, this is still lacking, I think.

Re: [PATCH] am: invoke perl's strftime in C locale

On Tue, Jan 15, 2013 at 08:50:59AM -0800, Jeff King wrote: > On Tue, Jan 15, 2013 at 05:42:12PM +0100, Antoine Pelisse wrote: > > > > This puts all of perl into the C locale, which would mean error messages > > > from perl would be in English rather than the user's language. It > > > probably isn'

Re: [RFC/PATCH] ignore memcmp() overreading in bsearch() callback

On Tue, Jan 15, 2013 at 08:55:32AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > On Mon, Jan 14, 2013 at 03:36:21PM -0800, Junio C Hamano wrote: > > > >> It appears that memcmp() uses the usual "one word at a time" > >> comparison and triggers valgrind in a callback of bsearch() used in

Re: [PATCH v2 2/3] config: Introduce diff.algorithm variable

Jeff King writes: >> Also it is rather unusual to parse the keyword values case insensitively. > > Is it? "git grep strcasecmp" shows that we already do so in many cases > (e.g., any bool option, core.autocrlf, receive.deny*, etc). Yeah, I did the same grep after I wrote the message. Thanks for

Re: [PATCH 1/6] config: add helper function for parsing key names

Jeff King writes: > ... did you have any comment on > the "struct config_key" alternative I sent as a follow-up? I did read it but I cannot say I did so very carefully. My gut reaction was that the "take the variable name and section name, return the subsection name pointer and length, if there

Re: [PATCH v2 2/3] config: Introduce diff.algorithm variable

On Mon, Jan 14, 2013 at 01:05:27PM -0800, Junio C Hamano wrote: > Michal Privoznik writes: > > > +static long parse_algorithm_value(const char *value) > > +{ > > + if (!value || !strcasecmp(value, "myers")) > > + return 0; > > [diff] > algorithm > > should probably error out.

Re: [RFC/PATCH] ignore memcmp() overreading in bsearch() callback

Jeff King writes: > On Mon, Jan 14, 2013 at 03:36:21PM -0800, Junio C Hamano wrote: > >> It appears that memcmp() uses the usual "one word at a time" >> comparison and triggers valgrind in a callback of bsearch() used in >> the refname search. I can easily trigger problems in any script >> with

Re: [PATCH] remote-hg: store converted URL

Junio C Hamano writes: > Max Horn writes: > ... >> See also the discussion (yeah, this time a real one ;-) leading to this: >> https://github.com/felipec/git/issues/2 >> ... If I understand correctly, the $backend::$opaqueToken is a contract between the remote-helper and the remote-$backend t

Re: [PATCH] am: invoke perl's strftime in C locale

On Tue, Jan 15, 2013 at 05:42:12PM +0100, Antoine Pelisse wrote: > > This puts all of perl into the C locale, which would mean error messages > > from perl would be in English rather than the user's language. It > > probably isn't a big deal, because that snippet of perl is short and not > > likel

Re: [PATCH] am: invoke perl's strftime in C locale

> This puts all of perl into the C locale, which would mean error messages > from perl would be in English rather than the user's language. It > probably isn't a big deal, because that snippet of perl is short and not > likely to produce problems, but I wonder how hard it would be to set the > loca

Re: [PATCH] attr: fix off-by-one directory component length calculation

Good spotting and a nicely explained patch. 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 http://vger.kernel.org/majordomo-info.html

Re: [PATCH] remote-hg: store converted URL

Max Horn writes: > On 14.01.2013, at 19:14, Junio C Hamano wrote: > >> What is lacking from this description is why it even needs to work >> from a different working directory In your rewrite below, this is still lacking, I think. > Fully agreed. How about this commit message: > > -- >8 --

Re: [PATCH 1/6] config: add helper function for parsing key names

On Mon, Jan 14, 2013 at 10:08:47AM -0800, Junio C Hamano wrote: > > +extern int match_config_key(const char *var, > > +const char *section, > > +const char **subsection, int *subsection_len, > > +const char **key); > > + > > I agree with Jonathan ab

Re: [PATCH] am: invoke perl's strftime in C locale

On Tue, Jan 15, 2013 at 12:59:33AM +0400, Dmitry V. Levin wrote: > diff --git a/git-am.sh b/git-am.sh > index c682d34..64b88e4 100755 > --- a/git-am.sh > +++ b/git-am.sh > @@ -334,7 +334,7 @@ split_patches () { > # Since we cannot guarantee that the commit message is > in >

Re: [RFC/PATCH] ignore memcmp() overreading in bsearch() callback

Am 15.01.2013 00:36, schrieb Junio C Hamano: > It appears that memcmp() uses the usual "one word at a time" > comparison and triggers valgrind in a callback of bsearch() used in > the refname search. I can easily trigger problems in any script > with test_commit (e.g. "sh t0101-at-syntax.sh --valg

Re: [BUG] Possible bug in `remote set-url --add --push`

Michael J Gruber writes: > Also there is a conceptual confusion: pushurl is meant to push to the > same repo using a different url, e.g. something authenticated > (https/ssh) for push and something faster/easier for fetch. That is not necessarily true, depending on the definition of your "same".

Re: [RFC/PATCH] ignore memcmp() overreading in bsearch() callback

On Mon, Jan 14, 2013 at 03:36:21PM -0800, Junio C Hamano wrote: > It appears that memcmp() uses the usual "one word at a time" > comparison and triggers valgrind in a callback of bsearch() used in > the refname search. I can easily trigger problems in any script > with test_commit (e.g. "sh t0101

Re: [PATCH v2 00/14] Remove unused code from imap-send.c

On Tue, Jan 15, 2013 at 09:06:18AM +0100, Michael Haggerty wrote: > This is a re-roll, incorporating the feedback of Jonathan Nieder > (thanks!). Thanks, I don't see anything wrong with this from a cursory reading. > * Added some comments to lf_to_crlf(), simplified the code a bit > further, a

[PATCH v2] test-lib.sh: unfilter GIT_PERF_*

These variables are user parameters to control how to run the perf tests. Allow users to do so. Signed-off-by: Nguyễn Thái Ngọc Duy --- t/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index f50f834..e1c8c85 100644 --- a/t/test-lib.s

Re: [PATCH] test-lib.sh: unfilter GIT_PERF_*

On Tue, Jan 15, 2013 at 8:43 PM, Thomas Rast wrote: > Nguyễn Thái Ngọc Duy writes: > >> These variables are user parameters to control how to run the perf >> tests. Allow users to do so. > [...] >> @@ -86,6 +86,9 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e ' >> PROVE >>

  1   2   >