From 62ad9411ba387e2b940ea0582ed7dc53e75d8ac5 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Sat, 13 Aug 2016 22:42:23 -0500 Subject: [svn-r30288] Modify bin/chkmanifest for git instead of svn. Add .gitattributes and .gitignore files to MANIFEST for git repository. --- MANIFEST | 2 ++ bin/chkmanifest | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/MANIFEST b/MANIFEST index e3045c9..1ad5687 100644 --- a/MANIFEST +++ b/MANIFEST @@ -21,6 +21,8 @@ #------------------------------------------------------------------------------ ./.autom4te.cfg _DO_NOT_DISTRIBUTE_ +./.gitattributes _DO_NOT_DISTRIBUTE_ +./.gitignore _DO_NOT_DISTRIBUTE_ ./.h5chkright.ini _DO_NOT_DISTRIBUTE_ ./ACKNOWLEDGMENTS ./COPYING diff --git a/bin/chkmanifest b/bin/chkmanifest index 646f815..a460744 100755 --- a/bin/chkmanifest +++ b/bin/chkmanifest @@ -79,8 +79,8 @@ done # # First get a list of all the pending files with svn stat and # check those. -svn_stat=`svn stat -q` -for file in $svn_stat; do +git_stat=`git status -s` +for file in $git_stat; do # Newly added files are not listed by svn ls, which # we check later. @@ -93,7 +93,8 @@ for file in $svn_stat; do # # There is a space between the status columns and file name, hence # the '8' instead of '7'. - path=`echo $file | sed 's/^.\{8\}/\.\//g'` + # For git status -s it's 3 instead of 8. + path=`echo $file | sed 's/^.\{3\}/\.\//g'` # Ignore directories if [ ! -d $path ]; then if (grep ^$path$ $MANIFEST >/dev/null); then @@ -108,8 +109,9 @@ done # Next check svn ls, which gets a list of all files that are # checked in. -svn_ls=`svn ls -R` -for file in $svn_ls; do +##svn_ls=`svn ls -R` +git_ls=`git ls-files` +for file in $git_ls; do path="./${file}" # Ignore directories if [ ! -d $path ]; then -- cgit v0.12