From: Martin von Zweigbergk martin.von.zweigbe...@gmail.com
When 'git log' is passed the --no-walk option, no revision walk takes
place, naturally. Perhaps somewhat surprisingly, however, the provided
revisions still get sorted by commit date. So e.g 'git log --no-walk
HEAD HEAD~1' and 'git log
From: Martin von Zweigbergk martin.von.zweigbe...@gmail.com
'git cherry-pick' internally sets the --reverse option while walking
revisions, so that 'git cherry-pick branch@{u}..branch' will apply the
revisions starting at the oldest one. If no uninteresing revisions are
given, --no-walk is
From: Martin von Zweigbergk martin.von.zweigbe...@gmail.com
'git cherry-pick A B' implicitly sends --no-walk=sorted to the
revision walker, which means that the older of A and B will be applied
first, which is most likely surprising to most. Fix this by instead
sending --no-walk=unsorted to the
From: Martin von Zweigbergk martin.von.zweigbe...@gmail.com
When 'git cherry-pick' and 'git revert' are used with ranges such as
'git cherry-pick A..B', the order of the commits to pick are
determined by the default date-based sorting. If a commit has a commit
date before the commit date of its
From: Martin von Zweigbergk martin.von.zweigbe...@gmail.com
This series adds supports for 'git log --no-walk=unsorted', which
should be useful for the re-roll of my mz/rebase-range series. It also
addresses the bug in cherry-pick/revert, which makes it sort revisions
by date.
On Fri, Aug 10,
On Sun, Aug 12, 2012 at 11:23:16PM -0400, Christopher Marshall wrote:
I would like to use git svn to clone an svn repo with a non-standard
branches layout roughly like this:
trunk/
tags/
branches/
b1
b2
...
bdir/
b3
b4
...
That is, every directory under
Steven Walter stevenrwal...@gmail.com wrote:
Consider the case where you have trunk, branchA of trunk, and branchB of
branchA. trunk is merged back into branchB, and then branchB is
reintegrated into trunk. The merge of branchB into trunk will have
svn:mergeinfo property references to both
y...@google.com writes:
[Administrivia: I somehow doubt y...@google.com would reach you, and
futzed with the To: line above]
From: Martin von Zweigbergk martin.von.zweigbe...@gmail.com
This series adds supports for 'git log --no-walk=unsorted', which
should be useful for the re-roll of my
Junio C Hamano gits...@pobox.com writes:
Would anything break if we take your patch, but without two
possibilities to revs-no_walk option (i.e. we never sort under
no_walk)?
By the way, by would anything break, I do not just mean if our
existing tests trigger failures from
Nguyen Thai Ngoc Duy pclo...@gmail.com writes:
On Mon, Aug 13, 2012 at 2:49 AM, Junio C Hamano gits...@pobox.com wrote:
For example, the reachability bitmap would want to say something
like Traversing from commit A, these objects in this pack are
reachable. The bitmap for one commit A would
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
You can find the changes described here in the integration branches of the
repositories listed at
I have a billion testsuite golden output files that have changed due
to an explicit ordering of objects I've imposed on output. A helper
script I wrote to help parse the diffs (to ignore order-only
differences) noticed that one hunk had a different number of additions
and deletions. I'm manually
Hello,
I am interested to connect to a GIT SCM through OSLC.
I would prefer to use Java as a technology. I have come across an Eclipse
proposal called Lyo, kindly let me know if this can fulfill my requirement,
and if Yes -- How?
Kindly do let know on any similar approaches.
regds
Rahul
--
I had a similar problem, but I solved it using ignore-paths and
ignore-refs.
If I remember correctly, you need to set both to ignore bdir directly without
ignoring b3, b4,...
For ignore-refs, pls see cdb51a13c3cf4830d499d1138160eacdd2b8aa46, as it is
currently
undocumented.
So I would
On Mon, Aug 13, 2012 at 09:29:53AM -0400, Christopher Marshall wrote:
I had a similar problem, but I solved it using ignore-paths and
ignore-refs.
If I remember correctly, you need to set both to ignore bdir directly
without
ignoring b3, b4,...
For ignore-refs, pls see
On 12-08-10 04:09 PM, Junio C Hamano wrote:
Felix Natter fnat...@gmx.net writes:
I have a few questions about this:
As I am coming from large depth is harmful school, I would
recommend
- git repack -a -d -f with large --window with reasonably short
--depth once,
So something like
Bernd Jendrissek bernd.jendris...@gmail.com writes:
$ /usr/local/git/bin/git diff-files -p --color -- TwoStageAmp-output.net
diff --git a/gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net
b/gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net
index a5ee1e7..a9f3620 100644
Bernd Jendrissek bernd.jendris...@gmail.com writes:
$ /usr/local/git/bin/git diff-files -p --color -- TwoStageAmp-output.net
diff --git a/gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net
b/gnetlist/tests/common/outputs/osmond/TwoStageAmp-output.net
index a5ee1e7..a9f3620 100644
$
On Mon, Aug 13, 2012 at 5:02 PM, Thomas Rast tr...@student.ethz.ch wrote:
Can you share this repository?
This weird behaviour doesn't even survive making a copy (cp -a) of the
whole repository, so I very much doubt making it available would be
illuminative. My disk's SMART data seems okay. The
On Mon, Aug 13, 2012 at 12:17 AM, Junio C Hamano gits...@pobox.com wrote:
y...@google.com writes:
[Administrivia: I somehow doubt y...@google.com would reach you, and
futzed with the To: line above]
:-( Sorry, sendemail.from now set. (I apparently answered y instead
of just enter to accept
Martin von Zweigbergk martin.von.zweigbe...@gmail.com writes:
I also thought the sorting was just a bug. From what I understand by
looking how the code has evolved, the sorting in the no-walk case was
not intentional, but more of a consequence of the implementation. That
patch you suggested
Heiko Voigt hvo...@hvoigt.net writes:
How about I update CodingGuidelines according to the rules you
suggested? Then other people know how we prefer bash functions and if
statements to look like.
OK. I was hoping that imitate surrounding code was sufficient,
but it seems many parts of the
Marc Branchaud mbranch...@xiplink.com writes:
On 12-08-10 04:09 PM, Junio C Hamano wrote:
Felix Natter fnat...@gmx.net writes:
I have a few questions about this:
As I am coming from large depth is harmful school, I would
recommend
- git repack -a -d -f with large --window with
[svn-remote svn]
url = file:///home/chris/programs/svn/repo
fetch = trunk:refs/remotes/svn/trunk
branches = branches/*:refs/remotes/svn/*
tags = tags/*:refs/remotes/svn/tags/*
branches = branches/bdir/*:refs/remotes/svn/bdir2/*
ignore-paths =
Heiko Voigt hvo...@hvoigt.net writes:
Since the code for cygwin and windows in general is almost the same I would
extract one function for them where I leave in one ifdef for cygwin.
E.g. like this:
static int is_executable(const char *name)
{
struct stat st;
I think the message
no changes added to commit (use git add and/or git commit -a)
is not clear enough since it lacks on the git rm command which
is shown above.
# (use git add/rm file... to update what will be committed)
Of course, applying this topic would solve this problem.
Alternatively
On Mon, Aug 13, 2012 at 10:05 AM, Junio C Hamano gits...@pobox.com wrote:
Martin von Zweigbergk martin.von.zweigbe...@gmail.com writes:
... so is a migration desired? Or just
change the default for --no-walk from sorted to unsorted in git
2.0?
I think the proper support for Johannes's case
Junio C Hamano gits...@pobox.com writes:
I forgot to mention it, but the above was done also to make it
possible but not mandatory to pay extra allocation penalty. The
caller can choose to parse the string into an int, for example,
without extra allocation. Only the ones that want a string
Fetch-pack's verbose mode is more of a debugging mode (and in fact
takes two -v arguments to trigger via the porcelain layer). Let's
mention the server version as another possible item of interest.
Signed-off-by: Jeff King p...@peff.net
Signed-off-by: Junio C Hamano gits...@pobox.com
---
* And
Junio C Hamano gits...@pobox.com writes:
Fetch-pack's verbose mode is more of a debugging mode (and in fact
takes two -v arguments to trigger via the porcelain layer). Let's
mention the server version as another possible item of interest.
Signed-off-by: Jeff King p...@peff.net
On Mon, Aug 13, 2012 at 8:12 AM, rahul.chandrashekar
rahul.chandrashe...@in.bosch.com wrote:
I am interested to connect to a GIT SCM through OSLC.
It seems to me a very strange request. There is a very well
implemented, fit-for-purpose git protocol. OSLC, after some
googling, is a REST-style
Hi all,
A colleague of mine (after a relatively long absence) noticed the
following when running git status:
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 250 and 19 different commit(s) each, respectively.
#
nothing to commit (working directory clean)
He asked
y...@google.com writes:
From: Martin von Zweigbergk martin.von.zweigbe...@gmail.com
When 'git cherry-pick' and 'git revert' are used with ranges such as
'git cherry-pick A..B', the order of the commits to pick are
determined by the default date-based sorting. If a commit has a commit
date
On Mon, Aug 13, 2012 at 1:05 PM, Junio C Hamano gits...@pobox.com wrote:
y...@google.com writes:
From: Martin von Zweigbergk martin.von.zweigbe...@gmail.com
'git cherry-pick' internally sets the --reverse option while walking
revisions, so that 'git cherry-pick branch@{u}..branch' will apply
On Mon, Aug 13, 2012 at 12:07:35PM -0700, Junio C Hamano wrote:
* And this is your 4 adjusted for the previous one, releaving the
caller from having to figure out where the capability string
ends.
[...]
@@ -829,8 +831,15 @@ static struct ref *do_fetch_pack(int fd[2],
Martin von Zweigbergk martin.von.zweigbe...@gmail.com writes:
To connect to the other mail I sent on this thread (in parallel with
yours), do you think git cherrry-pick HEAD HEAD~1 should apply the
commits in the same order as git cherry-pick HEAD~2..HEAD (which
would give the same result if
Jeff King p...@peff.net writes:
Of course, a server can also say agent=git/none-of-your-business; this
is just a syntactic question.
You do not even have to advertise it in the first place, no?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
On Mon, Aug 13, 2012 at 02:07:22PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
Of course, a server can also say agent=git/none-of-your-business; this
is just a syntactic question.
You do not even have to advertise it in the first place, no?
If you want the client to
Jeff King p...@peff.net writes:
On Mon, Aug 13, 2012 at 12:07:35PM -0700, Junio C Hamano wrote:
* And this is your 4 adjusted for the previous one, releaving the
caller from having to figure out where the capability string
ends.
[...]
@@ -829,8 +831,15 @@ static struct ref
On Mon, Aug 13, 2012 at 02:09:32PM -0700, Junio C Hamano wrote:
+ if ((agent_feature = server_feature(agent, agent_len)) != NULL
+ 5 agent_len agent_feature[5] == '=') {
agent_supported = 1;
+ if (args.verbose) {
+ fprintf(stderr, Server
Junio C Hamano gits...@pobox.com writes:
y...@google.com writes:
From: Martin von Zweigbergk martin.von.zweigbe...@gmail.com
When 'git cherry-pick' and 'git revert' are used with ranges such as
'git cherry-pick A..B', the order of the commits to pick are
determined by the default
We said --date-order still does not violate the topology, but it
was still not clear enough.
Reword the description for both --date-order and --topo-order,
and add an illustration to it.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
* Let's do this before I forget...; came up in
On Mon, Aug 13, 2012 at 3:21 PM, Junio C Hamano gits...@pobox.com wrote:
* Let's do this before I forget...; came up in discussion $gmane/203370
Thanks! That definitely confused me (and I suppose I stupidly didn't
test with a proper range).
Documentation/rev-list-options.txt | 29
Martin von Zweigbergk martin.von.zweigbe...@gmail.com writes:
diff --git a/Documentation/rev-list-options.txt
b/Documentation/rev-list-options.txt
index 6a4b635..dc501ee 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -579,15 +579,32 @@ Commit
Can we throw up a big warning or just outright fail if someone types
'n' or 'y' and hits enter for the in-reply-to question in
git-send-email? I saw a git-send-email sent patch with an In-Reply-To
header containing n on lkml today and it makes threading in my mail
client get confused.
Stephen Boyd bebar...@gmail.com writes:
Can we throw up a big warning or just outright fail if someone types
'n' or 'y' and hits enter for the in-reply-to question in
git-send-email? I saw a git-send-email sent patch with an In-Reply-To
header containing n on lkml today and it makes threading
Let me start by echoing Junio's remark... lacks sufficient
justification. You don't give enough evidence to support even why it
is worth looking at this commit, let alone why it should be included
and cause a format change in the idx file format.
At some point you start to hand-wave about how it
On Tue, Aug 14, 2012 at 7:46 AM, Shawn Pearce spea...@spearce.org wrote:
Colby is nearly done prototyping the bitmap reachability
implementation in JGit and will release the code under the BSD license
there soon. I can't promise when yet because Colby will soon be
heading out for some (much
On Mon, Aug 13, 2012 at 05:11:10PM -0400, Jeff King wrote:
On Mon, Aug 13, 2012 at 02:09:32PM -0700, Junio C Hamano wrote:
+if ((agent_feature = server_feature(agent, agent_len)) !=
NULL
+5 agent_len agent_feature[5] == '=') {
On Mon, Aug 13, 2012 at 09:59:27PM -0400, Jeff King wrote:
So if we want to avoid the allocation, then this is how I would do it:
by returning the feature's _value_ and not the whole key. Since we know
that the beginning part must obviously match what we fed it anyway, it
is not that
Hi Martin,
Thanks for the feedback, do you have any Links using which I can get the below
scenario, as a matter of fact I am new to the below protocol and am taking baby
steps for the same.
Mit freundlichen Grüßen / Best Regards,
Rahul Chandrashekar
Robert Bosch Engineering and Business
Jeff King p...@peff.net writes:
+ if ((agent_feature = server_feature_value(agent, agent_len))) {
agent_supported = 1;
+ if (args.verbose agent_len) {
+ fprintf(stderr, Server version is %.*s\n,
+ agent_len,
On Mon, Aug 13, 2012 at 4:05 PM, Junio C Hamano gits...@pobox.com wrote:
Martin von Zweigbergk martin.von.zweigbe...@gmail.com writes:
diff --git a/Documentation/rev-list-options.txt
b/Documentation/rev-list-options.txt
index 6a4b635..dc501ee 100644
--- a/Documentation/rev-list-options.txt
53 matches
Mail list logo
