[PATCH 0/3] Update to stgit parent tracking · Yann Dirson <hidden> · 2016-06-15
[PATCH 1/3] The user does not want to mess with the refspecs. · Yann Dirson <hidden> · 2016-06-15
[PATCH 3/3] Do not return 'origin' as parent remote when there is no such remote. · Yann Dirson <hidden> · 2016-06-15
[PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull". · Yann Dirson <hidden> · 2016-06-15
Re: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull". · Catalin Marinas <hidden> · 2016-06-15
Re: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull". · Yann Dirson <hidden> · 2016-06-15
Re: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull". · Yann Dirson <hidden> · 2016-06-15
Re: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull". · Catalin Marinas <hidden> · 2016-06-15
Re: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull". · Catalin Marinas <hidden> · 2016-06-15
Re: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull". · Yann Dirson <hidden> · 2016-06-15
git-clone wrongly setting branch.*.merge ? (Was: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".) · Yann Dirson <hidden> · 2016-06-15
Re: git-clone wrongly setting branch.*.merge ? (Was: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".) · Yann Dirson <hidden> · 2016-06-15
Re: git-clone wrongly setting branch.*.merge ? (Was: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".) · Jakub Narebski <hidden> · 2016-06-15
Re: git-clone wrongly setting branch.*.merge ? (Was: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".) · Catalin Marinas <hidden> · 2016-06-15
Re: git-clone wrongly setting branch.*.merge ? (Was: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".) · Yann Dirson <hidden> · 2016-06-15

Re: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".

From: Yann Dirson <hidden>
Date: 2016-06-15 22:42:52

On Fri, Feb 02, 2007 at 07:07:06PM +0100, Yann Dirson wrote:

quoted

The t1200-push-modified.sh test fails after applying this patch. It
looks like the 3rd test fails to pull the changes from 'foo' into
'bar'.

Strange, it passes here, even after pulling you latest commits
(HEAD=fba895f5f12a652c248b0fd02b7c41f8342cfbdc).

Wondering which GIT version you are using, I tried to run the
testsuite with current GIT HEAD, and it fails much earlier (t1001).
We'll have some work here :)

Best regards,
-- 
Yann.

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help