Comments on: ClearCase Globally, Git Locally http://genaud.net/2008/08/clearcase-globally-git-locally/ genaud.net Fri, 13 Jan 2012 16:19:35 +0000 hourly 1 http://wordpress.org/?v=3.0.4 By: Alex http://genaud.net/2008/08/clearcase-globally-git-locally/comment-page-1/#comment-61510 Alex Fri, 13 Jan 2012 16:19:35 +0000 http://genaud.net/2008/08/clearcase-globally-git-locally/#comment-61510 Hi Felix, I haven't used CC in three years, but I don't recall the .git directory being a problem. If it's not committed to CC, then it's unlikely to mistakenly get absorbed. There must be some CC-ignore mechanism, but I don't recall off hand, sorry. Hi Felix, I haven’t used CC in three years, but I don’t recall the .git directory being a problem. If it’s not committed to CC, then it’s unlikely to mistakenly get absorbed. There must be some CC-ignore mechanism, but I don’t recall off hand, sorry.

]]> By: Felix http://genaud.net/2008/08/clearcase-globally-git-locally/comment-page-1/#comment-61509 Felix Tue, 10 Jan 2012 21:48:28 +0000 http://genaud.net/2008/08/clearcase-globally-git-locally/#comment-61509 Hi, thanks for this article! How does clear case react to the .git folder in the snapshot directory? I obviously don't want to commit .git into Clearcase. In the article you explain how to make git ignore the Clearcase metadata, but the other way round isn't very clear to me. Thanks again. Hi, thanks for this article! How does clear case react to the .git folder in the snapshot directory? I obviously don’t want to commit .git into Clearcase. In the article you explain how to make git ignore the Clearcase metadata, but the other way round isn’t very clear to me. Thanks again.

]]> By: John "Z-Bo" Zabroski http://genaud.net/2008/08/clearcase-globally-git-locally/comment-page-1/#comment-61507 John "Z-Bo" Zabroski Thu, 29 Dec 2011 15:40:24 +0000 http://genaud.net/2008/08/clearcase-globally-git-locally/#comment-61507 Hello, I made changes to your init script. See below. Notes: 1) Now uses echo instead of cat, to reduce the need for interactive prompts and eliminates possibly entering needless ^M characters (e.g., when viewed in vi). This makes it slightly more platform-consistent. 2) Adds a blank .gitignore file to every empty ClearCase directory (without this, the above 'diff' command outputs a ton of garbage about missing directories in the clone repository). If I have some free time, I might extend this further so that creating the initial ClearCase snapshot can be done from a single script. This would allow parameterizing the clone and snapshot directory names and automatically nest them under a parent directory. I will also look into ACGarland's changes. Also, thank you SO MUCH for this tutorial. A ClearCase snapshot update takes 93 seconds on my machine (benchmarked with PowerShell: "Measure-Command {cleartool update}"), and we also don't use branching to work on features - only for release management. Being able to feature branch on my own machine will allow me to produce UI prototypes much faster. You are my hero. <code> cd snapshot git init find . -type d -empty -exec touch {}/.gitignore \; echo .gitignore >> .git/info/exclude echo view.dat >> .git/info/exclude echo lost+found/ >> .git/info/exclude git add . git commit -m init git clone -o snapshot . ../clone git remote add -t master -m master clone ../clone </code> Hello,

I made changes to your init script. See below.

Notes:
1) Now uses echo instead of cat, to reduce the need for interactive prompts and eliminates possibly entering needless ^M characters (e.g., when viewed in vi). This makes it slightly more platform-consistent.
2) Adds a blank .gitignore file to every empty ClearCase directory (without this, the above ‘diff’ command outputs a ton of garbage about missing directories in the clone repository).

If I have some free time, I might extend this further so that creating the initial ClearCase snapshot can be done from a single script. This would allow parameterizing the clone and snapshot directory names and automatically nest them under a parent directory. I will also look into ACGarland’s changes.

Also, thank you SO MUCH for this tutorial. A ClearCase snapshot update takes 93 seconds on my machine (benchmarked with PowerShell: “Measure-Command {cleartool update}”), and we also don’t use branching to work on features – only for release management. Being able to feature branch on my own machine will allow me to produce UI prototypes much faster. You are my hero.


cd snapshot
git init
find . -type d -empty -exec touch {}/.gitignore \;
echo .gitignore >> .git/info/exclude
echo view.dat >> .git/info/exclude
echo lost+found/ >> .git/info/exclude
git add .
git commit -m init
git clone -o snapshot . ../clone
git remote add -t master -m master clone ../clone

]]> By: Gan Ainm http://genaud.net/2008/08/clearcase-globally-git-locally/comment-page-1/#comment-61504 Gan Ainm Thu, 22 Dec 2011 09:35:35 +0000 http://genaud.net/2008/08/clearcase-globally-git-locally/#comment-61504 A small improvement I missed in the last patch: you can avoid the cat and grep invocations: --- pristine 2011-12-22 10:21:47.000000000 +0100 +++ /home/adiiacm1/bin/pristine 2011-12-21 17:08:29.612148300 +0100 @@ -63,7 +63,7 @@ # after appending gitignore to an exclude file # EXCLUDE=`pwd`/tmp.exclude -echo .git/ > $EXCLUDE +echo '\.git/' > $EXCLUDE PREV_DIR=`pwd` while [ 1 -eq 1 ]; do if [ `pwd` = "/" -o `pwd` = "\\" ]; then @@ -72,11 +72,11 @@ cd $PREV_DIR exit 1 elif [ -e .gitignore ]; then - cat .gitignore | grep -v "^#" >> $EXCLUDE + sed '/^#/d;s/\./\\./g;s/\*/.*/g' .gitignore >> $EXCLUDE fi if [ -d .git ]; then if [ -e .git/info/exclude ]; then - cat .git/info/exclude | grep -v "^#" >> $EXCLUDE + sed '/^#/d;s/\./\\./g;s/\*/.*/g' .git/info/exclude >> $EXCLUDE fi DIR=`pwd`/.git/pristine rm -rf $DIR @@ -363,7 +363,7 @@ echo -n Checking \(-c\) CC Checkouts... if [ $RUN_CC_CHECKOUTS = "TRUE" ]; then - cleartool lsco -me -recurse -short $FILE_LIST $DIR_LIST >\ + cleartool lsco -me -cview -recurse -short $FILE_LIST $DIR_LIST >\ $DIR/cc_checkout if [ `cat $DIR/cc_checkout | wc -l` != "0" ]; then Regards Gan A small improvement I missed in the last patch: you can avoid the cat and grep invocations:

— pristine 2011-12-22 10:21:47.000000000 +0100
+++ /home/adiiacm1/bin/pristine 2011-12-21 17:08:29.612148300 +0100
@@ -63,7 +63,7 @@
# after appending gitignore to an exclude file
#
EXCLUDE=`pwd`/tmp.exclude
-echo .git/ > $EXCLUDE
+echo ‘\.git/’ > $EXCLUDE
PREV_DIR=`pwd`
while [ 1 -eq 1 ]; do
if [ `pwd` = "/" -o `pwd` = "\\" ]; then
@@ -72,11 +72,11 @@
cd $PREV_DIR
exit 1
elif [ -e .gitignore ]; then
- cat .gitignore | grep -v “^#” >> $EXCLUDE
+ sed ‘/^#/d;s/\./\\./g;s/\*/.*/g’ .gitignore >> $EXCLUDE
fi
if [ -d .git ]; then
if [ -e .git/info/exclude ]; then
- cat .git/info/exclude | grep -v “^#” >> $EXCLUDE
+ sed ‘/^#/d;s/\./\\./g;s/\*/.*/g’ .git/info/exclude >> $EXCLUDE
fi
DIR=`pwd`/.git/pristine
rm -rf $DIR
@@ -363,7 +363,7 @@
echo -n Checking \(-c\) CC Checkouts…
if [ $RUN_CC_CHECKOUTS = "TRUE" ]; then

- cleartool lsco -me -recurse -short $FILE_LIST $DIR_LIST >\
+ cleartool lsco -me -cview -recurse -short $FILE_LIST $DIR_LIST >\
$DIR/cc_checkout

if [ `cat $DIR/cc_checkout | wc -l` != "0" ]; then

Regards

Gan

]]> By: Gan Ainm http://genaud.net/2008/08/clearcase-globally-git-locally/comment-page-1/#comment-61502 Gan Ainm Wed, 21 Dec 2011 16:12:08 +0000 http://genaud.net/2008/08/clearcase-globally-git-locally/#comment-61502 Another issue: When checking fo checkouts, don't forget the "-cview" option unless you want all your views checked which might cause pristine to give false positives! Regards Gan Another issue:

When checking fo checkouts, don’t forget the “-cview” option unless you want all your views checked which might cause pristine to give false positives!

Regards

Gan

]]>