Mailing List Archive: RANCID: Users

rancid and git

1 2

View All

Index | Next | Previous | View Threaded

heas at shrubbery

Jul 19, 2014, 1:16 PM

Post #26 of 28 (1054 views)
Permalink

Re: Rancid and Git [In reply to]

Fri, Jul 18, 2014 at 02:57:07PM -0700, Crowe, David:
> On Jul 18, 2014, at 2:18 PM, John Heasley <heas [at] shrubbery> wrote:
>
> > Am Jul 18, 2014 um 2:05 PM schrieb "Crowe, David" <crowed [at] bendbroadband>:
> >>
> >> i would agree with a single repo being the best approach.
> >>
> >> regarding the automatic search for changed files (i'll include untracked files in here), the additions to .gitignore helps with this tremendously.
> >>
> >
> > I do not like its global behavior, but...
> >
>
> that is a bit of a pain but once you add the extraneous files and patterns to .gitignore file i've not had to touch it in a long time. having a separate repo for each group could make that a bit cleaner.
>
>
> > Can you tell me what is wrong with the second approach i described?
> >
>
> if i understand what you tried, the "remote" can't be within/under the same directory tree as $BASEDIR if that is the root of an existing git repo.

how do services like github arrange their store? is it a path per-project?

another nice result of having this mehtod, is that the code remains generic
for local (this host) or remote repositories.

> if you stay with the single repo strategy, doing "git reset --hard $BASEDIR/group" is the best way to get back to the last known good repo copy for any group.

thanks; i suspected that would be the result.
_______________________________________________
Rancid-discuss mailing list
Rancid-discuss [at] shrubbery
http://www.shrubbery.net/mailman/listinfo/rancid-discuss

crowed at bendbroadband

Jul 19, 2014, 1:47 PM

Post #27 of 28 (1073 views)
Permalink

Re: Rancid and Git [In reply to]

On Jul 19, 2014, at 1:16 PM, Heasley John <heas [at] shrubbery> wrote:

> Fri, Jul 18, 2014 at 02:57:07PM -0700, Crowe, David:
>> On Jul 18, 2014, at 2:18 PM, John Heasley <heas [at] shrubbery> wrote:
>>
>>> Am Jul 18, 2014 um 2:05 PM schrieb "Crowe, David" <crowed [at] bendbroadband>:
>>>>
>>>> i would agree with a single repo being the best approach.
>>>>
>>>> regarding the automatic search for changed files (i'll include untracked files in here), the additions to .gitignore helps with this tremendously.
>>>>
>>>
>>> I do not like its global behavior, but...
>>>
>>
>> that is a bit of a pain but once you add the extraneous files and patterns to .gitignore file i've not had to touch it in a long time. having a separate repo for each group could make that a bit cleaner.
>>
>>
>>> Can you tell me what is wrong with the second approach i described?
>>>
>>
>> if i understand what you tried, the "remote" can't be within/under the same directory tree as $BASEDIR if that is the root of an existing git repo.
>
> how do services like github arrange their store? is it a path per-project?
>

correct.

> another nice result of having this mehtod, is that the code remains generic
> for local (this host) or remote repositories.
>

agreed.

>> if you stay with the single repo strategy, doing "git reset --hard $BASEDIR/group" is the best way to get back to the last known good repo copy for any group.
>
> thanks; i suspected that would be the result.

_______________________________________________
Rancid-discuss mailing list
Rancid-discuss [at] shrubbery
http://www.shrubbery.net/mailman/listinfo/rancid-discuss

jeff at ocjtech

Jul 21, 2014, 1:40 PM

Post #28 of 28 (1068 views)
Permalink

Re: Rancid and Git [In reply to]

On Fri, Jul 18, 2014 at 3:33 PM, heasley <heas [at] shrubbery> wrote:
>
> I've been playing with git a bit to determine how to arrange the repository
> and understand the commands. I find the automatic search for changed files
> unwelcome.

Git should only be automatically searching for changed files if you
are using "git commit -a". My patch didn't do that, it added changed
files to the pending commit individually.

> The original git patch arranges the repository at $BASEDIR (eg: /var/rancid),
> which creates a single repository with all groups.
>
> I experimented with creating a "remote" repository in $BASEDIR, then pushing
> individual groups to it, but they clash, which I suspect has to do with
> either the repository name (git push -u origin master).

That won't quite work the way that you expect... merging multiple
unrelated repositories into one will make for a very confused
repository.

--
Jeff Ollie
_______________________________________________
Rancid-discuss mailing list
Rancid-discuss [at] shrubbery
http://www.shrubbery.net/mailman/listinfo/rancid-discuss

1 2

View All

Index | Next | Previous | View Threaded

Interested in having your list archived? Contact Gossamer Threads