Re: fix french translation

乙酸鋰 ch3co...@gmail.com writes: Sorry, I reversed the revisions. This one should be correct. Yes, it is. But your patch is still not in the form expected by Documentation/SubmittingPatches (missing sign-off-by, and incorrect commit message). The good news is: this is already fixed in git-gui's

Re: git-svn too slow, contacts upstream svn repo

- Original Message - From: Quark unixuser2000-f...@yahoo.com To: Git List git@vger.kernel.org Cc: Sent: Monday, 27 May 2013 8:55 PM Subject: git-svn too slow, contacts upstream svn repo hello list, I have been using git-svn in an corporate environment where svn repo has lot

Re: [PATCH] fast-import: Remove redundant assignment of 'oe' to itself.

Stefano Lattarini wrote: On 05/26/2013 10:05 PM, Stefan Beller wrote: Reported by cppcheck. Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- fast-import.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fast-import.c b/fast-import.c index 5f539d7..0142e3a

Re: git-send-email doesn't deal with quoted names

On Tue, May 28, 2013 at 01:40:20AM +0200, Jason A. Donenfeld wrote: My commit author name is Jason A. Donenfeld. Because this has a dot, SMTP handling likes to put it in quotes. git-send-email has this line: if (defined $author and $author ne $sender) { With my name, this

Re: [PATCH] git clone depth of 0 not possible.

Hi Junio, I'm interested in getting a fetch tip commit only feature into git, I'll probably look into creating a patch for this. Sounds buggy. Would anything break if we were to make --depth=1 mean 1 deep, including the tip commit? As long as we do not change the meaning of the shallow

Feature-request: Ordering `git log --graph` based on *author's* timestamp

I use a fairly complex `git-log` command involving `--date-order` to get an overview of my repository's status; but unfortunately, `--date-order` seems to use the *committer* date, not the *author* date. That means that each time I bring my topic branches up to date by rebasing them onto the

Re: [QUERY] How do you sort completions?

Hi, On Fri, May 24, 2013 at 08:11:00AM -0500, Felipe Contreras wrote: AFAIK bash needs the completions sorted, so we added some | sort | uniq. Actually, it seems to sort and remove duplicates automatically: $ _foo () { COMPREPLY=(bar foo bar baz) ; } $ complete -F _foo foo $ foo TAB bar baz

Re: [PATCH 2/2] cherry-pick: add --skip-commits option

Felipe Contreras wrote: Pretty much what it says on the tin. Only that it add --skip-empty and not --skip-commit ?!? Bye, Jojo -- 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

Re: [PATCH] prompt: fix show upstream with svn and zsh

Hi, On Wed, May 22, 2013 at 09:32:44AM +0200, Thomas Gummerer wrote: SZEDER Gábor sze...@ira.uka.de writes: On Tue, May 21, 2013 at 10:54:27PM +0200, Thomas Gummerer wrote: - svn_remote[ $((${#svn_remote[@]} + 1)) ]=$value + svn_remote[$((${#svn_remote[@]}

Re: [PATCH 1/2] sequencer: trivial fix

On Mon, May 27, 2013 at 11:52:18AM -0500, Felipe Contreras wrote: We should free objects before leaving. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sequencer.c | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sequencer.c b/sequencer.c index

Re: [PATCH 2/2] cherry-pick: add --skip-commits option

On Mon, May 27, 2013 at 11:52:19AM -0500, Felipe Contreras wrote: Pretty much what it says on the tin. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-cherry-pick.txt | 3 +++ builtin/revert.c| 2 ++ sequencer.c

Re: git-svn too slow, contacts upstream svn repo

On Tue, 28 May 2013 15:42:57 +0800 (SGT) Quark unixuser2000-f...@yahoo.com wrote: I have been using git-svn in an corporate environment where svn repo has lot of branches, (lot means 100). To avoid cloning all branches my config looks as below [...] is this not right forum? As a matter

[PATCH] wildmatch: properly fold case everywhere

Case folding is not done correctly when matching against the [:upper:] character class and uppercased character ranges (e.g. A-Z). Specifically, an uppercase letter fails to match against any of them when case folding is requested because plain characters in the pattern and the whole string and

[PATCH 0/5] Trivial patches

Hi, Here's a bunch of trivial patches. Felipe Contreras (5): remote: trivial style cleanup sequencer: trivial fix test: trivial cleanups test: improve rebase -q test test: rebase: fix --interactive test remote.c | 3 +-- sequencer.c | 7

[PATCH 1/5] remote: trivial style cleanup

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- remote.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/remote.c b/remote.c index 68eb99b..e71f66d 100644 --- a/remote.c +++ b/remote.c @@ -1474,8 +1474,7 @@ struct branch *branch_get(const char *name)

[PATCH 2/5] sequencer: trivial fix

We should free objects before leaving. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sequencer.c | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sequencer.c b/sequencer.c index ab6f8a7..7eeae2f 100644 --- a/sequencer.c +++ b/sequencer.c @@ -626,12

[PATCH 3/5] test: trivial cleanups

No functional changes. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t3403-rebase-skip.sh | 7 --- t/t3505-cherry-pick-empty.sh | 18 +- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh

[PATCH 4/5] test: improve rebase -q test

Let's show the output so it's clear why it failed. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t3400-rebase.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index b58fa1a..fb39531 100755 --- a/t/t3400-rebase.sh +++

[PATCH 5/5] test: rebase: fix --interactive test

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t3404-rebase-interactive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index a58406d..79e8d3c 100755 --- a/t/t3404-rebase-interactive.sh +++

Re[4]: [PATCH 4/5] git-svn: fix bottleneck in stash_placeholder_list()

IB * I think git-svn doesn't handle the case, when a tag is deleted. IB I expected it to rename the ref from tags/tagname to IB tags/tagname@rev, but that doesn't happen. IB If a tag is replaced, there's no way to tell what was the previous IB state of that tag: git-svn just rewrites the

[PATCH 0/3] cherry-pick: improvments

Hi, Here's a bunch of changes to make cherry-pick (and revert) more useful. Felipe Contreras (3): cherry-pick: add support to copy notes revert/cherry-pick: add --quiet option revert/cherry-pick: add --skip option Documentation/git-cherry-pick.txt | 7 +- Documentation/git-revert.txt

[PATCH 1/3] cherry-pick: add support to copy notes

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/revert.c | 2 + sequencer.c | 136 -- sequencer.h | 2 + t/t3500-cherry.sh | 32 + 4 files changed, 169 insertions(+), 3 deletions(-) diff

[PATCH 2/3] revert/cherry-pick: add --quiet option

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-cherry-pick.txt | 6 +- Documentation/git-revert.txt | 6 +- builtin/revert.c | 1 + sequencer.c | 2 ++ sequencer.h | 1 + 5 files changed,

[PATCH 3/3] revert/cherry-pick: add --skip option

Akin to 'am --skip' and 'rebase --skip'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-cherry-pick.txt | 1 + Documentation/git-revert.txt | 1 + Documentation/sequencer.txt | 3 +++ builtin/revert.c | 6 ++ sequencer.c

Re: [PATCH] wildmatch: properly fold case everywhere

You're right, I will amend my patch. How do I make git-send-email reply to that thread? -- Anthony Ramine Le 28 mai 2013 à 14:53, Duy Nguyen a écrit : On Tue, May 28, 2013 at 7:32 PM, Anthony Ramine n.ox...@gmail.com wrote: @@ -196,6 +196,11 @@ static int dowild(const uchar *p, const uchar

[PATCH v2] wildmatch: properly fold case everywhere

Case folding is not done correctly when matching against the [:upper:] character class and uppercased character ranges (e.g. A-Z). Specifically, an uppercase letter fails to match against any of them when case folding is requested because plain characters in the pattern and the whole string and

[PATCH 0/5] rebase: improve the keep-empty

Hi, I've been analyzing 'git rebase' and found that the --keep-empty option triggers a very very different behavior. Here's a bunch of patches that make it behave like the 'am' does does for the most part. There's only a few minor changes, after which it might be possible to replace the whole

[PATCH 1/5] rebase: split the cherry-pick stuff

They do something completely different from 'git am', it belongs in a different file. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- .gitignore| 1 + Makefile | 1 + git-rebase--am.sh | 65 ++-

[PATCH 2/5] rebase: fix 'cherry' mode storage

We don't use the 'rebase-apply'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- git-rebase--cherry.sh | 4 git-rebase.sh | 5 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/git-rebase--cherry.sh b/git-rebase--cherry.sh index cbf80f9..ab1f8b7

[PATCH 4/5] rebase: fix abort of cherry mode

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- git-rebase.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-rebase.sh b/git-rebase.sh index b7759d5..48bd1b8 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -335,6 +335,7 @@ skip) run_specific_rebase ;;

[PATCH 5/5] rebase: fix cherry-pick invocations

So that all the tests pass. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- git-rebase--cherry.sh | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/git-rebase--cherry.sh b/git-rebase--cherry.sh index ca78b1b..c3a2ac9 100644 ---

[PATCH 3/5] rebase: fix sequence continuation

We are not in am mode. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- git-rebase--cherry.sh | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/git-rebase--cherry.sh b/git-rebase--cherry.sh index ab1f8b7..ca78b1b 100644 --- a/git-rebase--cherry.sh +++

Re: [PATCH 0/5] rebase: improve the keep-empty

On Tue, May 28, 2013 at 8:29 AM, Felipe Contreras felipe.contre...@gmail.com wrote: Hi, I've been analyzing 'git rebase' and found that the --keep-empty option triggers a very very different behavior. Here's a bunch of patches that make it behave like the 'am' does does for the most part.

[PATCH v3] wildmatch: properly fold case everywhere

Case folding is not done correctly when matching against the [:upper:] character class and uppercased character ranges (e.g. A-Z). Specifically, an uppercase letter fails to match against any of them when case folding is requested because plain characters in the pattern and the whole string and

Re: [PATCH v2 0/3] Towards a useable git-branch

Hi Duy, I just woke up and started looking at the series: it's rather well done, and I'm confident that this is the way forward. To reciprocate, I've done some work at gh:artagnon/git for-each-ref-pretty. See: https://github.com/artagnon/git/commits/for-each-ref-pretty There is one major

Re: [PATCH v2 0/3] Towards a useable git-branch

Oh, and by the way: We're pretty close we are to replacing branch -v and branch -vv. brv = for-each-ref --format='%(HEAD) %C(green)%(*)%(refname:short)%C(reset) %(*)%(objectname:short) %(subject)' refs/heads brvv = for-each-ref --format='%(HEAD) %C(green)%(*)%(refname:short)%C(reset)

Re: [PATCH v2 0/3] Towards a useable git-branch

Ramkumar Ramachandra wrote: %(N) doesn't work properly with f-e-r, and I'm not sure why. I'm not talking about your last patch where you compute * -- that works fine; it's just that %(N) doesn't when N is a concrete number. Try this: %(refname:short)%(30)%(upstream:short) (assuming that you

Re: git-svn too slow, contacts upstream svn repo

- Original Message - From: Konstantin Khomoutov kostix+...@007spb.ru To: Quark unixuser2000-f...@yahoo.com Cc: Git List git@vger.kernel.org Sent: Tuesday, 28 May 2013 5:24 PM Subject: Re: git-svn too slow, contacts upstream svn repo On Tue, 28 May 2013 15:42:57 +0800 (SGT)

Re: [PATCH] git clone depth of 0 not possible.

Hi Jonathan, Did you consider how to implement this? Looking at the code, it seems the deepen parameter in the wire protocol now means: - 0: Do not change anything about the shallowness (i.e., fetch everything from the shallow root to the tip). - 0: Create new shallow commits at

Re: [PATCH] git clone depth of 0 not possible.

Matthijs Kooijman wrote: In other words: we won't break existing clients if we suddenly send back one less commit than before, since the client just sends over what it wants and then assumes that whatever it gets back is really what it wanted? Yes, depending on your definition of break. An

Re: [PATCH v2 7/8] remote-bzr: reorganize the way 'wanted' works

Felipe Contreras felipe.contre...@gmail.com writes: +wanted = get_config('remote-bzr.branches').rstrip().split(', ') Two minor nits and one design suggestion: - Why rstrip() not strip()? It appears that this only is helping an end-user mistake like this: git config

Re: [PATCH 1/2] sequencer: trivial fix

Neil Horman nhor...@tuxdriver.com writes: On Mon, May 27, 2013 at 11:52:18AM -0500, Felipe Contreras wrote: We should free objects before leaving. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sequencer.c | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-)

Re: [PATCH RESEND v2] path: Fix a sparse warning

Ramsay Jones ram...@ramsay1.demon.co.uk writes: On MinGW, sparse issues an 'get_st_mode_bits' not declared. Should it be static? warning. The MinGW and MSVC builds do not see the declaration of this function, within git-compat-util.h, due to its placement within an preprocessor conditional.

Re: [PATCH] git clone depth of 0 not possible.

Matthijs Kooijman matth...@stdin.nl writes: Did you consider how to implement this? Looking at the code, it seems the deepen parameter in the wire protocol now means: - 0: Do not change anything about the shallowness (i.e., fetch everything from the shallow root to the tip). - 0:

Re: [PATCH 1/5] remote: trivial style cleanup

Felipe Contreras felipe.contre...@gmail.com writes: Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- remote.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/remote.c b/remote.c index 68eb99b..e71f66d 100644 --- a/remote.c +++ b/remote.c @@ -1474,8

Re: [PATCH 4/5] test: improve rebase -q test

Felipe Contreras felipe.contre...@gmail.com writes: Let's show the output so it's clear why it failed. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t3400-rebase.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index

Re: [PATCH 1/3] cherry-pick: add support to copy notes

Felipe Contreras felipe.contre...@gmail.com writes: Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/revert.c | 2 + sequencer.c | 136 -- sequencer.h | 2 + t/t3500-cherry.sh | 32 +

where is the opensuse version for git?

Dear developer trying to find a version for suse 12.3 I was unable to locate a version. Please advise. downloading x-tags error messages. error message 504-gateway time out. Please advise what to do. regards Ludger -- To unsubscribe from this list: send the line unsubscribe git in the body of

Re: [PATCH 0/5] rebase: improve the keep-empty

Hi, I think I have some patches at home that instead teach 'git am' the --keep-empty flag. Does that make sense? It's been a while since I looked at it, but I'll try to take a look tonight (PST). Martin On Tue, May 28, 2013 at 6:29 AM, Felipe Contreras felipe.contre...@gmail.com wrote: Hi,

Re: [PATCH 4/5] test: improve rebase -q test

Junio C Hamano wrote: A more preferrable alternative may be adding something like this to test-lib.sh and call it from here and elsewhere (there are about 50 places that do test ! -s filename), perhaps? test_must_be_an_empty_file () { if test -s $1

Re: [PATCH] fix segfault with git log -c --follow

Clemens Buchacher dri...@aon.at writes: In diff_tree_combined we make a copy of diffopts. In try_to_follow_renames, called via diff_tree_sha1, we free and re-initialize diffopts-pathspec-items. Since we did not make a deep copy of diffopts in diff_tree_combined, the original diffopts does not

Re: [PATCH 4/5] test: improve rebase -q test

Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: A more preferrable alternative may be adding something like this to test-lib.sh and call it from here and elsewhere (there are about 50 places that do test ! -s filename), perhaps? test_must_be_an_empty_file () {

Re: git hangs on pthread_join

On Thu, May 23, 2013 at 03:01:43PM +0200, Ian Kumlien wrote: git 1.8.2.1 is started by xinetd [...] I have found git receive-packs that has been running for days/weeks without terminating Attaching gdb and doing a trace results in: #0 0x003261207b35 in pthread_join () from

1.8.3 - gitignore not being parsed correctly on OS X; regex support is broken?

Hi, Gitignore parsing no longer seems to work properly in git 1.8.3. One of my repositories has the following gitignore: /* !/.gitignore !/Library/ !/CONTRIBUTING.md !/README.md !/SUPPORTERS.md !/bin /bin/* !/bin/brew !/share/man/man1/brew.1 .DS_Store /Library/LinkedKegs /Library/PinnedKegs

Re: [PATCH 1/3] cherry-pick: add support to copy notes

Junio C Hamano gits...@pobox.com writes: Thomas Rast Cc'ed as he has been the primary force behind this line of notes usability. Thanks for pointing this out to me. Felipe Contreras felipe.contre...@gmail.com writes: Signed-off-by: Felipe Contreras felipe.contre...@gmail.com ---

Re: [PATCH v2] difftool --dir-diff: always use identical working tree file

Kenichi Saita nito...@gmail.com writes: When deciding whether or not we should link a working tree file into the temporary right-hand directory for a directory diff, we currently behave differently in the --symlink and --no-symlink cases. If using symlinks any identical files are linked

Re: [PATCH] git-remote-mediawiki: better error message when HTTP(S) access fails

On Thu, May 23, 2013 at 10:05:03PM +0200, Matthieu Moy wrote: My use-case is an invalid SSL certificate. Pulling from the wiki with a recent version of libwww-perl fails, and git-remote-mediawiki gave no clue about the reason. Give the mediawiki API detailed error message, and since it is not

Re: [PATCH v2] difftool --dir-diff: always use identical working tree file

On Tue, May 28, 2013 at 11:06:13AM -0700, Junio C Hamano wrote: Kenichi Saita nito...@gmail.com writes: When deciding whether or not we should link a working tree file into the temporary right-hand directory for a directory diff, we currently behave differently in the --symlink and

Re: [PATCH v2] difftool --dir-diff: always use identical working tree file

John Keeping j...@keeping.me.uk writes: Yeah, the commit message is still quite focused on the end effect of copying files back. But that's not what's being changed here. In my suggested commit message I tried to make it clear that we're changing when we decide to copy a file across to the

Re: [PATCH v2] difftool --dir-diff: always use identical working tree file

On Tue, May 28, 2013 at 11:57:08AM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: Yeah, the commit message is still quite focused on the end effect of copying files back. But that's not what's being changed here. In my suggested commit message I tried to make it

Re: [PATCH v2] difftool --dir-diff: always use identical working tree file

John Keeping j...@keeping.me.uk writes: - When comparing two revisions, e.g. --dir-diff HEAD^^ HEAD^, that checks out (via $rsha1 to checkout -f codepath) a blob that does not match what is in the working tree of HEAD to the temporary directory, we still allow modifications to the

Re: [PATCH 2/4] remote-helpers: rename tests

Felipe Contreras felipe.contre...@gmail.com writes: The .t extension is more standard for sharness tests. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Is that sharness test the sh script testsuite forked from our testsuite? I do not see how it makes sense to copy how they

Re: [PATCH 4/4] remote-helpers: add exec-path links

Felipe Contreras felipe.contre...@gmail.com writes: This way we don't have to modify the PATH ourselves and it's easier to test without 'make'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- .gitignore | 2 ++ contrib/remote-helpers/Makefile | 13

Re: git clone does not understand insteadOf URLs

Andreas Schwab sch...@linux-m68k.org writes: Gioele Barabucci gio...@svario.it writes: Simple, I keep all my projects on the same server, so I would like to refer to that server + path using 'remote-repo'. git+ssh://git.example.org//users/gioele/projects insteadOf remote-repo You can use

Re: contrib/git-normal-to-bare.sh

Zenaan Harkness z...@freedbms.net writes: I needed this quite a bit in the last few days, basic script but serves my need. I think it would be useful for other beginners if in $git/contrib/ source dir. Just a start to a basic script. Needs more tests etc, but it's enough to get newbies

Re: What's cooking in git.git (May 2013, #04; Wed, 15)

Duy Nguyen pclo...@gmail.com writes: Point taken. I guess the message would be something like this? Refname '%.*s' is ignored. It may be created by mistake. Or should we be more elaborate? I dunno; with s/may be/may have been/, I think it is better than refname is ambiguous. -- To

Re: 1.8.3 - gitignore not being parsed correctly on OS X; regex support is broken?

Misty De Meo misty at brew.sh writes: Hi, Gitignore parsing no longer seems to work properly in git 1.8.3. One of my repositories has the following gitignore: /* !/.gitignore !/Library/ !/CONTRIBUTING.md !/README.md !/SUPPORTERS.md !/bin /bin/* !/bin/brew

What's cooking in git.git (May 2013, #08; Tue, 28)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. There are topics that are still in 'next', not because they needed more testing, but only because we already were in the -rc period. Now that

Re: 1.8.3 - gitignore not being parsed correctly on OS X; regex support is broken?

Øystein Walle oys...@gmail.com writes: Misty De Meo misty at brew.sh writes: Hi, Gitignore parsing no longer seems to work properly in git 1.8.3. One of my repositories has the following gitignore: /* !/.gitignore !/Library/ !/CONTRIBUTING.md !/README.md !/SUPPORTERS.md !/bin

Re: [PATCH 1/5] rebase: split the cherry-pick stuff

Felipe Contreras felipe.contre...@gmail.com writes: They do something completely different from 'git am', it belongs in a different file. I would prefer to see it called --cherry-pick, not --cherry, as they are different commands (the latter may be useful when deciding which one to use the

Re: [PATCH 2/5] rebase: fix 'cherry' mode storage

Felipe Contreras felipe.contre...@gmail.com writes: We don't use the 'rebase-apply'. s/.$/; we will use rebase-merge instead./ I think. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- git-rebase--cherry.sh | 4 git-rebase.sh | 5 - 2 files changed, 8

Re: [PATCH 3/5] rebase: fix sequence continuation

Felipe Contreras felipe.contre...@gmail.com writes: We are not in am mode. That may make sense, but shouldn't this part be like so from the very beginning? In other words, this looks like an oops, 1/5 was buggy and this is a hotfix. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com

Re: [PATCH 5/5] rebase: fix cherry-pick invocations

Felipe Contreras felipe.contre...@gmail.com writes: So that all the tests pass. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- git-rebase--cherry.sh | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/git-rebase--cherry.sh

Re: [PATCH 5/5] rebase: fix cherry-pick invocations

Junio C Hamano gits...@pobox.com writes: Felipe Contreras felipe.contre...@gmail.com writes: So that all the tests pass. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- git-rebase--cherry.sh | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) diff

Re: [PATCH] fix segfault with git log -c --follow

On Tue, May 28, 2013 at 10:22:17AM -0700, Junio C Hamano wrote: Clemens Buchacher dri...@aon.at writes: In diff_tree_combined we make a copy of diffopts. In try_to_follow_renames, called via diff_tree_sha1, we free and re-initialize diffopts-pathspec-items. Since we did not make a deep

Re: [PATCH] fix segfault with git log -c --follow

Clemens Buchacher dri...@aon.at writes: I wonder, just like we force recursive and disable external on the copy before we use it to call diff_tree_sha1(), if we should disable follow-renames on it. --follow is an option that is given to the history traversal part and it should not play any

Re: [PATCH v2 7/8] remote-bzr: reorganize the way 'wanted' works

Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: +wanted = get_config('remote-bzr.branches').rstrip().split(', ') Two minor nits and one design suggestion: - Why rstrip() not strip()? The purpose of the strip is to remove the _single_ \n

Re: [PATCH 1/2] sequencer: trivial fix

Junio C Hamano wrote: Neil Horman nhor...@tuxdriver.com writes: On Mon, May 27, 2013 at 11:52:18AM -0500, Felipe Contreras wrote: We should free objects before leaving. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sequencer.c | 7 +-- 1 file changed, 5

Re: [PATCH 4/5] test: improve rebase -q test

Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: Let's show the output so it's clear why it failed. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- t/t3400-rebase.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t3400-rebase.sh

Re: [PATCH 1/3] cherry-pick: add support to copy notes

Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/revert.c | 2 + sequencer.c | 136 -- sequencer.h | 2 +

Re: [PATCH 1/3] cherry-pick: add support to copy notes

Thomas Rast wrote: Junio C Hamano gits...@pobox.com writes: Thomas Rast Cc'ed as he has been the primary force behind this line of notes usability. Thanks for pointing this out to me. Felipe Contreras felipe.contre...@gmail.com writes: Signed-off-by: Felipe Contreras

Re: [PATCH 2/4] remote-helpers: rename tests

Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: The .t extension is more standard for sharness tests. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Is that sharness test the sh script testsuite forked from our testsuite? I do not see how

RE: contrib/git-normal-to-bare.sh

Zenaan Harkness wrote: This question comes up every now and then - how to convert from normal to bare, or vice versa. This is just a start to a basic script to go one way. Needs more tests etc, but it's enough to get newbies (like me) off to a reasonable start. PLEASE CC me, as I am not

RE: What's cooking in git.git (May 2013, #08; Tue, 28)

Junio C Hamano wrote: * fc/makefile (2013-05-26) 5 commits - build: do not install git-remote-testpy - build: add NO_INSTALL variable - build: cleanup using $ - build: cleanup using $^ - build: trivial simplification (this branch is used by fc/remote-helpers-use-specified-python.)

Re: [PATCH 0/5] rebase: improve the keep-empty

Martin von Zweigbergk wrote: I think I have some patches at home that instead teach 'git am' the --keep-empty flag. Does that make sense? It's been a while since I looked at it, but I'll try to take a look tonight (PST). I think it does make sense. But I still would prefer 'git rebase' to rely

Re: [PATCH v2 0/3] Towards a useable git-branch

On Tue, May 28, 2013 at 9:28 PM, Ramkumar Ramachandra artag...@gmail.com wrote: Ramkumar Ramachandra wrote: %(N) doesn't work properly with f-e-r, and I'm not sure why. I'm not talking about your last patch where you compute * -- that works fine; it's just that %(N) doesn't when N is a

Re: [PATCH 2/5] rebase: fix 'cherry' mode storage

Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: We don't use the 'rebase-apply'. s/.$/; we will use rebase-merge instead./ I think. We could use 'rebase-apply' or any directory, but currently we don't use any, and 'rebase-apply' is for 'git am'. Signed-off-by:

[PATCH] completion: avoid ls-remote in certain scenarios

It's _very_ slow in many cases, and there's really no point in fetching *everything* from the remote just for completion. In many cases it might be faster for the user to type the whole thing. If the user manually specifies 'refs/*', then the full ls-remote completion is triggered.

Re: [PATCH v2 0/3] Towards a useable git-branch

On Tue, May 28, 2013 at 9:01 PM, Ramkumar Ramachandra artag...@gmail.com wrote: Also, a couple of minor annoyances: 1. When f-e-r is invoked with refs/tags, we get stray output. Atleast it doesn't segfault, thanks to your ignore-commit patch. Maybe printing stray output is the right thing

[PATCH] completion: zsh: improve bash script loading

It's better to check in multiple locations, so the user doesn't have to. And update the documentation. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/completion/git-completion.zsh | 26 ++ 1 file changed, 18 insertions(+), 8 deletions(-) diff

Re: 1.8.3 - gitignore not being parsed correctly on OS X; regex support is broken?

On Wed, May 29, 2013 at 12:54 AM, Misty De Meo mi...@brew.sh wrote: Hi, Gitignore parsing no longer seems to work properly in git 1.8.3. One of my repositories has the following gitignore: /* !/.gitignore !/Library/ !/CONTRIBUTING.md !/README.md !/SUPPORTERS.md !/bin /bin/*

[PATCH v2 0/8] cherry-pick: improvements

Hi, Here's a bunch of changes to make cherry-pick (and revert) more useful. In particular; this makes it more friendly for 'git rebase. Felipe Contreras (8): sequencer: remove useless indentation sequencer: trivial fix cherry-pick: add --skip-empty option cherry-pick: store rewritten

[PATCH v2 1/8] sequencer: remove useless indentation

By using good ol' goto. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sequencer.c | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sequencer.c b/sequencer.c index ab6f8a7..b4989ba 100644 --- a/sequencer.c +++ b/sequencer.c @@ -474,7 +474,7 @@

[PATCH v2 2/8] sequencer: trivial fix

We should free objects before leaving. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sequencer.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sequencer.c b/sequencer.c index b4989ba..f7be7d8 100644 --- a/sequencer.c +++ b/sequencer.c @@ -628,8

[PATCH v2 3/8] cherry-pick: add --skip-empty option

Pretty much what it says on the tin. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-cherry-pick.txt | 3 +++ builtin/revert.c| 2 ++ sequencer.c | 6 ++ sequencer.h | 1 +

[PATCH v2 4/8] cherry-pick: store rewritten commits

Will be useful for the next commits. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sequencer.c | 95 - sequencer.h | 1 + 2 files changed, 95 insertions(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index

[PATCH v2 5/8] sequencer: run post-rewrite hook

As we should. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- sequencer.c | 45 - 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index c217716..3aa480e 100644 --- a/sequencer.c +++ b/sequencer.c

[PATCH v2 6/8] cherry-pick: add support to copy notes

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- builtin/revert.c | 2 ++ sequencer.c | 33 - sequencer.h | 1 + t/t3500-cherry.sh | 32 4 files changed, 67 insertions(+), 1 deletion(-) diff --git

[PATCH v2 7/8] revert/cherry-pick: add --quiet option

Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-cherry-pick.txt | 6 +- Documentation/git-revert.txt | 6 +- builtin/revert.c | 1 + sequencer.c | 9 ++--- sequencer.h | 1 + 5 files

[PATCH v2 8/8] revert/cherry-pick: add --skip option

Akin to 'am --skip' and 'rebase --skip'. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- Documentation/git-cherry-pick.txt | 1 + Documentation/git-revert.txt | 1 + Documentation/sequencer.txt | 3 +++ builtin/revert.c | 6 ++ sequencer.c

  1   2   >