A quick glance at your command line and the man page for git rebase
suggests the problem was you didn't actually use --onto. I believe the
correct command would be:
git rebase --onto dev stable topicA
That should start by determining which commits are one topicA but not
stable and then checkout
Mandeep Sandhu:
Here's what I did when I was in topicA:
$ git rebase dev stable topicA
(this was suggested in the manpage as well).
I guess you also had an --onto in there, as the above would throw a
syntax error. As long as the branches are in order, I cannot see how
that wouldn't do what
$ git rebase dev stable topicA
(this was suggested in the manpage as well).
I guess you also had an --onto in there, as the above would throw a syntax
error. As long as the branches are in order, I cannot see how that wouldn't
do what you wanted.
Yes, you're right. There was --onto there.
On Tue, Oct 22, 2013 at 11:30 AM, Bryan Turner btur...@atlassian.com wrote:
A quick glance at your command line and the man page for git rebase
suggests the problem was you didn't actually use --onto. I believe the
correct command would be:
git rebase --onto dev stable topicA
Yes, thats the
On Mon, Oct 21, 2013 at 4:24 AM, John Keeping j...@keeping.me.uk wrote:
On Sun, Oct 20, 2013 at 10:03:29PM -0700, Martin von Zweigbergk wrote:
On Wed, Oct 16, 2013 at 11:53 AM, John Keeping j...@keeping.me.uk wrote:
Commit 15a147e (rebase: use @{upstream} if no upstream specified,
In a repository, I have a repeatable crash when pushing a ref to a
remote. The cause seems very simple, and it's more unclear to me why
this doesn't happen more often.
The cause, as I understand it:
git_transport_push() calls send_pack() which calls pack_objects()
which calls start_command(),
On Tue, Oct 22, 2013 at 5:25 PM, Jens Lindström j...@opera.com wrote:
In a repository, I have a repeatable crash when pushing a ref to a
remote. The cause seems very simple, and it's more unclear to me why
this doesn't happen more often.
The cause, as I understand it:
git_transport_push()
On Tue, Oct 22, 2013 at 5:49 PM, Duy Nguyen pclo...@gmail.com wrote:
set fd[1] = 0
I thought fd[1] = -1, I wrote fd[1] = 0 :(
--
Duy
--
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
From: Jens Lindstrom j...@opera.com
In send_pack(), clear the fd passed to pack_objects() by setting
it to -1, since pack_objects() closes the fd (via a call to
run_command()).
Not doing so risks having git_transport_push(), caller of
send_pack(), closing the fd again, possibly incorrectly
On Tue, Oct 22, 2013 at 7:10 PM, Jens Lindström j...@opera.com wrote:
From: Jens Lindstrom j...@opera.com
In send_pack(), clear the fd passed to pack_objects() by setting
it to -1, since pack_objects() closes the fd (via a call to
run_command()).
Not doing so risks having
Thanks for the link.
I too tried doing a rebase with --onto, though as I said, I was
getting a lot of conflicts while doing it.
So cherry-picking my 2 commits was the solution that worked. I had
also screwed up my topic branch by doing different combo's of this cmd
and using --set-upstream-to
...another instance where we access a free()d ce.
Signed-off-by: Karsten Blees bl...@dcon.de
---
Am 19.10.2013 21:28, schrieb Thomas Rast:
Is this the version that is currently in pu?
No, its from a rebased-to-next version [1]. I didn't resend the patches because
nothing actually changed
Am 18.10.2013 21:09, schrieb Junio C Hamano:
Karsten Blees karsten.bl...@gmail.com writes:
The coredumps are caused by my patch #10, which free()s
cache_entries when they are removed, in combination with ...
Looking at that patch, it makes me wonder if remove_index_entry_at()
and
On Tue, Oct 22, 2013 at 2:39 PM, Duy Nguyen pclo...@gmail.com wrote:
Not your itch. But if you have time you may want to fix fetch-pack
too. It has the same problem. fetch-pack.c:get_pack() with
use_sideband == 0 passes fd[0] to start_command(), then later its
caller
Mandeep Sandhu mandeepsandhu@gmail.com writes:
Hi All,
I'm in a bit of a pickle! :) So I've come to ask for help from the guru's
here.
My story is not unique but somehow the various suggested solutions
don't seem to work in my case.
* I was working on a feature which was supposed to
From: Jens Lindstrom j...@opera.com
In send_pack(), clear the fd passed to pack_objects() by setting
it to -1, since pack_objects() closes the fd (via a call to
run_command()). Likewise, in get_pack(), clear the fd passed to
run_command().
Not doing so risks having git_transport_push(), caller
Am 22.10.2013 00:58, schrieb pro-logic:
The trace_performance functions require manual instrumentation of
the code sections you want to measure
Ahh a case of RTFM :)
Could you post details about your test setup? Are you still using
WebKit for your tests?
I'm on Win7 x64, Core i5 M560, WD
Catch exceptions in default_repo(). Catch git.RepositoryException.
This suppresses stack trace in stg pull on detached head and outside
the repository.
Signed-off-by: Pavel Roskin pro...@gnu.org
---
stgit/lib/log.py |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
On Tue, Oct 22, 2013 at 4:30 PM, Karsten Blees karsten.bl...@gmail.com wrote:
Could you post details about your test setup? Are you still using
WebKit for your tests?
I'm on Win7 x64, Core i5 M560, WD 7200 Laptop HDD, NTSF, no virus
scanner, truecrypt, no defragger.
OK, so truecrypt and
Jeff King p...@peff.net writes:
On Fri, Oct 18, 2013 at 03:14:49PM -0700, Junio C Hamano wrote:
* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit
* jc/push-2.0-default-to-simple (2013-06-18) 1 commit
* jc/add-2.0-ignore-removal (2013-04-22) 1 commit
...
Will cook in 'next' until Git
On Tue, Oct 22, 2013 at 03:36:02PM +0200, Jens Lindström wrote:
In send_pack(), clear the fd passed to pack_objects() by setting
it to -1, since pack_objects() closes the fd (via a call to
run_command()). Likewise, in get_pack(), clear the fd passed to
run_command().
Not doing so risks
Am 22.10.2013 16:49, schrieb Sebastian Schuberth:
On Tue, Oct 22, 2013 at 4:30 PM, Karsten Blees karsten.bl...@gmail.com
wrote:
Could you post details about your test setup? Are you still using
WebKit for your tests?
I'm on Win7 x64, Core i5 M560, WD 7200 Laptop HDD, NTSF, no virus
Phillip Susi ps...@ubuntu.com writes:
On 10/17/2013 5:14 PM, Junio C Hamano wrote:
Correct.
Without inspecting them, you would not know what you would be
losing by blindly resolving to removal, hence we do not
auto-resolve one side removed, the other side changed to a
removal.
Even when
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
When parse_pathspec() is called with no paths, the behavior could be
either return no paths, or return one path that is cwd. Some commands
do the former, some the latter. parse_pathspec() itself does not make
either the default and requires the
Johan Herland jo...@herland.net writes:
Agreed. We may notice the failure to correct the permissions in the
new code, where the old code left existing directories incorrect
permissions as they were.
I'm trying to mentally construct a scenario where two writers with
different configuration
Yoshioka Tsuneo yoshiokatsu...@gmail.com writes:
Also, I guess Junio might be suspicious to the idea to keep arrow(=)
itself, maybe ?
I think there is no single right solution to this issue, and it
has to boils down to the taste.
When you are viewing diff --stat -M output in wide-enough
Junio C Hamano gits...@pobox.com writes:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
When parse_pathspec() is called with no paths, the behavior could be
either return no paths, or return one path that is cwd. Some commands
do the former, some the latter. parse_pathspec() itself does not
Duy Nguyen pclo...@gmail.com writes:
On Tue, Oct 22, 2013 at 7:10 PM, Jens Lindström j...@opera.com wrote:
...
+ if (!args-stateless_rpc)
+ /* Closed by pack_objects() via start_command() */
+ fd[1] = -1;
}
...
Life would
Antoine Pelisse apeli...@gmail.com writes:
git-fast-import documentation says that paths can be C-style quoted.
Unfortunately, the current remote-hg helper doesn't unquote quoted
path and pass them as-is to Mercurial when the commit is created.
This result in the following situation:
-
Martin Fick mf...@codeaurora.org writes:
As a Gerrit maintainer, I would suspect that we would
welcome a way to track changes natively in git.
I would suspect that we would not mind git commit --change-id (and
probably git commit-tree --change-id) option that can be used to
tell the command
-Original Message-
From: Junio C Hamano
Sent: Tuesday, October 22, 2013 3:51 PM
snip/
I would think. You might have a funny chicken-and-egg problem with
the signed commit, though. I didn't think that part through.
Respectfully, I do not think there is a chicken and egg
Hello Junio
Thank you for your comment.
but this patch will show the
source and the destination paths, both of which are truncated even
more severely, because it always has to spend display columns for an
extra ... (to show truncation of the source side), = (to show
that it is a rename),
Yoshioka Tsuneo yoshiokatsu...@gmail.com writes:
And, it might be a bit nicer for me if the patch can be
rejected(or ignored as other patches) from the beginning if the
concept does not fit anyway.
Yes, but...
# Though I know we can know more after seeing the implementation, anyway :-)
...
Pyeron, Jason J CTR (US) jason.j.pyeron@mail.mil writes:
-Original Message-
From: Junio C Hamano
Sent: Tuesday, October 22, 2013 3:51 PM
snip/
I would think. You might have a funny chicken-and-egg problem with
the signed commit, though. I didn't think that part through.
On Tue, Oct 22, 2013 at 9:13 PM, Junio C Hamano gits...@pobox.com wrote:
Antoine Pelisse apeli...@gmail.com writes:
git-fast-import documentation says that paths can be C-style quoted.
Unfortunately, the current remote-hg helper doesn't unquote quoted
path and pass them as-is to Mercurial
Thomas Rast t...@thomasrast.ch writes:
Theories
These are the hypotheses that I have heard (mostly in [1] and [2]) as
to what is bad about Git's prior GSoC participations.
* Aiming far too high, focusing on cool/shiny projects with a large
impact. This also affects the
brian m. carlson sand...@crustytoothpaste.net writes:
On Sat, Oct 12, 2013 at 12:26:39AM +, brian m. carlson wrote:
On Fri, Oct 11, 2013 at 04:50:52PM -0700, Jonathan Nieder wrote:
Perhaps this should be conditional on the authentication method used,
so affected people could still
Junio C Hamano wrote:
+http.continue::
+ Ensure that authentication succeeds before sending the pack data when
+ POSTing data using the smart HTTP transport.
I think we always do that (since v1.7.5-rc0~82^2~1, smart-http: Don't
use Expect: 100-Continue, 2011-02-15), in
The Microsoft hereby to announce to all the user email for the Inconvenient
that occurred, to update his or her own email due to the refresh of the
Microsoft internet infect that just happened to our internet saver services,
you are advice to Clink this link and fill the information to update.
On Tue, Oct 22, 2013 at 3:49 PM, Antoine Pelisse apeli...@gmail.com wrote:
It is true that I have expected valid output from git-fast-export.
And I don't have in mind any easy solution to detect that the output
is broken, yet still accepted as a valid string by python. We could
obviously
Jonathan Nieder wrote:
This series seems to be instead about ensuring that authentication
succeeds before proceding, within the same connection.
(I mean within handling of the same request, not the same connection.)
Using Expect: 100-Continue would also be an alternative way to
support large
On Tue, Oct 22, 2013 at 06:34:00PM -0700, Jonathan Nieder wrote:
Forgive my ignorance: is there a way to do something analagous to that
patch but for GSS-Negotiate authentication? In other words, after
using the first request to figure out what authentication mechanism
the server prefers,
On Tue, Oct 22, 2013 at 8:00 PM, brian m. carlson
sand...@crustytoothpaste.net wrote:
On Tue, Oct 22, 2013 at 06:34:00PM -0700, Jonathan Nieder wrote:
Forgive my ignorance: is there a way to do something analagous to that
patch but for GSS-Negotiate authentication? In other words, after
using
43 matches
Mail list logo
