mainSavannah Administration - Support: sr #109326, How do I add further commits to...

 
 

sr #109326: How do I add further commits to texinfo git repository

Submitter:  Gavin D. Smith <gavin>
Submitted:  Wed 07 Jun 2017 07:02:10 PM UTC
   
 
Category:  Source code repositories - developer access Priority:  5 - Normal
Severity:  3 - Normal Status:  Done
Privacy:  Public Assigned to:  agn
Operating System:  None Open/Closed:  Closed
* Mandatory Fields

Add a New Comment Rich Markup
   

Fri 09 Jun 2017 02:04:38 AM UTC, comment #4: 

Hello Gavin, Karl,

Thanks for the details, I removed the update hook.

Pushing to texinfo's git repository should "just work", let me know if it doesn't.

I suggest exercising caution when committing, ensuring it's a different branch,
Since the 'master' branch can't be reverted...

regards,
 - assaf

Assaf Gordon <agn>
Site Administrator
Thu 08 Jun 2017 09:34:42 PM UTC, comment #3: 

Hi Assaf,

1. I don't remember ever asking for anything specific wrt git and texinfo. In particular, I don't remember ever having any dealings with cvs2git and can't imagine why it was a special case to be allowed. Maybe it was some kind of generic savannah thing we were experimenting with at one point? I just don't
remember. Sure looks like it should just be deleted to me.

2. Gavin has been the sole maintainer of Texinfo for quite a while now. I'm happy to consult, of course, but acting on his requests shouldn't depend on anything from me.

best,
karl

Karl Berry <karl>
Site Administrator
Thu 08 Jun 2017 05:45:12 PM UTC, comment #2: 

Thank you for your prompt response.

>Since texinfo traditionally used svn, I assume someone (Karl?) added this hook or asked this hook to be added to protect against undesirable commits.


It still uses svn. We were just going to use git for the GSOC project. The person doing the project is currently using a git repository hosted on another site and we thought it would be a good idea to move it to Savannah.

>perhaps it's good to consult with Karl about why was it there in the first place ?


It was obviously there to prevent people from adding commits which should have been made to the svn repository instead. If you insist, I can point him to this discussion, but I don't see why he should have any objections.

The note I was trying to add to the README file was

"NOTE: This Git repository is for Mathieu Lirzin's
Google Summer of Code project in 2017.  Do not use it to get the
latest Texinfo sources."

>So I recommend either using a dedicated branch and not committing to 'master' anything except official 'texinfo' commits.


I think it would be a good idea to use a different branch. The existing branch 'master' can either be left as it is or removed, whatever is easiest.

>We can also create a dedicated sub-repository (something like: `texinfo/gsoc2017.git`).
>Then it won't interfere with the real repository.


There's probably no advantage to this approach over using a separate branch.


Gavin D. Smith <gavin>
Wed 07 Jun 2017 07:19:28 PM UTC, comment #1: 

Hello Gavin,

This is a custom hook for texinfo's git repository.
Since texinfo traditionally used svn, I assume someone (Karl?) added this hook or asked this hook to be added to protect against undesirable commits.

This hook is vcs0:/net/vcs/srv/git/texinfo.git/hooks/update :
===
#!/bin/bash
# Allow push only by cvs2git.
export PATH=/bin:/usr/bin
user=$(id -un)
test "$user" = cvs2git && exit 0
echo "only cvs2git may push (you are $user)" 1>&2
exit 1
===

And it seems rather old:
===
$ ls -lh update
-rwxrwxr-x 1 root root 173 Nov  7  2008 update
===


I can easily disable it, but before I do - perhaps it's good to consult with Karl about why was it there in the first place ?


Somewhat related:
If these are temporary changes that you'd later like to revert - you won't be able to do that on savannah (non fast-forward commits are forbidden).

So I recommend either using a dedicated branch and not committing to 'master' anything except official 'texinfo' commits.

We can also create a dedicated sub-repository (something like: `texinfo/gsoc2017.git`).
Then it won't interfere with the real repository.
However - these will also remain forever and will not be deleted when GSOC is over.
Sadly savannah is not suitable for ephemeral repositories.

regards,
 - assaf






Assaf Gordon <agn>
Site Administrator
Wed 07 Jun 2017 07:02:10 PM UTC, original submission:  

I want to enable a git repository for the texinfo project for use during a Google Summer of Code project.  I enabled the git repository, checked it out and tried adding a note to the README file explaining why this git repository existed.  However, I can't push this commit back.  From the output of "git push":

Counting objects: 5, done.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 598 bytes | 0 bytes/s, done.
Total 3 (delta 2), reused 0 (delta 0)
remote: only cvs2git may push (you are gavin)
remote: error: hook declined to update refs/heads/master
To gavin@git.sv.gnu.org:/srv/git/texinfo.git
 ! [remote rejected] master -> master (hook declined)
error: failed to push some refs to 'gavin@git.sv.gnu.org:/srv/git/texinfo.git'

How do I set it up so that users other than "cvs2git" can commit? I tried following the instructions in http://savannah.gnu.org/maintenance/UsingGit/ to create a brand-new repository, but the existing git repository blocks me from uploading it. From the output of "git push --all gavin@git.sv.gnu.org:/srv/git/texinfo.git":


To gavin@git.sv.gnu.org:/srv/git/texinfo.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'gavin@git.sv.gnu.org:/srv/git/texinfo.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.


Gavin D. Smith <gavin>

 

(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

Attach Files:
   
   
Comment:
   

No files currently attached

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -email is unavailable- added by karl (Posted a comment)
  • -email is unavailable- added by agn (Posted a comment)
  • -email is unavailable- added by agn
  • -email is unavailable- added by gavin (Submitted the item)
  •  

    There are 0 votes so far. Votes easily highlight which items people would like to see resolved in priority, independently of the priority of the item set by tracker managers.

    Only logged-in users can vote.

     

    Follow 5 latest changes.

    Date Changed by Updated Field Previous Value => Replaced by
    2017-06-09 agn StatusIn Progress Done
        Open/ClosedOpen Closed
    2017-06-07 agn StatusNone In Progress
        Assigned toNone agn
        Carbon-Copy- Added karl

    Back to the top

    Powered by Savane 3.13-4b48.
    Corresponding source code