Deploy web site via Git -

-

i work on team of web developers. each have personal web site set in our home directories on development server.

we want convert them git working repos can branch, rebase, , enjoy benefits of git goodness.

in reading online, there's couple of options:

1) create bare repo syncs working repo in www/ via post-receive hook

2) push directly working repo

problem option 1 doesn't handle branching well. when push branch other master, post-receive hook still syncs master our changes never appear on development site.

problem option 2 git disallows pushing checked-out branch prevent detached head state.

in reading around web, "best practice" solution option 2 goes this:

1) on client push dummy branch

2) on server merge dummy master... buzzzz wrong answer. assume end users don't have shell access server.

so thought, "no problem, create post receive hook this":

#!/bin/bash read oldsha newsha branch git merge $branch

now here's weird part: when post-receive hook executes get

please, commit changes or stash them before can merge.

yes, have confirmed master checked-out branch on server, , dummy branch has been updated correctly. when run same command (git merge dummy) directly on server, works fine.

can explain why?

thanks in advance.

edit 1

here results of git status, both pre-merge , post-merge

counting objects: 5, done.                                                                                                                                                             delta compression using 8 threads. compressing objects: 100% (3/3), done. writing objects: 100% (3/3), 307 bytes, done. total 3 (delta 2), reused 0 (delta 0) remote: **** pre merge **** remote: # on branch master remote: # untracked files: remote: #   (use "git add <file>..." include in committed) remote: # remote: #       commit_editmsg remote: #       fetch_head remote: #       head remote: #       orig_head remote: #       config remote: #       description remote: #       hooks/ remote: #       index remote: #       info/ remote: #       logs/ remote: #       objects/ remote: #       packed-refs remote: #       refs/ remote: no changes added commit (use "git add" and/or "git commit -a") remote: error: local changes following files overwritten merge: remote:         index.htm remote: please, commit changes or stash them before can merge. remote: aborting remote: **** post merge **** remote: # on branch master remote: # changes not staged commit: remote: #   (use "git add <file>..." update committed) remote: #   (use "git checkout -- <file>..." discard changes in working directory) remote: # remote: #       modified:   index.htm remote: # remote: # untracked files: remote: #   (use "git add <file>..." include in committed) remote: # remote: #       commit_editmsg remote: #       fetch_head remote: #       head remote: #       orig_head remote: #       config remote: #       description remote: #       hooks/ remote: #       index remote: #       info/ remote: #       logs/ remote: #       objects/ remote: #       packed-refs remote: #       refs/ remote: no changes added commit (use "git add" and/or "git commit -a")

note can manual git add ., git commit -m "foo" , re-do process same result

in 1 of "duh!" moments, realized use option 1 , pass branch name in attempting option 2.

so, created /home/username/www.git bare repository, cloned /home/username/www , added post-receive hook /home/username/www.git looks this:

#!/bin/bash read oldsha newsha branch git --git-dir="/home/username/www/.git" --work-tree="/home/username/www" pull /home/username/www.git $branch

then changed remote ssh://username@example.com/home/username/www.git (the bare reop, not working one) , push remote via:

git push remotename branchname

voila! works.

the actual post-receive code more complex use error traps , variables directory names (so can deployed user), idea.

(be careful distinguish between www/.git , www.git when reading code samples.)


Comments

Post a Comment

Popular posts from this blog

java - Jmockit String final length method mocking Issue -

-
using jmockit 1.2 jar, trying mock string's length method getting unexpected invocation exception: failed: test java.lang.illegalstateexception: missing invocation mocked type @ point; please make sure such invocations appear after declaration of suitable mock field or parameter @ stringdemo.testa$1.<init>(testa.java:17) @ stringdemo.testa.test(testa.java:13) i using testng: @test public void test() throws exception { new expectations() { @mocked("length") string astring; { astring.length(); result = 2; } }; system.out.println(a.showa("test")); } } actual class a: public class { public static int showa(string str){ int a= str.length(); return a; } } this wrong way of recording expected results. shouldn't mock , record string's length() method, record showa() instead. here solution @suppresswarnings("unused...
Read more

What is the difference between data design and data model(ERD) -

-
i have google question , find answer in day. know, data design many many table have list column,and mark pk , fk. why er-diagram have find this? data design process of designing database. main output of data design detailed logical data model of database. some people data design includes of needed logical , physical design choices , physical storage parameters needed generate design in data definition language. technically, database analysis, database analysts (dbas) trained do. while person can both data design , database analysis, these 2 different tasks. data design models data. database analysis takes model , applies 1 or more database engines (relational, hierarchical, nosql). a logical data model 1 of main outputs of data design. data model represented entity relationship diagram, or er diagram.
Read more

ios - Can NSManagedObject conform to NSCoding -

-
i need transfer single object across device. right converting nsmanagedobject dictionary , archiving , sending nsdata. upon receiving unarchiving it. transfer nsmanagedobject archiving , unarchiving instead of creating intermediate data object. @interface test : nsmanagedobject<nscoding> @property (nonatomic, retain) nsstring * title; @end @implementation test @dynamic title; - (id)initwithcoder:(nscoder *)coder { self = [super init]; if (self) { self.title = [coder decodeobjectforkey:@"title"]; //<crash } return self; } - (void)encodewithcoder:(nscoder *)coder { [coder encodeobject:self.title forkey:@"title"]; } @end nsdata *archivedobjects = [nskeyedarchiver archiveddatawithrootobject:testobj]; nsdata *objectsdata = archivedobjects; if ([objectsdata length] > 0) { nsarray *objects = [nskeyedunarchiver unarchiveobjectwithdata:objectsdata]; } the problem above code is. crashes @ self.title in initwithcoder sa...
Read more