diff options
Diffstat (limited to 'doc/forum/gitpush_problem')
7 files changed, 110 insertions, 0 deletions
diff --git a/doc/forum/gitpush_problem/comment_1_ba6fb30ea2e2759776351408a3a69b44._comment b/doc/forum/gitpush_problem/comment_1_ba6fb30ea2e2759776351408a3a69b44._comment new file mode 100644 index 00000000..11d24d50 --- /dev/null +++ b/doc/forum/gitpush_problem/comment_1_ba6fb30ea2e2759776351408a3a69b44._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2015-07-30T15:00:57Z" + content=""" +About all I can tell from this is that "git fetch" is failing, and +apparently complaining about being passed a "gitpush" option. + +Since the only occurrance of "gitpush" is a internal flag that propellor +passes to itself, and not to git fetch, I don't know why your propellor +would be doing this. Perhaps if you turn on `PROPELLOR_DEBUG` you'll find +out more. +"""]] diff --git a/doc/forum/gitpush_problem/comment_2_342b7657b964e836840a78b85a09749b._comment b/doc/forum/gitpush_problem/comment_2_342b7657b964e836840a78b85a09749b._comment new file mode 100644 index 00000000..55bc85f6 --- /dev/null +++ b/doc/forum/gitpush_problem/comment_2_342b7657b964e836840a78b85a09749b._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 2""" + date="2015-07-30T15:29:46Z" + content=""" +Hmm, I do reproduce same problem spinning a remote host that's been +upgraded to this git version. +"""]] diff --git a/doc/forum/gitpush_problem/comment_3_419baa6f1738200b1368566a2e136d36._comment b/doc/forum/gitpush_problem/comment_3_419baa6f1738200b1368566a2e136d36._comment new file mode 100644 index 00000000..830ee7b0 --- /dev/null +++ b/doc/forum/gitpush_problem/comment_3_419baa6f1738200b1368566a2e136d36._comment @@ -0,0 +1,22 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2015-07-30T15:32:50Z" + content=""" +What's happening here is propellor is running: git pull --progress +--upload-pack command, where command is "./propellor --gitpush". + +Apparently git's --upload-pack option parsing has changed in a way that +breaks this. + +I think this is a straight-up git bug. I have reported the bug to the +git mailing list. + +May have to work around the bug by just passing "./propellor" to +--upload-pack, and using environment variables to tell it what to do. + +Erm.. AFAIKS, git pull is no longer running --upload-pack specified +command at all. So it seems git has completely defeated how propellor --spin +sends a git push over its ssh channel. I don't have any prospect of a fix +right now. +"""]] diff --git a/doc/forum/gitpush_problem/comment_4_3843d9b82431f175f9194159a73a1fc9._comment b/doc/forum/gitpush_problem/comment_4_3843d9b82431f175f9194159a73a1fc9._comment new file mode 100644 index 00000000..7e8bcdb2 --- /dev/null +++ b/doc/forum/gitpush_problem/comment_4_3843d9b82431f175f9194159a73a1fc9._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 4""" + date="2015-07-30T16:07:14Z" + content=""" +I have found a workaround -- Since git pull is broken, it can instead do a +git fetch followed by a git merge. I've put that fix in place. + +Unfortunately, --spin can't be used to deploy a fix that breaks the --spin +transport! So, hosts that are suffering from this problem will need to have +their propellor git repos updated in some other way, like pulling from a +central git repo. +"""]] diff --git a/doc/forum/gitpush_problem/comment_5_4075a141f6345267ade09f6c793dc2c8._comment b/doc/forum/gitpush_problem/comment_5_4075a141f6345267ade09f6c793dc2c8._comment new file mode 100644 index 00000000..b38bb004 --- /dev/null +++ b/doc/forum/gitpush_problem/comment_5_4075a141f6345267ade09f6c793dc2c8._comment @@ -0,0 +1,33 @@ +[[!comment format=mdwn + username="picca" + subject="try to use the fix" + date="2015-07-30T17:52:53Z" + content=""" +Hello I built the debian package of your git repository with debuild and installed it. + +then I run propellor in order to upgrade my local repo + +:~/.propellor$ propellor +** warning: ** Your /home/picca/.propellor is out of date.. + A newer upstream version is available in /usr/src/propellor/propellor.git + To merge it, find the most recent commit in your repository's history that corresponds to an upstream release of propellor, and set refs/remotes/upstream/master to it. Then run propellor again. + +So I followed the advices, found the most recent commit which was the one created when I run for the first time propellor cb7f1acc108609b345dbec26d8113513bf7b4ece + +But now when I run propellor,I get thir message + +:~/.propellor$ propellor +** warning: ** Your /home/picca/.propellor is out of date.. + A newer upstream version is available in /usr/src/propellor/propellor.git + To merge it, run: git merge upstream/master + + +But when I try the merge, + +~/.propellor$ git merge upstream/master +Already up-to-date. + + +so nothing happend + +"""]] diff --git a/doc/forum/gitpush_problem/comment_6_464257a98e09dfe17e515242ae819fab._comment b/doc/forum/gitpush_problem/comment_6_464257a98e09dfe17e515242ae819fab._comment new file mode 100644 index 00000000..2f3b4bc6 --- /dev/null +++ b/doc/forum/gitpush_problem/comment_6_464257a98e09dfe17e515242ae819fab._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 6""" + date="2015-08-06T16:14:04Z" + content=""" +Hmm, not sure that's going on there, perhaps you've found a way to break +the propellor debian package, which has not been much used AFAIK. + +Seems to me it would be easier to pull the fix into your propellor +repository from eg, propellor's public git repository. +"""]] diff --git a/doc/forum/gitpush_problem/comment_7_1cfed50e43cc4ec816999f4f1de79762._comment b/doc/forum/gitpush_problem/comment_7_1cfed50e43cc4ec816999f4f1de79762._comment new file mode 100644 index 00000000..0fb091e5 --- /dev/null +++ b/doc/forum/gitpush_problem/comment_7_1cfed50e43cc4ec816999f4f1de79762._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="picca" + subject="comment 7" + date="2015-08-19T07:40:38Z" + content=""" +Yes you are right I generated the Debian package but not from a tagged version. +Now that I created the 2.7.1 version from the tag, it works. + +thanks +"""]] |