[Paraview-developers] Adding a check for local Git hooks
Biddiscombe, John A.
biddisco at cscs.ch
Fri Jul 16 04:00:58 EDT 2010
Hope this is useful. One interesting point. If I do a
"git checkout kitware/master filename"
then "git commit filename"
it still gives me whitespace errors for filename.
JB
biddisco at AGNO /d/code/cscs/pv-meshless/VTK (jb|MERGING)
$ git branch -a
cscs-pv
hdf5-1.8
* jb
jb-time
master
remotes/kitware/hooks
remotes/kitware/master
remotes/kitware/release
remotes/origin/HEAD -> origin/master
remotes/origin/cscs-pv
remotes/origin/hdf5-1.8
remotes/origin/hooks
remotes/origin/jb
remotes/origin/js
remotes/origin/master
remotes/origin/release
biddisco at AGNO /d/code/cscs/pv-meshless/VTK (jb|MERGING)
$ git status
# On branch jb
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: CMake/CTestCustom.ctest.in
# modified: CMake/KitCommonBlock.cmake
# modified: CMake/vtkWrapHierarchy.cmake
# modified: CMakeLists.txt
# modified: Charts/CMakeLists.txt
# modified: Charts/Testing/Cxx/CMakeLists.txt
# modified: Charts/Testing/Cxx/TestGLSL.cxx
# new file: Charts/Testing/Cxx/TestPieChart.cxx
# modified: Charts/vtkAbstractContextItem.cxx
# modified: Charts/vtkAbstractContextItem.h
# modified: Charts/vtkAxis.cxx
# modified: Charts/vtkBlockItem.cxx
# modified: Charts/vtkBlockItem.h
# modified: Charts/vtkChartLegend.cxx
# modified: Charts/vtkChartParallelCoordinates.cxx
# new file: Charts/vtkChartPie.cxx
# new file: Charts/vtkChartPie.h
# modified: Charts/vtkChartXY.cxx
# modified: Charts/vtkChartXY.h
# new file: Charts/vtkContextClip.cxx
# new file: Charts/vtkContextClip.h
# modified: Charts/vtkContextScenePrivate.h
# modified: Charts/vtkPlot.cxx
# modified: Charts/vtkPlot.h
# new file: Charts/vtkPlotPie.cxx
# new file: Charts/vtkPlotPie.h
# modified: Common/CMakeLists.txt
# modified: Common/Testing/CMakeLists.txt
# new file: Common/vtkBreakPoint.cxx
# new file: Common/vtkBreakPoint.h
# modified: Common/vtkFunctionParser.cxx
# modified: Common/vtkInformationInformationVectorKey.cxx
# modified: Common/vtkInformationIterator.cxx
# modified: Common/vtkInformationIterator.h
# modified: Examples/Infovis/Python/haruspex.py
# modified: Filtering/vtkAlgorithm.cxx
# modified: Filtering/vtkAlgorithm.h
# modified: Filtering/vtkBiQuadraticTriangle.cxx
# modified: Filtering/vtkCellArray.h
# modified: Filtering/vtkCompositeDataPipeline.cxx
# modified: Filtering/vtkCompositeDataSet.cxx
# modified: Filtering/vtkCompositeDataSet.h
# modified: Filtering/vtkDataObject.cxx
# modified: Filtering/vtkImageData.cxx
# modified: Filtering/vtkImageData.h
# modified: Filtering/vtkPolyLine.cxx
# modified: Filtering/vtkTable.cxx
# modified: Filtering/vtkUniformGrid.cxx
# modified: Filtering/vtkUniformGrid.h
# modified: Filtering/vtkVoxel.cxx
# modified: Filtering/vtkVoxel.h
# modified: Graphics/vtkBoxClipDataSet.cxx
# modified: Graphics/vtkClipClosedSurface.cxx
# modified: Graphics/vtkGlyph3D.cxx
# modified: Graphics/vtkGlyph3D.h
# modified: Hybrid/vtkExodusIIReader.cxx
# modified: Hybrid/vtkExodusIIReaderPrivate.h
# modified: Hybrid/vtkPExodusIIReader.cxx
# modified: IO/CMakeLists.txt
# modified: IO/Testing/Cxx/CMakeLists.txt
# modified: IO/vtkMySQLQuery.cxx
# modified: IO/vtkMySQLQuery.h
# modified: IO/vtkOpenFOAMReader.cxx
# modified: IO/vtkSQLDatabase.cxx
# modified: IO/vtkSQLDatabase.h
# modified: IO/vtkSQLDatabaseSchema.cxx
# modified: IO/vtkSQLDatabaseSchema.h
# modified: Imaging/vtkImageCast.h
# modified: Imaging/vtkImageRectilinearWipe.cxx
# modified: Imaging/vtkImageRectilinearWipe.h
# modified: Infovis/CMakeLists.txt
# modified: Infovis/Testing/Cxx/CMakeLists.txt
# new file: Infovis/Testing/Cxx/TestDIMACSGraphReader.cxx
# new file: Infovis/Testing/Cxx/TestTableToArray.cxx
# modified: Infovis/vtkAttributeClustering2DLayoutStrategy.cxx
# modified: Infovis/vtkContingencyStatistics.cxx
# new file: Infovis/vtkDIMACSGraphReader.cxx
# new file: Infovis/vtkDIMACSGraphReader.h
# new file: Infovis/vtkDIMACSGraphWriter.cxx
# new file: Infovis/vtkDIMACSGraphWriter.h
# modified: Infovis/vtkStatisticsAlgorithm.cxx
# modified: Infovis/vtkStatisticsAlgorithm.h
# modified: Infovis/vtkTableToArray.cxx
# modified: Infovis/vtkTableToArray.h
# modified: Parallel/vtkBlockDistribution.h
# modified: Parallel/vtkMPICommunicator.cxx
# modified: Parallel/vtkPCosmoHaloFinder.cxx
# modified: Parallel/vtkPCosmoHaloFinder.h
# modified: Parallel/vtkWindBladeReader.cxx
# modified: Rendering/Testing/Python/TestTkRenderWidget.py
# modified: Rendering/vtkFreeTypeUtilities.cxx
# modified: Rendering/vtkFreeTypeUtilities.h
# modified: Rendering/vtkGenericRenderWindowInteractor.cxx
# modified: Rendering/vtkGenericRenderWindowInteractor.h
# modified: Rendering/vtkGlyph3DMapper.cxx
# modified: Rendering/vtkGlyph3DMapper.h
# modified: Rendering/vtkInteractorStyle.cxx
# modified: Rendering/vtkOpenGLExtensionManager.cxx
# modified: Rendering/vtkOpenGLExtensionManager.h
# modified: Rendering/vtkRenderWindowInteractor.cxx
# modified: Rendering/vtkRenderWindowInteractor.h
# modified: Rendering/vtkShader2.cxx
# modified: Rendering/vtkShaderProgram2.cxx
# modified: Rendering/vtkShaderProgram2.h
# modified: Rendering/vtkTextActor.h
# modified: Utilities/Cosmo/FOFHaloProperties.cxx
# modified: Utilities/Cosmo/FOFHaloProperties.h
# modified: Utilities/Cosmo/Partition.h
# modified: Utilities/Doxygen/doc_class2example.pl
# modified: Utilities/Doxygen/doc_makeall.cmake.in
# modified: Utilities/kwsys/kwsysDateStamp.cmake
# modified: Utilities/kwsys/testProcess.c
# modified: Views/vtkRenderView.cxx
# modified: VolumeRendering/CMakeLists.txt
# modified: VolumeRendering/Testing/Cxx/CMakeLists.txt
# new file: VolumeRendering/Testing/Cxx/TestProjectedHexahedra.cxx
# new file: VolumeRendering/vtkOpenGLProjectedAAHexahedraMapper.cxx
# new file: VolumeRendering/vtkOpenGLProjectedAAHexahedraMapper.h
# new file: VolumeRendering/vtkProjectedAAHexahedraMapper.cxx
# new file: VolumeRendering/vtkProjectedAAHexahedraMapper.h
# new file: VolumeRendering/vtkProjectedAAHexahedraMapper_FS.glsl
# new file: VolumeRendering/vtkProjectedAAHexahedraMapper_GS.glsl
# new file: VolumeRendering/vtkProjectedAAHexahedraMapper_VS.glsl
# modified: VolumeRendering/vtkVolumeRenderingFactory.cxx
# modified: Wrapping/Python/PyVTKSpecialObject.cxx
# modified: Wrapping/Python/vtk/qt4/QVTKRenderWindowInteractor.py
# modified: Wrapping/Python/vtk/test/BlackBox.py
# modified: Wrapping/Python/vtk/test/Testing.py
# modified: Wrapping/lex.yy.c
# modified: Wrapping/vtkParse.h
# modified: Wrapping/vtkParse.l
# modified: Wrapping/vtkParse.tab.c
# modified: Wrapping/vtkParse.y
# modified: Wrapping/vtkParseHierarchy.c
# modified: Wrapping/vtkParseInternal.h
# modified: Wrapping/vtkParseMain.c
# modified: Wrapping/vtkParseMain.h
# modified: Wrapping/vtkWrapHierarchy.c
# modified: Wrapping/vtkWrapJava.c
# modified: Wrapping/vtkWrapPython.c
# modified: Wrapping/vtkWrapTcl.c
#
biddisco at AGNO /d/code/cscs/pv-meshless/VTK (jb|MERGING)
$ git rev-parse HEAD
f439f417dbf9a5b363cf9a1d883d20c1cae9e692
> -----Original Message-----
> From: Brad King [mailto:brad.king at kitware.com]
> Sent: 15 July 2010 16:53
> To: Biddiscombe, John A.
> Cc: Marcus D. Hanwell; ParaView Developers
> Subject: Re: [Paraview-developers] Adding a check for local Git hooks
>
> On 07/15/2010 05:40 AM, Biddiscombe, John A. wrote:
> > After doing a merge, I get * * literally thousands * * of errors when I
> try to commit my local branch
>
> What is the output of...?
>
> $ git branch
>
> $ git status
>
> $ git rev-parse HEAD
>
> -Brad
More information about the Paraview-developers
mailing list