Thank you, it seems, that you are right, and following works
1) I cloned trunk from scratch
git svn clone -T trunk/ https://some_host --revision 1104830:HEAD
2) Then add branches I want to fetch in .git/config:
fetch = branches/proj/proj-stable-2013-08-14:refs/remotes/proj-stable-2013-08-14
3) T
On Thu, Oct 31, 2013 at 8:48 PM, David Aguilar wrote:
> On Thu, Oct 31, 2013 at 07:56:03PM -0600, Felipe Contreras wrote:
>> Nobody is forcing you to read them.
>
> You're missing the *key* point.
> No one wants to interact with a rude arrogant loudmouth.
Then don't. Problem solved.
--
Felipe
On Thu, Oct 31, 2013 at 07:56:03PM -0600, Felipe Contreras wrote:
> On Thu, Oct 31, 2013 at 5:40 PM, David Aguilar wrote:
> > On Thu, Oct 31, 2013 at 03:16:57PM -0600, Felipe Contreras wrote:
> >> On Thu, Oct 31, 2013 at 2:43 PM, Junio C Hamano wrote:
> >> > Junio C Hamano writes:
> >>
> >> > Th
On Thu, Oct 31, 2013 at 5:40 PM, David Aguilar wrote:
> On Thu, Oct 31, 2013 at 03:16:57PM -0600, Felipe Contreras wrote:
>> On Thu, Oct 31, 2013 at 2:43 PM, Junio C Hamano wrote:
>> > Junio C Hamano writes:
>>
>> > The other reason the original did not say "origin/master" is because
>> > this h
On Thu, Oct 31, 2013 at 6:20 PM, Junio C Hamano wrote:
> Duy Nguyen writes:
>> OK how about, if $GIT_DIR/hooks/something is a directory, then the
>> directory must contain a file named "index", listing all the hooks of
>> type "something". All the hooks in "index" will be executed in the
>> listi
"brian m. carlson" writes:
> RFC 5321 forbids lines exceeding 1000 octets (including CRLF). RFC 5322
> forbids lines exceeding 998 characters (excluding CRLF). If you want to
> get around that, you need to base64-encode the content, which is
> generally discouraged when sending patches, I belie
On Fri, Nov 1, 2013 at 12:20 AM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> OK how about, if $GIT_DIR/hooks/something is a directory, then the
>> directory must contain a file named "index", listing all the hooks of
>> type "something". All the hooks in "index" will be executed in the
>> lis
On Fri, Nov 01, 2013 at 12:09:10AM +0100, Stefan Beller wrote:
> On 11/01/2013 12:04 AM, Stefan Beller wrote:
> > Recently a discussion started on the mailing list, which short option
> > shall be best for a long option. (-f being always --force and therefore
> > should not be reassigned another me
On Thu, Oct 31, 2013 at 03:16:57PM -0600, Felipe Contreras wrote:
> On Thu, Oct 31, 2013 at 2:43 PM, Junio C Hamano wrote:
> > Junio C Hamano writes:
>
> > The other reason the original did not say "origin/master" is because
> > this holds true even if you do not have such a remote-tracking
> >
Recently a discussion started on the mailing list, which short option
shall be best for a long option. (-f being always --force and therefore
should not be reassigned another meaning in one particular command)
See http://www.mail-archive.com/git@vger.kernel.org/msg38456.html
For discussions as the
On 10/27/2013 05:30 PM, Thomas Rast wrote:
> Stefan Beller writes:
>
>> I assembled an overview table, which plots the long options of
>> git commands by the short letters.
> [...]
>> (In case thunderbird messes it up, here it is again
>> http://pastebin.com/raw.php?i=JBci2Krx)
>>
>> As you can
On Thu, Oct 31, 2013 at 02:36:51AM -0400, Jeff King wrote:
> From: brian m. carlson
>
> Due to an interaction between the way libcurl handles GSSAPI
> authentication over HTTP and the way git uses libcurl, large
> pushes (those over http.postBuffer bytes) would fail due to
> an authentication fai
On 31.10.2013, at 20:53, Felipe Contreras wrote:
> On Thu, Oct 31, 2013 at 1:47 PM, Max Horn wrote:
>>
>> On 31.10.2013, at 20:41, Felipe Contreras wrote:
>>
>>> On Thu, Oct 31, 2013 at 1:29 PM, Max Horn wrote:
[...]
>>>
>>> That's what the previous patch does.
>>
>> Right *facepalm*.
>>
Vivien Didelot writes:
> The commit 87b7b84 removed a space in the unpack-objects usage, which
> makes the synopsis a bit confusing. This patch simply restores it.
>
> Signed-off-by: Vivien Didelot
> ---
> Documentation/git-unpack-objects.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion
The commit 87b7b84 removed a space in the unpack-objects usage, which
makes the synopsis a bit confusing. This patch simply restores it.
Signed-off-by: Vivien Didelot
---
Documentation/git-unpack-objects.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-un
On Thu, Oct 31, 2013 at 2:07 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> On Thu, Oct 31, 2013 at 1:05 PM, Junio C Hamano wrote:
>>> Felipe Contreras writes:
>>>
Otherwise we would have to include commit.h.
>>>
>>> Was there a reason why commit.h is not included here, just lik
On Thu, Oct 31, 2013 at 2:43 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
> The other reason the original did not say "origin/master" is because
> this holds true even if you do not have such a remote-tracking
> branch for the master at the origin, but the illustration that shows
> the his
On Thu, Oct 31, 2013 at 2:27 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> On Thu, Oct 31, 2013 at 1:00 PM, Junio C Hamano wrote:
>>> Felipe Contreras writes:
>>>
On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>> --- a/Document
Ramkumar Ramachandra writes:
> Enhance 'git for-each-ref' with color formatting options. You can now
> use the following format in for-each-ref:
>
> %C(green)%(refname:short)%C(reset)
So far, every magic for-each-ref takes were of form %(...); was
there a reason why this had to be %C(...), no
Patches 7 through this one looks good; thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Looks good; thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Junio C Hamano writes:
> Max Horn writes:
>
>>> ... The "reality" is more like this:
>>>
>>> origin/master in your repository
>>> |
>>> v
>>> A---B---C master at origin
>>> /
>>>D---E---F---G master in your repository
>>>
>>> if you really want to write origin/maste
On Thu, Oct 31, 2013 at 2:31 PM, Junio C Hamano wrote:
> I agree that there is no justification to write "if 0 == something",
> when "if something == 0" suffices. The latter reads better and that
> is why the phrase "yoda condition" was invented.
>
> But the situation is different when both side
Martin von Zweigbergk writes:
> I was recently confused by the yoda condition in this block of code from [1]
>
> + for (i = 0; i < revs.nr; i++)
> + if (&bases->item->object == &revs.commit[i]->object)
> + break; /* found */
> + if (revs.nr <= i)
>
> I think I was particularly surprised because i
Felipe Contreras writes:
> On Thu, Oct 31, 2013 at 1:00 PM, Junio C Hamano wrote:
>> Felipe Contreras writes:
>>
>>> On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano wrote:
Felipe Contreras writes:
>>>
> --- a/Documentation/git-pull.txt
> +++ b/Documentation/git-pull.txt
> @@
On Thu, Oct 31, 2013 at 3:41 PM, Junio C Hamano wrote:
> Eugene Sajine writes:
>
>> One note: i tried the ${GIT_PREFIX:-.} and ${GIT_PREFIX} and it seems
>> to give the same results. What is the expected difference here?
>
> GIT_PREFIX may be an empty string when you run from the top-level,
> in
Felipe Contreras writes:
> On Thu, Oct 31, 2013 at 1:05 PM, Junio C Hamano wrote:
>> Felipe Contreras writes:
>>
>>> Otherwise we would have to include commit.h.
>>
>> Was there a reason why commit.h is not included here, just like
>> revision.h would include diff.h, so that users of shortlog.h
On Thu, Oct 31, 2013 at 1:00 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano wrote:
>>> Felipe Contreras writes:
>>
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -39,7 +39,7 @@ Assume the following
On Thu, Oct 31, 2013 at 1:48 PM, Martin von Zweigbergk
wrote:
> I guess what I'm trying to say is that either we accept them and get
> used to reading them without being surprised, or we can change a bit
> more than one at a time perhaps? I understand that this was an
> occurrence you just happen
On Thu, Oct 31, 2013 at 1:47 PM, Max Horn wrote:
>
> On 31.10.2013, at 20:41, Felipe Contreras wrote:
>
>> On Thu, Oct 31, 2013 at 1:29 PM, Max Horn wrote:
>>> Actually, I just noticed one thing that I *do* have a question about:
>>>
>>> On 31.10.2013, at 10:36, Felipe Contreras
>>> wrote:
>>>
I was recently confused by the yoda condition in this block of code from [1]
+ for (i = 0; i < revs.nr; i++)
+ if (&bases->item->object == &revs.commit[i]->object)
+ break; /* found */
+ if (revs.nr <= i)
I think I was particularly surprised because it came so soon after the
"i < revs.nr". I didn
On 31.10.2013, at 20:41, Felipe Contreras wrote:
> On Thu, Oct 31, 2013 at 1:29 PM, Max Horn wrote:
>> Actually, I just noticed one thing that I *do* have a question about:
>>
>> On 31.10.2013, at 10:36, Felipe Contreras wrote:
>>
>>> Signed-off-by: Felipe Contreras
>>> ---
>>> builtin/fast
Max Horn writes:
>> ... The "reality" is more like this:
>>
>> origin/master in your repository
>> |
>> v
>> A---B---C master at origin
>> /
>>D---E---F---G master in your repository
>>
>> if you really want to write origin/master somewhere in this
>> illustration.
>
On Thu, Oct 31, 2013 at 1:29 PM, Max Horn wrote:
> Actually, I just noticed one thing that I *do* have a question about:
>
> On 31.10.2013, at 10:36, Felipe Contreras wrote:
>
>> Signed-off-by: Felipe Contreras
>> ---
>> builtin/fast-export.c | 14 ++
>> t/t9350-fast-export.sh | 11 +
Eugene Sajine writes:
> One note: i tried the ${GIT_PREFIX:-.} and ${GIT_PREFIX} and it seems
> to give the same results. What is the expected difference here?
GIT_PREFIX may be an empty string when you run from the top-level,
in which case you would end up with "cd && ..." and end up working
i
Nicolas Vigier writes:
> The past participle of 'stick' is 'stuck'.
>
> Signed-off-by: Nicolas Vigier
> ---
Thanks.
It was good that we caught this before introducing the option; the
documentation update does not hurt the users much, but if we unleash
a misspelled option in a release, it is mu
On Thu, Oct 31, 2013 at 1:05 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> Otherwise we would have to include commit.h.
>
> Was there a reason why commit.h is not included here, just like
> revision.h would include diff.h, so that users of shortlog.h do not
> have to worry about inclu
On Thu, Oct 31, 2013 at 2:15 PM, David Aguilar wrote:
> On Thu, Oct 31, 2013 at 11:07:19AM -0700, Junio C Hamano wrote:
>> David Aguilar writes:
>>
>> > A-ha.. I think adding the chdir to alias is possible using a function.
>>
>> You do not have to use a function to do so, no?
>
> Right, of cours
Actually, I just noticed one thing that I *do* have a question about:
On 31.10.2013, at 10:36, Felipe Contreras wrote:
> Signed-off-by: Felipe Contreras
> ---
> builtin/fast-export.c | 14 ++
> t/t9350-fast-export.sh | 11 +++
> 2 files changed, 25 insertions(+)
>
> diff --g
On 31.10.2013, at 20:00, Junio C Hamano wrote:
> Felipe Contreras writes:
[...]
>
>>
>> If you want to be pedantic, this is the "reality":
>>
>>
>> D---E---F---G master
>>
>
> You are wrong again. The "reality" is more like this:
>
> origin/master i
Felipe Contreras writes:
> On Thu, Oct 31, 2013 at 12:21 PM, Junio C Hamano wrote:
>> Felipe Contreras writes:
>>
>>> Otherwise they cannot know when to force the push or not (other than
>>> hacks).
>>> ...
>>> diff --git a/transport-helper.c b/transport-helper.c
>>> index d05fc7c..ed238e5 1006
On Thu, Oct 31, 2013 at 12:10 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>> diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
>> index e08a028..7e75dc4 100644
>> --- a/Documentation/git-fetch.txt
>> +++ b/Documentation/git-fetch.txt
>> @@ -37,6 +37,9 @@ or from sev
Felipe Contreras writes:
> Otherwise we would have to include commit.h.
Was there a reason why commit.h is not included here, just like
revision.h would include diff.h, so that users of shortlog.h do not
have to worry about including commit.h themselves?
Note: not requesting the patch to be cha
Felipe Contreras writes:
> On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano wrote:
>> Felipe Contreras writes:
>
>>> --- a/Documentation/git-pull.txt
>>> +++ b/Documentation/git-pull.txt
>>> @@ -39,7 +39,7 @@ Assume the following history exists and the current
>>> branch is
>>> "`master`":
>>
On Thu, Oct 31, 2013 at 12:50 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> On Thu, Oct 31, 2013 at 12:32 PM, Junio C Hamano wrote:
>>> Felipe Contreras writes:
>>
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 0fe7647..33673e0 100755
--- a/t/t3200-branch.sh
On Thu, Oct 31, 2013 at 12:21 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> Otherwise they cannot know when to force the push or not (other than
>> hacks).
>> ...
>> diff --git a/transport-helper.c b/transport-helper.c
>> index d05fc7c..ed238e5 100644
>> --- a/transport-helper.c
>> ++
On 31.10.2013, at 19:10, Junio C Hamano wrote:
> Max Horn writes:
>
>> On 31.10.2013, at 10:36, Felipe Contreras
>> wrote:
>>
>>> Hi,
>>>
>>> Here are the patches that allow transport helpers to be completely
>> transparent;
>>> renaming branches, deleting them, custom refspecs, --force,
>>
On Thu, Oct 31, 2013 at 12:26 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> +test_expect_success 'use refspec' '
>> + git fast-export --refspec refs/heads/master:refs/heads/foobar master |
>> \
>> + grep "^commit " | sort | uniq > actual &&
>
> It feels somewhat redun
On 31.10.2013, at 10:36, Felipe Contreras wrote:
> Signed-off-by: Felipe Contreras
> ---
> Documentation/git-fast-import.txt | 3 +++
> fast-import.c | 13 ++---
> t/t9300-fast-import.sh| 18 ++
> 3 files changed, 31 insertions(+), 3 deletio
Felipe Contreras writes:
> On Thu, Oct 31, 2013 at 12:32 PM, Junio C Hamano wrote:
>> Felipe Contreras writes:
>
>>> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
>>> index 0fe7647..33673e0 100755
>>> --- a/t/t3200-branch.sh
>>> +++ b/t/t3200-branch.sh
>>> @@ -329,7 +329,7 @@ test_expect_s
On Thu, Oct 31, 2013 at 12:32 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
>> index 0fe7647..33673e0 100755
>> --- a/t/t3200-branch.sh
>> +++ b/t/t3200-branch.sh
>> @@ -329,7 +329,7 @@ test_expect_success 'tracking setup fails on
>>
On Thu, Oct 31, 2013 at 12:11 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>> --- a/Documentation/git-pull.txt
>> +++ b/Documentation/git-pull.txt
>> @@ -39,7 +39,7 @@ Assume the following history exists and the current branch
>> is
>> "`master`":
>>
>>
>> - A---B--
Junio C Hamano writes:
> Max Horn writes:
>
>> On 31.10.2013, at 10:36, Felipe Contreras
>> wrote:
>>
>>> Hi,
>>>
>>> Here are the patches that allow transport helpers to be completely
>> transparent;
>>> renaming branches, deleting them, custom refspecs, --force,
>> --dry-run,
>>> reporting f
Felipe Contreras writes:
> After every test the environment should be as close as to how it was
> before as possible.
Alternatively, each individual tests in a sequence of tests can
choose to set the test environment to its preferred state before
proceeding.
Starting from a pristine state (i.
On Thu, Oct 31, 2013 at 12:10 PM, Junio C Hamano wrote:
> Max Horn writes:
>> In other words: Would be really nice to see these applied!
>
> The series is sitting on the 'pu' branch, and I think there were
> some "fixup" suggestions during the review, so it may need to be
> rerolled before advan
Felipe Contreras writes:
> +test_expect_success 'use refspec' '
> + git fast-export --refspec refs/heads/master:refs/heads/foobar master | \
> + grep "^commit " | sort | uniq > actual &&
It feels somewhat redundant that you have to twice say that you are
pushing your "master", on
Felipe Contreras writes:
> Otherwise they cannot know when to force the push or not (other than
> hacks).
> ...
> diff --git a/transport-helper.c b/transport-helper.c
> index d05fc7c..ed238e5 100644
> --- a/transport-helper.c
> +++ b/transport-helper.c
> @@ -854,6 +854,11 @@ static int push_refs_
Felipe Contreras writes:
> Commit 9c51558 (transport-helper: trivial code shuffle) moved these
> lines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec')
> had a wrong merge conflict and readded them.
>
> Reported-by: Richard Hansen
> Signed-off-by: Felipe Contreras
> ---
Ahh,
On Thu, Oct 31, 2013 at 11:07:19AM -0700, Junio C Hamano wrote:
> David Aguilar writes:
>
> > A-ha.. I think adding the chdir to alias is possible using a function.
>
> You do not have to use a function to do so, no?
Right, of course.
So something like:
[alias]
example = "!cd ${GIT_PR
Felipe Contreras writes:
> 'origin/master' is very clear, no need to specify the 'remotes/' prefix,
> or babysit the user.
>
> Signed-off-by: Felipe Contreras
> ---
> Documentation/git-pull.txt | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/git-pull.t
Felipe Contreras writes:
> Otherwise we might not have 'struct diff_options'.
>
> Signed-off-by: Felipe Contreras
> ---
> revision.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/revision.h b/revision.h
> index e7f1d21..89132df 100644
> --- a/revision.h
> +++ b/revision.h
> @@ -5,6 +
Felipe Contreras writes:
> There's no mention of the 'origin' default, or the fact that the
> upstream tracking branch remote is used.
>
> Signed-off-by: Felipe Contreras
> ---
> Documentation/git-fetch.txt | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/Documentation/git-fetch.txt
Max Horn writes:
> On 31.10.2013, at 10:36, Felipe Contreras
> wrote:
>
>> Hi,
>>
>> Here are the patches that allow transport helpers to be completely
> transparent;
>> renaming branches, deleting them, custom refspecs, --force,
> --dry-run,
>> reporting forced update, everything works.
>
> I
Thanks for the pointers.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
David Aguilar writes:
> A-ha.. I think adding the chdir to alias is possible using a function.
You do not have to use a function to do so, no?
--
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://vg
Felipe Contreras writes:
> No functional changes.
>
> Signed-off-by: Felipe Contreras
> ---
> builtin/merge.c | 11 ++-
> 1 file changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/builtin/merge.c b/builtin/merge.c
> index 02a69c1..41fb66d 100644
> --- a/builtin/merge.c
> +++ b/bu
On 31.10.2013, at 10:25, Felipe Contreras wrote:
> Most of these have been sent before, but were not applied for one reason or
> another.
All of these look fine and sensible to me. Some of the latter patches in the
series might be a bit subjective (e.g. I personally don't mind "yoda"
conditio
On 31.10.2013, at 10:36, Felipe Contreras wrote:
> Hi,
>
> Here are the patches that allow transport helpers to be completely
> transparent;
> renaming branches, deleting them, custom refspecs, --force, --dry-run,
> reporting forced update, everything works.
I looked through this patch series
On Thu, Oct 31, 2013 at 11:36:59AM -0400, Eugene Sajine wrote:
> On Wed, Oct 30, 2013 at 11:54 PM, Junio C Hamano wrote:
> > Eugene Sajine writes:
> >
> >> That was my initial intention, because I would like to be able to pass
> >> parameters like to git log or git blame correctly without the exp
On Thu, Oct 31, 2013 at 01:15:39PM -0400, Jeff King wrote:
> On Thu, Oct 31, 2013 at 10:11:49AM -0700, Junio C Hamano wrote:
>
> > - Try to discard
> >
> >$ git am --abort
> >error: cache entry has null sha1: remote-curl.c
> >fatal: unable to write new index file
> >
> >This sh
Duy Nguyen writes:
> OK how about, if $GIT_DIR/hooks/something is a directory, then the
> directory must contain a file named "index", listing all the hooks of
> type "something". All the hooks in "index" will be executed in the
> listing order.
Hooks that take arbitrary amount of information fr
On Thu, Oct 31, 2013 at 10:11:49AM -0700, Junio C Hamano wrote:
> - Try to discard
>
>$ git am --abort
>error: cache entry has null sha1: remote-curl.c
>fatal: unable to write new index file
>
>This should not happen, no?
>
> "git reset --hard" will remove the funnies, but stil
This is totally unrelated to this thread, but I am seeing a strange
error from the "let's make sure we won't write null sha1" code we
added recently. This reproduces reliably for me, even in a freshly
cloned repository without previous rerere records:
- Check out v1.8.4.1
$ git checkout v1.8
On Thu, Oct 31, 2013 at 12:51:32PM +0100, Kacper Kornet wrote:
> The printf utility provided by coreutils when interpreting '\%o' format
> does not recognize %o as formatting directive. For example
> printf '\%o 0 returns \%o and warning: ignoring excess arguments,
> starting with ‘0’, which resul
On Wed, Oct 30, 2013 at 11:54 PM, Junio C Hamano wrote:
> Eugene Sajine writes:
>
>> That was my initial intention, because I would like to be able to pass
>> parameters like to git log or git blame correctly without the explicit
>> use of $1. Could you please advise about how to make it work wit
Sometimes it's desirable to see what changes were introduced by a
merge commit, rather than how conflicts were resolved. This adds
a checkbox which, when turned on, makes gitk show the equivalent
of "git show --first-parent " for merge commits.
Signed-off-by: Stefan Haller
---
This is the same pa
test-endianess.c adds test code for htonl(), ntohll()
and the recently introduced ntohll() and htonll()
The test is called in t0070
Signed-off-by: Torsten Bögershausen
---
.gitignore |1 +
Makefile |3 +++
t/t0070-fundamental.sh |3 +++
test-endianess.c
On 2013-10-30 22.07, Ramsay Jones wrote:
> On 30/10/13 20:30, Torsten Bögershausen wrote:
>> On 2013-10-30 20.06, Ramsay Jones wrote:
>>> On 30/10/13 17:14, Torsten Bögershausen wrote:
On 2013-10-30 18.01, Vicent Martí wrote:
> On Wed, Oct 30, 2013 at 5:51 PM, Torsten Bögershausen
>
The printf utility provided by coreutils when interpreting '\%o' format
does not recognize %o as formatting directive. For example
printf '\%o 0 returns \%o and warning: ignoring excess arguments,
starting with ‘0’, which results in failed tests in
t5309-pack-delta-cycles.sh. In most shells the tes
On Thu, Oct 31, 2013 at 3:07 AM, Jeff King wrote:
> I think there are two cases that we need to consider:
>
> 1. We have a full repo and somebody requests a shallow clone for us.
> We probably do not want to use bitmaps here. In the series we have
> been testing, shallow clones turned
The past participle of 'stick' is 'stuck'.
Signed-off-by: Nicolas Vigier
---
Documentation/gitcli.txt | 6 +++---
Documentation/technical/api-parse-options.txt | 6 +++---
diff.c| 2 +-
diff.h| 2
Add the --stuck-long option to output the options in their long form
if available, and with their arguments stuck.
Contrary to the default form (non stuck arguments and short options),
this can be parsed unambiguously when using options with optional
arguments :
- in the non stuck form, when an
Here is a patch to replace the word 'sticked' with 'stuck' in existing
documentation. And the patch for nv/parseopt-opt-arg changed to use the
word 'stuck' too.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo in
On Wed, Oct 30, 2013 at 6:55 PM, Andreas Schwab wrote:
> While not automatic, you can right click on the parent and select
> Diff this->selected.
And there's also the option to "mark" a commit, and diff this with
marked. Thanks, that's just what I needed (although as you say, it
isn't automatic).
Hi,
I've been running git with these patches applied locally for a long
time. Although I've sent them to the list before, they've been
overlooked.
Thanks.
Ramkumar Ramachandra (3):
for-each-ref: introduce %C(...) for color
for-each-ref: introduce %(HEAD) asterisk marker
for-each-ref: intro
Enhance 'git for-each-ref' with color formatting options. You can now
use the following format in for-each-ref:
%C(green)%(refname:short)%C(reset)
Signed-off-by: Ramkumar Ramachandra
---
Documentation/git-for-each-ref.txt | 4 +++-
builtin/for-each-ref.c | 23 +++
'git branch' shows which branch you are currently on with an '*', but
'git for-each-ref' misses this feature. So, extend its format with
%(HEAD) for the same effect.
Now you can use the following format in for-each-ref:
%C(red)%(HEAD)%C(reset) %(refname:short)
to display a red asterisk next t
Introduce %(upstream:track) to display "[ahead M, behind N]" and
%(upstream:trackshort) to display "=", ">", "<", or "<>"
appropriately (inspired by contrib/completion/git-prompt.sh).
Now you can use the following format in for-each-ref:
%C(green)%(refname:short)%C(reset)%(upstream:trackshort)
For remote-helpers that use 'export' to push.
Signed-off-by: Felipe Contreras
---
t/t5801-remote-helpers.sh | 8
transport-helper.c| 11 ++-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 45433
The remote helper namespace should not be updated.
Signed-off-by: Felipe Contreras
---
transport-helper.c | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index 985eeea..d05fc7c 100644
--- a/transport-helper.c
+++ b/transport-he
Commit 9c51558 (transport-helper: trivial code shuffle) moved these
lines above, but 99d9ec0 (Merge branch 'fc/transport-helper-no-refspec')
had a wrong merge conflict and readded them.
Reported-by: Richard Hansen
Signed-off-by: Felipe Contreras
---
transport-helper.c | 3 ---
1 file changed, 3
By using fast-export's new --refspec option.
Signed-off-by: Felipe Contreras
---
t/t5801-remote-helpers.sh | 2 +-
transport-helper.c| 13 ++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index c33cc25..4
So the remote-helpers can tell us when a forced push was needed.
Signed-off-by: Felipe Contreras
---
transport-helper.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/transport-helper.c b/transport-helper.c
index ed238e5..5aba15c 100644
--- a/transport-helper.c
+++ b/
Hi,
Here are the patches that allow transport helpers to be completely transparent;
renaming branches, deleting them, custom refspecs, --force, --dry-run,
reporting forced update, everything works.
Some of these were were sent before and rejected without a reason, but here
they are again in case
Otherwise they cannot know when to force the push or not (other than
hacks).
Tests-by: Richard Hansen
Documentation-by: Richard Hansen
Signed-off-by: Felipe Contreras
---
Documentation/gitremote-helpers.txt | 4
git-remote-testgit.sh | 16
t/t5801-remote-he
Signed-off-by: Felipe Contreras
---
builtin/fast-export.c | 14 ++
t/t9350-fast-export.sh | 11 +++
2 files changed, 25 insertions(+)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index b6f623e..8ed41b4 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-expor
Signed-off-by: Felipe Contreras
---
Documentation/git-fast-import.txt | 3 +++
fast-import.c | 13 ++---
t/t9300-fast-import.sh| 18 ++
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-fast-import.txt
b/Doc
We don't want to pass arguments specific to fast-export to
setup_revisions.
Signed-off-by: Felipe Contreras
---
builtin/fast-export.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 78250ea..eea5b8c 100644
--- a/builtin/fa
So that we can convert the exported ref names.
Signed-off-by: Felipe Contreras
---
Documentation/git-fast-export.txt | 4
builtin/fast-export.c | 30 ++
t/t9350-fast-export.sh| 7 +++
3 files changed, 41 insertions(+)
diff --git a/D
After every test the environment should be as close as to how it was
before as possible.
Signed-off-by: Felipe Contreras
---
t/t3200-branch.sh | 71 +++
1 file changed, 35 insertions(+), 36 deletions(-)
diff --git a/t/t3200-branch.sh b/t/t3200
1 - 100 of 118 matches
Mail list logo
