[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 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 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 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 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 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

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

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 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: [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 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 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 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 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 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 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 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] 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

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

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

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] 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

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

[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

[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 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,

<    1   2