Any puppet users? Drafting PPG

Puppet is often used with git as the mechanism to publish/distribute the configuration. This sidesteps the not-very-scalable central Puppet server. But the use of git isn't sophisticated in the least. Git can help in a few ways, IMO, and this is my initial approach at the topic:

Pitfalls in auto-fast-forwarding heads that are not checked out?

I am building a small git wrapper around puppet, and one of the actions it performs is auto-fastforwarding of branches without checking them out. In simplified code... we ensure that we are on a head called master, and in some cases ppg commit, will commit to master and... ## early on #

Re: Pitfalls in auto-fast-forwarding heads that are not checked out?

On Sat, May 4, 2013 at 3:34 AM, Johannes Sixt j...@kdbg.org wrote: You mean refs/heads/master and != here because -ne is numeric comparison in a shell script. thanks! Yeah, I fixed those up late last night :-) Since git 1.8.0 you can express this check as if git merge-base --is-ancestor

offtopic: ppg design decisions - encapsulation

[ Unashamedly offtopic... asking here because I like git design and coding style, and ppg is drawing plenty of inspiration from the old git shell scripts. Please kindly flame me privately... ] ppg is a wrapper around git to maintain and distribute Puppet configs, adding a few niceties. Now, ppg

Re: Pitfalls in auto-fast-forwarding heads that are not checked out?

On Sat, May 4, 2013 at 2:51 PM, Jonathan Nieder jrnie...@gmail.com wrote: Another trick is to use git push: git push . $production_sha1:refs/heads/master Great trick -- thanks! In use in ppg now :-) m -- martin.langh...@gmail.com - ask interesting questions - don't get distracted

Re: offtopic: ppg design decisions - encapsulation

On Mon, May 6, 2013 at 11:53 AM, John Keeping j...@keeping.me.uk wrote: I'm not sure I fully understand what the reports are, but it sounds like they are closely related to original configuration commits. If that is the case, have you considered using Git notes instead of a separate

Re: [PATCH] gitk: add support for -G'regex' pickaxe variant

I just did git rebase origin/master for the umpteenth time, which reminded me this nice patch is still pending. ping? m On Thu, Jun 14, 2012 at 2:34 PM, Zbigniew Jędrzejewski-Szmek zbys...@in.waw.pl wrote: From: Martin Langhoff mar...@laptop.org git log -G'regex' is a very usable

Misusing git: trimming old commits

I am misusing git as a store-and-forward tool to transfer reports to a server in a resilient manner. The context is puppet (and ppg, I've spammed the list about it... ). The reports are small, with small deltas, but created frequently. With the exaction of the final destination, I want to expire

Re: Misusing git: trimming old commits

On Thu, May 9, 2013 at 11:40 AM, Martin Langhoff martin.langh...@gmail.com wrote: With the exaction of the final destination, I want to expire reports that are old and successfully transferred. OK, that took some effort to make work. Make sure you are not using reflogs (or that reflogs

Re: [PATCH] gitk: add support for -G'regex' pickaxe variant

On Mon, May 13, 2013 at 2:55 PM, Jonathan Nieder jrnie...@gmail.com wrote: My experience is the opposite. I wonder What did the author of this nonsense comment mean? or What is the purpose of this strange condition in this if () statement?. Then git log -S finds the culprit Only if that if

Re: [PATCH] gitk: add support for -G'regex' pickaxe variant

On Mon, May 13, 2013 at 3:33 PM, Jonathan Nieder jrnie...@gmail.com wrote: Well, no, it should find the final change that brought it into the current form. Just like git blame. Has it been finding zero results in some cases where the current code matches the pattern? That sounds like a bug.

Re: Fwd: git cvsimport implications

On Fri, May 17, 2013 at 5:10 AM, Michael Haggerty mhag...@alum.mit.edu wrote: For one-time imports, the fix is to use a tool that is not broken, like cvs2git. As one of the earlier maintainers of cvsimport, I do believe that cvs2git is less broken, for one-shot imports, than cvsimport. Users

Re: Fwd: git cvsimport implications

On Fri, May 17, 2013 at 9:34 AM, Andreas Krey a.k...@gmx.de wrote: On Fri, 17 May 2013 15:14:58 +, Michael Haggerty wrote: ... We both know that the CVS history omits important data, and that the history is mutable, etc. So there are lots of hypothetical histories that do not contradict

Can a git push over ssh trigger a gc/repack? Diagnosing pack explosion

Hi git list, I am trying to diagnose a strange problem in a VM running as a 'git over ssh server', with one repo which periodically grows very quickly. The complete dataset packs to a single pack+index of ~650MB. Growth is slow, these are ASCII text reports that use a template -- highly

Re: Can a git push over ssh trigger a gc/repack? Diagnosing pack explosion

On Thu, Nov 21, 2013 at 2:52 PM, Junio C Hamano gits...@pobox.com wrote: - if it's receiving from many pushers, it races with itself; needs some lock or back-off mechanism Surely. I think these should help: 64a99eb4 (gc: reject if another gc is running, unless --force is given,

Re: Can a git push over ssh trigger a gc/repack? Diagnosing pack explosion

On Thu, Nov 21, 2013 at 10:21 AM, Martin Langhoff martin.langh...@gmail.com wrote: Do client pushes over git+ssh ever trigger a repack on the server? man git-config [snip] receive.autogc By default, git-receive-pack will run git-gc --auto after receiving data from

git filter-branch --directory-filter oddity

When using git filter-branch --prune-empty --directory-filter foo/bar to extract the history of the foo/bar directory, I am getting a very strange result. Directory foo/bar is slow moving. Say, 22 commits out of several thousand. I would like to extract just those 22 commits. Instead, I get

Re: git filter-branch --directory-filter oddity

On Tue, Dec 3, 2013 at 5:44 PM, Martin Langhoff martin.langh...@gmail.com wrote: As they have not been skipped, they are fully fleshed out. By this, I mean that we have the whole tree in place. So these 22 commits appear with foo/bar pulled out to the root of the project, in the midst of 1500

Re: git filter-branch --directory-filter oddity

On Tue, Dec 3, 2013 at 5:44 PM, Martin Langhoff martin.langh...@gmail.com wrote: Am I doing it wrong? Looks like I was doing something wrong. Apologies about the noise. cheers, m -- martin.langh...@gmail.com - ask interesting questions - don't get distracted with shiny stuff - working

Publishing filtered branch repositories - workflow / recommendations?

Hi folks. currently working on a project based on Moodle (the LMS that got me into git in the first place). This is a highly modular software, and I would like to maintain a bunch of out of tree modules in a single repository, and be able to publish them in per-module repositories. So I would

Re: Publishing filtered branch repositories - workflow / recommendations?

On Wed, Dec 4, 2013 at 6:01 PM, Martin Langhoff martin.langh...@gmail.com wrote: Is there a reasonable approach to scripting this? Found my answers. The 'subtree' merge strategy is smart enough to mostly help here. However, it does not handle new files created in the subdirectory. My workflow

Re: Publishing filtered branch repositories - workflow / recommendations?

On Thu, Dec 5, 2013 at 2:18 PM, Jens Lehmann jens.lehm...@web.de wrote: Without knowing more I can't think of a reason why submodules should not suit your use case (but you'd have to script branching and tagging yourself until these commands learn to recurse into submodules too). The

Re: Publishing filtered branch repositories - workflow / recommendations?

On Thu, Dec 5, 2013 at 2:54 PM, Jens Lehmann jens.lehm...@web.de wrote: Am 05.12.2013 20:27, schrieb Martin Langhoff: On Thu, Dec 5, 2013 at 2:18 PM, Jens Lehmann jens.lehm...@web.de wrote: Without knowing more I can't think of a reason why submodules should not suit your use case (but you'd

gitignore excludes not working?

Tested with git 1.7.12.4 (Apple Git-37) and git 1.8.3.1 on F20. $ mkdir foo $ cd foo $ git init Initialized empty Git repository in /tmp/foo/.git/ $ mkdir -p modules/boring $ mkdir -p modules/interesting $ touch modules/boring/lib.c $ touch modules/interesting/other.c $ touch

Re: Publishing filtered branch repositories - workflow / recommendations?

On Fri, Dec 6, 2013 at 3:48 AM, Jens Lehmann jens.lehm...@web.de wrote: Right you are, we need tutorials for the most prominent use cases. In the meantime, are there any hints? Emails on this list showing a current smart workflow? Blog posts? Notes on a wiki? Early git was very pedantic, and

Re: I have end-of-lifed cvsps

On Wed, Dec 11, 2013 at 7:17 PM, Eric S. Raymond e...@thyrsus.com wrote: I tried very hard to salvage this program - the ability to remote-fetch CVS repos without rsync access was appealing Is that the only thing we lose, if we abandon cusps? More to the point, is there today an incremental

Re: I have end-of-lifed cvsps

On Wed, Dec 11, 2013 at 11:26 PM, Eric S. Raymond e...@thyrsus.com wrote: You'll have to remind me what you mean by incremental here. Possibly it's something cvs-fast-export could support. User can - run a cvs to git import at time T, resulting in repo G - make commits to cvs repo - run cvs

Re: I have end-of-lifed cvsps

On Thu, Dec 12, 2013 at 12:17 PM, Andreas Krey a.k...@gmx.de wrote: But anyway, the replacement question is a) how fast the cvs-fast-export is and b) whether its output is stable In my prior work, the better CVS importers would not have stable output, so were not appropriate for incremental

Re: I have end-of-lifed cvsps

On Thu, Dec 12, 2013 at 1:15 PM, Eric S. Raymond e...@thyrsus.com wrote: That terminology -- flying fish and dovetail -- is interesting, and I have not heard it before. It might be woth putting in the Jargon File. Can you point me at examples of live usage? The canonical reference would be

Re: I have end-of-lifed cvsps

On Thu, Dec 12, 2013 at 1:29 PM, Eric S. Raymond e...@thyrsus.com wrote: I am almost certain the output of cvs-fast-export is stable. I believe the output of cvsps-3.x was, too. Not sure about 2.x. IIRC, making the output stable is nontrivial, specially on branches. Two cases are still in my

Re: I have end-of-lifed cvsps

On Thu, Dec 12, 2013 at 3:58 PM, Eric S. Raymond e...@thyrsus.com wrote: - regardless of commit ids, do you synthesize an artificial commit? How do you define parenthood for that artificial commit? Because tagging is never used to deduce changesets, the case does not arise. So if a branch

Re: I have end-of-lifed cvsps

On Thu, Dec 12, 2013 at 6:04 PM, Eric S. Raymond e...@thyrsus.com wrote: I'm not sure what counts as a nonsensical branching point. I do know that Keith left this rather cryptic note in a REAME: Keith names exactly what we are talking about. At that time, Keith was struggling with the old xorg

Re: git "thin" submodule clone to feed "describe"

On Tue, Feb 23, 2016 at 4:33 PM, Junio C Hamano wrote: > No, I do not think so. Thanks. I will probably setup a pre-commit hook at the top level project to update a submodule metadata file. Not the prettiest but... :-) m -- martin.langh...@gmail.com - ask interesting

git "thin" submodule clone to feed "describe"

Hi git list! long time no see! :-) Been missing you lots. Do we currently have any means to clone _history_ but not _blobs_ of a repo, or some approximation thereof? With a bit more context: If I have a top-level project using a couple dozen submodules, where the submodules are huge, do I have a

Automagic `git checkout branchname` mysteriously fails

tinlanghoff - don't be distracted~ http://github.com/martin-langhoff by shiny stuff

Re: Automagic `git checkout branchname` mysteriously fails

interesting questions ~ http://linkedin.com/in/martinlanghoff - don't be distracted ~ http://github.com/martin-langhoff by shiny stuff

Re: Delta compression not so effective

tracted ~ http://github.com/martin-langhoff by shiny stuff

Re: Delta compression not so effective

questions ~ http://linkedin.com/in/martinlanghoff - don't be distracted~ http://github.com/martin-langhoff by shiny stuff

Dropping a merge from history -- rebase or filter-branch or ...?

esting questions ~ http://linkedin.com/in/martinlanghoff - don't be distracted~ http://github.com/martin-langhoff by shiny stuff

Should rerere auto-update a merge resolution?

...@gmail.com - ask interesting questions ~ http://linkedin.com/in/martinlanghoff - don't be distracted~ http://github.com/martin-langhoff by shiny stuff

Re: Should rerere auto-update a merge resolution?

ated its resolution db automagically? rerere is plenty automagic already... cheers, m -- martin.langh...@gmail.com - ask interesting questions ~ http://linkedin.com/in/martinlanghoff - don't be distracted~ http://github.com/martin-langhoff by shiny stuff

Re: I'm trying to break "git pull --rebase"

On Tue, Feb 20, 2018 at 5:00 PM, Julius Musseau wrote: > I was hoping to concoct a situation where "git pull --rebase" makes a > mess of things. It breaks quite easily with some workflows. They are all in the "don't do that" territory. Open a long-lived feature-dev branch,

git svn clone/fetch hits issues with gc --auto

s ~ http://linkedin.com/in/martinlanghoff - don't be distracted~ http://github.com/martin-langhoff by shiny stuff -- martin.langh...@gmail.com - ask interesting questions ~ http://linkedin.com/in/martinlanghoff - don't be distracted~ http://github.com/martin-langhoff

Re: git svn clone/fetch hits issues with gc --auto

ons ~ http://linkedin.com/in/martinlanghoff - don't be distracted~ http://github.com/martin-langhoff by shiny stuff

Re: git svn clone/fetch hits issues with gc --auto

; Forwarding to Jonathan, as I think this is an interesting supporting > vote for the topic that we were stuck on. > > Eric Wong writes: > > > Martin Langhoff wrote: > >> Hi folks, > >> > >> Long time no see! Importing a 3GB (~25K revs, tons of files) SVN repo > >>

Re: git svn clone/fetch hits issues with gc --auto

I don't know why. I've worked on other importers and while those needed 'gc' to generate packs, they didn't generate garbage objects. After gc, the repo was "clean". cheers, m -- martin.langh...@gmail.com - ask interesting questions ~ http://linkedin.com/in/martinlangho

<    1   2