[PATCH] git-p4: fix problem when p4 login is not necessary

In a perforce setup where login is not required, communication fails because p4_check_access does not understand the response from the p4 client. Fixed by detecting and ignoring the "info" response. Signed-off-by: Peter Osterlund --- git-p4.py | 2 ++ 1 file changed, 2 insertion

"git p4" fails when perforce login not needed

7;login' not nece| 0040 73 73 61 72 79 2c 20 6e 6f 20 70 61 73 73 77 6f |ssary, no passwo| 0050 72 64 20 73 65 74 20 66 6f 72 20 74 68 69 73 20 |rd set for this | 0060 75 73 65 72 2e 30 |user.0| 0066 Best regards, -- Peter Osterlund - peterosterlu...@gmail.com http://hem.bredband.net/petero2b

Re: Fix interesting git-rev-list corner case

ct the > newest one of the bunch), but I haven't really thought it through very > much. > > I bet there is a smarter way to do this, but this _should_ fix the problem > Peter sees. Peter? Yes, it does fix the problem. Thanks. -- Peter Osterlund - [EMAIL PROTECTED] http://web.tel

Re: Fix interesting git-rev-list corner case

On Sat, 30 Jul 2005, Linus Torvalds wrote: > On Sat, 30 Jul 2005, Peter Osterlund wrote: > > > > OK, but note that I didn't do any editing of any local files myself. > > Both commit ids are from your public linux kernel git tree. What I did > > was equi

Re: Fix interesting git-rev-list corner case

Linus Torvalds <[EMAIL PROTECTED]> writes: > On Sat, 30 Jul 2005, Peter Osterlund wrote: > > > > I have problems pulling linux kernel changes from > > 33ac02aa4cef417871e128ab4a6565e751e5f3b2 to > > b0825488a642cadcf39709961dde61440cb0731c into my local tree.

Re: Fix interesting git-rev-list corner case

RROR: Merge conflict in kernel/sys.c. Removing net/ipv4/utils.c Removing sound/pcmcia/vx/vx_entry.c Removing sound/pcmcia/vx/vxp440.c fatal: merge program failed Automatic merge failed, fix up by hand -- Peter Osterlund - [EMAIL PROTECTED] http://web.telia.com/~u89404340 - To unsubscribe from t

[PATCH] stgit: Handle 'A' flag for new files

Hi, Patches that add new files don't work correctly if git reports them with the 'A' flag. StGIT claims there are unresolved conflicts. This patch fixes it. Signed-off-by: Peter Osterlund <[EMAIL PROTECTED]> diff --git a/stgit/git.py b/stgit/git.py --- a/stgit/git.

Re: Stacked GIT 0.3 (now more Quilt-like)

Junio C Hamano <[EMAIL PROTECTED]> writes: > >>>>> "PO" == Peter Osterlund <[EMAIL PROTECTED]> writes: > > PO> I think it would be good if it was possible to include diffstat output > PO> in exported patches, something like this: > >

Re: Stacked GIT 0.3 (now more Quilt-like)

d patches. Signed-off-by: Peter Osterlund <[EMAIL PROTECTED]> --- b/stgit/git.py | 22 ++ b/stgit/main.py |2 ++ 2 files changed, 24 insertions(+) diff --git a/stgit/git.py b/stgit/git.py --- a/stgit/git.py +++ b/stgit/git.py @@ -345,6 +345,28 @@ def diff(files = [

Re: Stacked GIT 0.3 (now more Quilt-like)

Catalin Marinas <[EMAIL PROTECTED]> writes: > On Mon, 2005-07-04 at 14:32 +0200, Peter Osterlund wrote: > > I agree with the other comments, it's probably not wise to rely on > > wiggle, and wiggle sometimes makes a mess. However, it often does the > > right thin

Re: Stacked GIT 0.3 (now more Quilt-like)

Catalin Marinas <[EMAIL PROTECTED]> writes: > On Sun, 2005-07-03 at 14:38 +0200, Peter Osterlund wrote: > > Catalin Marinas <[EMAIL PROTECTED]> writes: > > > I know that using -A gives a more detailed output in case of a conflict. > > > The problem is t