Re: How to manage a fork

[Todd Zullinger]

Vít Ondruch wrote:
>  Dne 30.11.2017 v 13:48 Pierre-Yves Chibon napsal(a):
> > It's really potato vs potato, clone your fork and add upstream as a 
> > remote or clone upstream and add your fork as a remote, at the end 
> > what matters is that you know which approach you used (and if you 
> > don't git remote -v will tell you) and know how to work with it.
>
>  Not really, it is matter of attitude. Clone of upstream is always 
>  good to have. Just for observing the project or to prepare source 
>  tarball or whatever else. 
If you clone from the fork and add the upstream as a remote, you have 
a clone of the upstream. All that really differs is which one is named 
origin.  And that's only the default remote name.  It's easy to change 
that during clone with the --origin option or later with git remote 
rename.

Depending on the audience and their familiarity with git, it may be 
easier to explain one method or the other.  But in terms of what data 
the git repository contains, they're essentially identical.

>  Fork itself is useless unless you want to contribute. 
That's precisely the audience for the forks documentation, as far as I 
can see.  The documentation states that in the second sentence. :)

I don't particularly think it's needed, but perhaps someone who does 
would want to submit something like this to the documentation:

---- 8< ----
diff --git i/doc/usage/forks.rst w/doc/usage/forks.rst
index 362280d4..dfc46412 100644
--- i/doc/usage/forks.rst
+++ w/doc/usage/forks.rst
@@ -42,6 +42,12 @@ example::
 This lets you pull in changes that the upstream repository makes after you
 forked. Consult Git's documentation for more details.
 
+Alternatively, if you already have a clone of the upstream, you can add your
+fork as a remote.  For example::
+
+    $ cd pagure
+    $ git remote add -f my-fork ssh://[e-mail]/forks/jcline/pagure.git
+
 
 Pushing Changes
 ---------------
---- 8< ----

And if there is some reasonable documentation online which further 
explains the benefits of each approach it might be worth adding as a 
link below.  For all I know, the ProGit "Distributed Workflows" page 
which is referenced at the beginning of the Pagure forks documentation 
covers this.

-- 
Todd
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Stress is when you wake up screaming and you realize you weren't
sleeping.