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".
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
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
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
- 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
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
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
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
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 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
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
@@ -
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
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" =
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
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 +++
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
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
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
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 +
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
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
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
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
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
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
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
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
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 +--
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)
>
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, 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
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 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
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))]
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 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
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 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
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
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/
- 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
乙酸鋰 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
101 - 143 of 143 matches
Mail list logo
