乙酸鋰 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 repo, it will land
- Original Message -
> From: Quark
> To: Git List
> 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
> of
> branches, (lot means > 100). T
Stefano Lattarini wrote:
On 05/26/2013 10:05 PM, Stefan Beller wrote:
Reported by cppcheck.
Signed-off-by: Stefan Beller
---
fast-import.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fast-import.c b/fast-import.c
index 5f539d7..0142e3a 100644
--- a/fast-import.c
+++ b/
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, t
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
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 curren
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
bar
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 http://vger.kernel.org
Hi,
On Wed, May 22, 2013 at 09:32:44AM +0200, Thomas Gummerer wrote:
> SZEDER Gábor writes:
> > On Tue, May 21, 2013 at 10:54:27PM +0200, Thomas Gummerer wrote:
> >> - svn_remote[ $((${#svn_remote[@]} + 1)) ]="$value"
> >> + svn_remote[$((${#svn_remote[@]} + 1))]
On Mon, May 27, 2013 at 11:52:18AM -0500, Felipe Contreras wrote:
> We should free objects before leaving.
>
> Signed-off-by: Felipe Contreras
> ---
> sequencer.c | 7 +--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/sequencer.c b/sequencer.c
> index ab6f8a7..7eeae2f 1
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
> ---
> Documentation/git-cherry-pick.txt | 3 +++
> builtin/revert.c| 2 ++
> sequencer.c | 5 -
> se
On Tue, 28 May 2013 15:42:57 +0800 (SGT)
Quark 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 of fact, this mailing
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 pre
On Tue, May 28, 2013 at 7:32 PM, Anthony Ramine wrote:
> @@ -196,6 +196,11 @@ static int dowild(const uchar *p, const uchar *text,
> unsigned int flags)
> }
> if (t_ch <= p_ch && t_ch >= prev_ch)
>
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 +--
Signed-off-by: Felipe Contreras
---
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)
ret->remote = remote
We should free objects before leaving.
Signed-off-by: Felipe Contreras
---
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 +626,15 @@ static int do_pick_c
No functional changes.
Signed-off-by: Felipe Contreras
---
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
index 826500b..3968020 10075
Let's show the output so it's clear why it failed.
Signed-off-by: Felipe Contreras
---
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
+++ b/t/t3400-rebase.sh
@@ -185,6 +185,7 @@ tes
Signed-off-by: Felipe Contreras
---
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
+++ b/t/t3404-rebase-interactive.sh
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 rewrit
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
Signed-off-by: Felipe Contreras
---
builtin/revert.c | 2 +
sequencer.c | 136 --
sequencer.h | 2 +
t/t3500-cherry.sh | 32 +
4 files changed, 169 insertions(+), 3 deletions(-)
diff --git a/builtin/revert.c b/buil
Signed-off-by: Felipe Contreras
---
Documentation/git-cherry-pick.txt | 6 +-
Documentation/git-revert.txt | 6 +-
builtin/revert.c | 1 +
sequencer.c | 2 ++
sequencer.h | 1 +
5 files changed, 14 insertions(+), 2 deletion
Akin to 'am --skip' and 'rebase --skip'.
Signed-off-by: Felipe Contreras
---
Documentation/git-cherry-pick.txt | 1 +
Documentation/git-revert.txt | 1 +
Documentation/sequencer.txt | 3 +++
builtin/revert.c | 6 ++
sequencer.c | 24 +
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 wrote:
>> @@ -196,6 +196,11 @@ static int dowild(const uchar *p, const uchar *text,
>> unsi
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 pre
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 'am
They do something completely different from 'git am', it belongs in a
different file.
Signed-off-by: Felipe Contreras
---
.gitignore| 1 +
Makefile | 1 +
git-rebase--am.sh | 65 ++-
git-rebase--cherry.sh | 34 +++
We don't use the 'rebase-apply'.
Signed-off-by: Felipe Contreras
---
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 100644
--- a/git-rebase--cherry
Signed-off-by: Felipe Contreras
---
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
;;
abort)
+ test "$type" =
So that all the tests pass.
Signed-off-by: Felipe Contreras
---
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
--- a/git-rebase--cherry.sh
+++ b/git-rebase--ch
We are not in am mode.
Signed-off-by: Felipe Contreras
---
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
+++ b/git-rebase--cherry.sh
@@ -
On Tue, May 28, 2013 at 8:29 AM, Felipe Contreras
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.
>
> There's only a few
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 pre
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 probl
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) %<(*)%(o
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 tha
- Original Message -
> From: Konstantin Khomoutov
> To: Quark
> Cc: Git List
> 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)
> Quark wrote:
>
>> > I have been using git-svn in an corpora
Matthijs Kooijman wrote:
> 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 shallo
Jonathan Nieder wrote:
> If I remember correctly, what we discussed is just changing the
> protocol to "5 means a depth of 5". The client already trusts what the
> server provides.
(Or tweaking the protocol by adding a new capability, if unpredictable
behavior based on the version of the server w
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
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".
Felipe Contreras 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 remote-bzr.branches 'trunk, devel,
Neil Horman 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
>> ---
>> sequencer.c | 7 +--
>> 1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/sequencer.c b/sequen
Ramsay Jones 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.
>
> In order to suppre
Matthijs Kooijman 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: Create new shal
Felipe Contreras writes:
> Signed-off-by: Felipe Contreras
> ---
> 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 ch
Felipe Contreras writes:
> Let's show the output so it's clear why it failed.
>
> Signed-off-by: Felipe Contreras
> ---
> 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
>
Felipe Contreras writes:
> Signed-off-by: Felipe Contreras
> ---
> builtin/revert.c | 2 +
> sequencer.c | 136
> --
> sequencer.h | 2 +
> t/t3500-cherry.sh | 32 +
> 4 files changed, 169 insertions(+), 3 deleti
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
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
wrote:
> Hi,
>
> I've been analyzing 'git
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 "), perhaps?
>
> test_must_be_an_empty_file () {
> if test -s "$1"
>
Clemens Buchacher 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
> get t
Jonathan Nieder 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 "), perhaps?
>>
>> test_must_be_an_empty_file () {
>>
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-pack"s that has been running for days/weeks
> without terminating
>
> Attaching gdb and doing a trace results in:
> #0 0x003261207b35 in pthread_join () fro
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
/Lib
Junio C Hamano 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 writes:
>
>> Signed-off-by: Felipe Contreras
>> ---
>> builtin/revert.c | 2 +
>> sequencer.c | 136
>> +++
Kenichi Saita 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 across but
> with
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
On Tue, May 28, 2013 at 11:06:13AM -0700, Junio C Hamano wrote:
> Kenichi Saita 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
> >
John Keeping 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 temporary tree
On Tue, May 28, 2013 at 11:57:08AM -0700, Junio C Hamano wrote:
> John Keeping 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
John Keeping 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 copy in
Felipe Contreras writes:
> The .t extension is more standard for sharness tests.
>
> Signed-off-by: Felipe Contreras
> ---
Is that "sharness" test the sh script testsuite forked from our
testsuite?
I do not see how it makes sense to copy how they deviate from us
back to our codebase, especiall
Felipe Contreras 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
> ---
> .gitignore | 2 ++
> contrib/remote-helpers/Makefile | 13 +
> 2 files changed, 11 insertions(+)
Andreas Schwab writes:
> Gioele Barabucci 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 "remote-repo:" instead
Zenaan Harkness 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 (like me) off to
Duy Nguyen 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 unsubscribe from thi
Misty De Meo 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
> !/share/man
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 1.
Øystein Walle writes:
> Misty De Meo 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
>>
Felipe Contreras 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 former).
>
> Signed-off-by:
Felipe Contreras writes:
> We don't use the 'rebase-apply'.
s/.$/; we will use rebase-merge instead./ I think.
> Signed-off-by: Felipe Contreras
> ---
> git-rebase--cherry.sh | 4
> git-rebase.sh | 5 -
> 2 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/git-re
Felipe Contreras 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
> ---
> git-rebase--cherry.sh | 10 ++
Felipe Contreras writes:
> So that all the tests pass.
>
> Signed-off-by: Felipe Contreras
> ---
> 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
> ---
Junio C Hamano writes:
> Felipe Contreras writes:
>
>> So that all the tests pass.
>>
>> Signed-off-by: Felipe Contreras
>> ---
>> git-rebase--cherry.sh | 17 -
>> 1 file changed, 16 insertions(+), 1 deletion(-)
>>
>> diff --git a/git-rebase--cherry.sh b/git-rebase--cherry.sh
>
On Tue, May 28, 2013 at 10:22:17AM -0700, Junio C Hamano wrote:
> Clemens Buchacher 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
> > co
Clemens Buchacher 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 role
Junio C Hamano wrote:
> Felipe Contreras 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" at the end that
subprocess communi
Junio C Hamano wrote:
> Neil Horman 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
> >> ---
> >> sequencer.c | 7 +--
> >> 1 file changed, 5 insertions(+), 2 deletions(-)
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > Let's show the output so it's clear why it failed.
> >
> > Signed-off-by: Felipe Contreras
> > ---
> > t/t3400-rebase.sh | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
> > index b58fa1a.
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > Signed-off-by: Felipe Contreras
> > ---
> > builtin/revert.c | 2 +
> > sequencer.c | 136
> > --
> > sequencer.h | 2 +
> > t/t3500-cherry.sh | 32 +
> > 4
Thomas Rast wrote:
> Junio C Hamano 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 writes:
> >
> >> Signed-off-by: Felipe Contreras
> >> ---
> >> builtin/revert.c |
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > The .t extension is more standard for sharness tests.
> >
> > Signed-off-by: Felipe Contreras
> > ---
>
> Is that "sharness" test the sh script testsuite forked from our
> testsuite?
>
> I do not see how it makes sense to copy how they dev
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
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-pytho
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 re
On Tue, May 28, 2013 at 9:28 PM, Ramkumar Ramachandra
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 concrete number.
Junio C Hamano wrote:
> Felipe Contreras 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: Felipe Contreras
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.
Signed-off-by:
On Tue, May 28, 2013 at 9:01 PM, Ramkumar Ramachandra
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 to do, as oppos
It's better to check in multiple locations, so the user doesn't have to.
And update the documentation.
Signed-off-by: Felipe Contreras
---
contrib/completion/git-completion.zsh | 26 ++
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/contrib/completion/git
On Wed, May 29, 2013 at 12:54 AM, Misty De Meo 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/*
> !/bin/b
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 comm
By using good ol' goto.
Signed-off-by: Felipe Contreras
---
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 @@ static int do_pick_commit(s
We should free objects before leaving.
Signed-off-by: Felipe Contreras
---
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 +628,10 @@ static int do_pick_com
Pretty much what it says on the tin.
Signed-off-by: Felipe Contreras
---
Documentation/git-cherry-pick.txt | 3 +++
builtin/revert.c| 2 ++
sequencer.c | 6 ++
sequencer.h | 1 +
t/t3508-cherry-pick-many-commits.sh | 1
Will be useful for the next commits.
Signed-off-by: Felipe Contreras
---
sequencer.c | 95 -
sequencer.h | 1 +
2 files changed, 95 insertions(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c
index d3c7d72..c217716 100644
---
As we should.
Signed-off-by: Felipe Contreras
---
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
@@ -127,6 +127,37 @@ static
1 - 100 of 143 matches
Mail list logo
