Hi all,
I have a commit like this:
commit 4d77a3cee01db0412956d40875c79f51ac745acc
tree 3443c9f633114c3bd2e015453a8c55a171e62b53
parent 340d808ade8a79857bec40770f0eb4f98224c53d
author
committer .
which modifies file A/B/C (ie specifically does not add, but changes
an
After way too long, here is finally a new version of the tests I sent
at: http://thread.gmane.org/gmane.comp.version-control.git/205796.
I have split the test up into two files. They stil take quite some
time to run.
Martin von Zweigbergk (7):
add simple tests of consistency across rebase types
---
t/lib-rebase.sh | 17
t/t3420-rebase-topology-linear.sh | 85 +++
2 files changed, 102 insertions(+)
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 62b3887..16eeb1c 100644
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -80,3
t3406 is supposed to test "messages from rebase operation", so let's
move tests in t3400 that fit that description into 3406. Most of the
functionality they tested, except for the messages, has now been
subsumed by t3420.
---
t/t3400-rebase.sh | 22 --
t/t3406-rebase-me
---
t/t3400-rebase.sh | 31 +
t/t3401-rebase-partial.sh | 45 ---
t/t3404-rebase-interactive.sh | 10 +-
t/t3409-rebase-preserve-merges.sh | 53
t/t3425-rebase-topology-merges.sh | 250 ++
5 files changed, 252 ins
Helped-by: Johannes Sixt
---
t/lib-rebase.sh | 15
t/t3420-rebase-topology-linear.sh | 78 +++
2 files changed, 93 insertions(+)
create mode 100755 t/t3420-rebase-topology-linear.sh
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
ind
---
t/t3420-rebase-topology-linear.sh | 129 ++
1 file changed, 129 insertions(+)
diff --git a/t/t3420-rebase-topology-linear.sh
b/t/t3420-rebase-topology-linear.sh
index 40fe264..2429aa8 100755
--- a/t/t3420-rebase-topology-linear.sh
+++ b/t/t3420-rebase-topo
Update the following:
- Quote 'setup'
- Remove blank lines within test case body
- Use test_commit instead of custom quick_one
- Create branch "topic" from tag created by test_commit
---
t/t3406-rebase-message.sh | 30 +-
1 file changed, 9 insertions(+), 21 deletio
---
t/t3401-rebase-partial.sh | 24
t/t3420-rebase-topology-linear.sh | 58 +++
2 files changed, 58 insertions(+), 24 deletions(-)
diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh
index 58f4823..7ba1797 100755
--- a/t/
On Wed, May 29, 2013 at 1:17 AM, Johannes Sixt wrote:
> Am 5/29/2013 5:24, schrieb Felipe Contreras:
>> +if [ -z "$script" ]; then
>> + local -a locations
>> + locations=(
>> + '/etc/bash_completion.d/git' # fedora, old debian
>> + '/usr/share/bash-completion/comple
When we are rebasing without options ('am' mode), the head rebased lives
in '$g/rebase-apply/head-name', so lets use that information so it's
reported the same way as if we were doing other rebases (-i or -m).
Signed-off-by: Felipe Contreras
---
contrib/completion/git-prompt.sh | 2 ++
t/t9903-b
On Sun, May 19, 2013 at 02:17:35PM +0100, John Keeping wrote:
> When using "git cherry" or "git log --cherry-pick" we often have a small
> number of commits on one side and a large number on the other. In
> revision.c::cherry_pick_list we store the patch IDs for the small side
> before comparing
Am 5/29/2013 5:24, schrieb Felipe Contreras:
> +if [ -z "$script" ]; then
> + local -a locations
> + locations=(
> + '/etc/bash_completion.d/git' # fedora, old debian
> + '/usr/share/bash-completion/completions/git' # arch, ubuntu,
> new debian
> + '/usr
:-)
On Tue, May 28, 2013 at 11:05 PM, Felipe Contreras
wrote:
> On Wed, May 29, 2013 at 12:51 AM, Martin von Zweigbergk
> wrote:
>> On Tue, May 28, 2013 at 10:41 PM, Felipe Contreras
>> wrote:
>
>>> One change splits, the other change fixes, what's wrong with that?
>>
>> I didn't say there was
On Wed, May 29, 2013 at 12:51 AM, Martin von Zweigbergk
wrote:
> On Tue, May 28, 2013 at 10:41 PM, Felipe Contreras
> wrote:
>> One change splits, the other change fixes, what's wrong with that?
>
> I didn't say there was anything wrong. I was asking if the bug was
> there before (and I didn't s
Junio C Hamano wrote:
> 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/g
Junio C Hamano wrote:
> 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--cherr
Junio C Hamano wrote:
> 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".
How can 1/5 be introducing a bug? It's merely sp
On Tue, May 28, 2013 at 10:41 PM, Felipe Contreras
wrote:
> On Wed, May 29, 2013 at 12:33 AM, Martin von Zweigbergk
> wrote:
>> As Junio asked in the previous iteration, shouldn't this have been in
>> the first patch?
>
> No, the first patch is splitting the code without introducing any
> functi
On Wed, May 29, 2013 at 12:35 AM, Martin von Zweigbergk
wrote:
> Same here: should this have been in the first patch? If not, do you
> know for how long it has been broken (since which commit)?
Since day 1 of --keep-empty:
90e1818 git-rebase: add keep_empty flag
--
Felipe Contreras
--
To unsub
On Wed, May 29, 2013 at 12:38 AM, Martin von Zweigbergk
wrote:
> Actually, are all of 2/8 - 7/8 fixes for things that broke in patch 1/8?
No, everything is already broken.
Try this:
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -78,7 +78,7 @@ state_dir=
action=
preserve_merges=
autosquash=
-kee
This would be so much more convenient if git-grep supported it natively:
$ git grep -n 'if \(0\)' | perl -pe's/([^:]+):([^:]+).*/`git blame -L
$2,$2 $1`/se'
d18f76dc (Ævar Arnfjörð Bjarmason 2010-08-17 09:24:38 + 2278) if (0)
65648283 (David Brown 2007-12-25 19:56:29 -0800 433) if (0) {
I.e
On Wed, May 29, 2013 at 12:33 AM, Martin von Zweigbergk
wrote:
> As Junio asked in the previous iteration, shouldn't this have been in
> the first patch?
No, the first patch is splitting the code without introducing any
functional changes.
This is fixing a bug that already exists, we could fix
Actually, are all of 2/8 - 7/8 fixes for things that broke in patch 1/8?
On Tue, May 28, 2013 at 9:16 PM, Felipe Contreras
wrote:
> We don't use the 'rebase-apply'.
>
> Signed-off-by: Felipe Contreras
> ---
> git-rebase--cherrypick.sh | 4
> git-rebase.sh | 5 -
> 2 files c
Same here: should this have been in the first patch? If not, do you
know for how long it has been broken (since which commit)?
On Tue, May 28, 2013 at 9:16 PM, Felipe Contreras
wrote:
> Signed-off-by: Felipe Contreras
> ---
> git-rebase.sh | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git
As Junio asked in the previous iteration, shouldn't this have been in
the first patch?
On Tue, May 28, 2013 at 9:16 PM, Felipe Contreras
wrote:
> We are not in am mode.
>
> Signed-off-by: Felipe Contreras
> ---
> git-rebase--cherrypick.sh | 10 ++
> 1 file changed, 6 insertions(+), 4 d
On Tue, May 21, 2013 at 09:19:22AM +0200, Thomas Rast wrote:
> Junio C Hamano writes:
>
> > * tr/test-v-and-v-subtest-only (2013-05-16) 6 commits
> > - test-lib: support running tests under valgrind in parallel
> > - test-lib: allow prefixing a custom string before "ok N" etc.
> > - test-lib:
On Wed, May 29, 2013 at 01:00:00AM -0400, Jeff King wrote:
> So we see 83 and 84 non-verbose, which is good. And we see the actual
> output from 85 (the output from a "git checkout"). But we do not see the
> "expecting success" for it. We see it for the _next_ test, which we
> should not see at al
On Thu, May 16, 2013 at 10:50:14PM +0200, Thomas Rast wrote:
> With the new --verbose-only= option, one can enable --verbose
> at a per-test granularity. The pattern is matched against the test
> number, e.g.
>
> ./t-basic.sh --verbose-only='2[0-2]'
>
> to see only the full output of test
On Thu, May 16, 2013 at 10:50:11PM +0200, Thomas Rast wrote:
> One open issue with the last patch that currently eludes me: if I
> combine --valgrind-parallel with any --valgrind=*, there are lots of
> errors as (apparently) the valgrind wrapper setups race against each
> other. However, without
On Wed, May 29, 2013 at 10:41 AM, Duy Nguyen wrote:
> The changes in this area since 1.8.2.3 seem to be Karsten's (I'm not
> blaming, just wanted to narrow down the problem). The patterns of
> interest seem to be
>
> !/bin
> /bin/*
> !/bin/brew
>
> Without "!/bin" v1.8.3 seems to behave the same a
Unless any specific 'git am' options are used.
Signed-off-by: Felipe Contreras
---
contrib/completion/git-prompt.sh | 2 ++
git-rebase--am.sh | 1 +
git-rebase.sh | 9 -
t/t3407-rebase-abort.sh| 2 +-
t/t5520-pull.sh
When there's changes in the staging area. Just like the other rebase
modes.
Signed-off-by: Felipe Contreras
---
git-rebase--cherrypick.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh
index ef3224d..0fcf2e1 100644
--- a/git-rebase
Signed-off-by: Felipe Contreras
---
git-rebase--cherrypick.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh
index ab892e6..ef3224d 100644
--- a/git-rebase--cherrypick.sh
+++ b/git-rebase--cherrypick.sh
@@ -3,6 +3,9 @@
# Copyright (c)
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 76900a0..9b5d78b 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--cherrypick.sh | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh
index 2fa4993..ab892e6 100644
--- a/git-rebase--cherrypick.sh
+++
We are not in am mode.
Signed-off-by: Felipe Contreras
---
git-rebase--cherrypick.sh | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh
index 51354af..2fa4993 100644
--- a/git-rebase--cherrypick.sh
+++ b/git-rebase
We don't use the 'rebase-apply'.
Signed-off-by: Felipe Contreras
---
git-rebase--cherrypick.sh | 4
git-rebase.sh | 5 -
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/git-rebase--cherrypick.sh b/git-rebase--cherrypick.sh
index cbf80f9..51354af 100644
--- a/gi
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 | 11 +--
git-rebase--cherrypick.sh | 34 +++
Hi,
After the fixes I did to cherry-pick, it's now fully usable for 'git rebase'
and can be used to replace 'git am' for most cases.
We already rely on cherry-pick for the 'am' mode, but only when using the
--keep-empty option, and when in such mode the behavior of 'git rebase' changes
completely
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 | 32 +
Signed-off-by: Felipe Contreras
---
Documentation/git-cherry-pick.txt | 6 +-
Documentation/git-revert.txt | 6 +-
builtin/revert.c | 1 +
sequencer.c | 9 ++---
sequencer.h | 1 +
5 files changed, 18 insertions(+), 5 d
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
Signed-off-by: Felipe Contreras
---
builtin/revert.c | 2 ++
sequencer.c | 33 -
sequencer.h | 1 +
t/t3500-cherry.sh | 32
4 files changed, 67 insertions(+), 1 deletion(-)
diff --git a/builtin/revert.c b/builtin/rev
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
---
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
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
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
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
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 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 _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:
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
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.
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
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
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:
> 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
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:
>
> > Signed-off-by: Felipe Contreras
> > ---
> > builtin/revert.c | 2 +
> > sequencer.c | 136
> > --
> > sequencer.h | 2 +
> > t/t3500-cherry.sh | 32 +
> > 4
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:
> 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:
>
> > +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
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
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
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
>
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
> ---
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:
> 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:
> 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:
Ø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
>>
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.
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
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
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
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
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(+)
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
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
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:
> 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: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
> >
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
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
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
>> +++
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
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
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 () {
>>
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
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"
>
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
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
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
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
> ---
> 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
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
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
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
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,
1 - 100 of 143 matches
Mail list logo
