git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Git - Pushing to a production website

From
Sitaram Chamarty <sitaramc@gmail.com>
Date
Jan 10, 2009, 11:50 UTC
Message-ID
<slrngmh2r9.vur.sitaramc@sitaramc.homelinux.net>
In-Reply-To
<20090109222344.3539138a@family.dyweni.com>
On 2009-01-10, <4jxDQ6FQee2H@dyweni.com> <4jxDQ6FQee2H@dyweni.com> wrote:
Show 10 quoted lines
> Our company's website is stored in a GIT Repository.
>
> The repository is coded for our test server.  When we push updates to
> the production server, have manually run a script to patch several
> files to make the code work on the production server (i.e. port
> numbers, etc).
>
> I'd like to write a script to email me whenever someone changes files
> on the production server without checking those changes back into git
> (i.e. running 'git status | grep "nothing to commit" ...').

Shouldn't they change it in a sandbox and push it to prod when it gets done instead of directly changing on prod?

Show 6 quoted lines
> However, this approach get confused by the files patched to work
> correctly.
>
> Is there any way to 'save' those patched files so they don't get
> reported by 'git status', yet not mung up the git history every time
> we push out an update?

If you can enforce no changes directly to prod, you can have the prod server's "master" branch be the one that QA or whatever pushes to (no direct changes on prod).

You'd manually (one-time) create a branch called prod_patches where you'd make just the changes needed (port numbers etc as you said).

This would be the "checked out" branch.

On each push to master, a hook would just "cd wherever; git rebase master"; the port changes would carry over.

Previous: David Aguilar
Message 10 of 10 in “Git - Pushing to a production website”
  1. 4jxdq6fqee2h@dyweni.comJan 10, 2009
  2. Boyd Stephen Smith Jr.Jan 10, 2009
  3. 4jxdq6fqee2h@dyweni.comJan 10, 2009
  4. Boyd Stephen Smith Jr.Jan 10, 2009
  5. 4jxdq6fqee2h@dyweni.comJan 10, 2009
  6. Boyd Stephen Smith Jr.Jan 10, 2009
  7. david@lang.hmJan 10, 2009
  8. Jacob HelwigJan 10, 2009
  9. David AguilarJan 10, 2009
  10. Sitaram ChamartyJan 10, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.