[vz-users] Update - git pull Fehlermeldung

[Daniel Kopf]

Guten Morgen,

so ich habe heute morgen gleich mal getestet.

git reset --hard HEAD composer.lock

hatte ich folgende Meldung 

fatal: Cannot do hard reset with paths.

wenn ich 

sudo git checkout composer.lock

ausführe kommt keine Meldung und nach dem Befehl

sudo git pull

remote: Counting objects: 19, done.
remote: Compressing objects: 100% (19/19), done.
remote: Total 19 (delta 9), reused 1 (delta 0)
Unpacking objects: 100% (19/19), done.
From https://github.com/volkszaehler/volkszaehler.org
   eceaec8..8929538  master     -> origin/master
Updating 3600dab..8929538
Fast-forward
 .gitignore                                                 |    1 +
 .travis.yml                                                |   13 +-
 composer.json                                              |   12 +-
 composer.lock                                              | 1074 -----------------------------------------------------------
 gulpfile.js                                                |   69 ++++
 htdocs/frontend/images/blank.png                           |  Bin 0 -> 97 bytes
 htdocs/frontend/images/json.png                            |  Bin 0 -> 1065 bytes
 htdocs/frontend/images/sprites.png                         |  Bin 0 -> 22400 bytes
 htdocs/frontend/images/types/pipe.png                      |  Bin 0 -> 959 bytes
 htdocs/frontend/images/xml.png                             |  Bin 488 -> 1069 bytes
 htdocs/frontend/index.html                                 |   50 +--
 htdocs/frontend/javascripts/entities.js                    |  131 ++++++--
 htdocs/frontend/javascripts/entity.js                      |  207 +++++++++---
 htdocs/frontend/javascripts/flot/jquery.flot.axislabels.js |  467 ++++++++++++++++++++++++++
 htdocs/frontend/javascripts/flot/jquery.flot.xgap.js       |  128 +++++++
 htdocs/frontend/javascripts/functions.js                   |   84 +++--
 htdocs/frontend/javascripts/helper.js                      |   18 +-
 htdocs/frontend/javascripts/init.js                        |   47 ++-
 htdocs/frontend/javascripts/options.js                     |   18 +-
 htdocs/frontend/javascripts/property.js                    |   30 +-
 htdocs/frontend/javascripts/wui.js                         |  112 ++++---
 htdocs/frontend/stylesheets/sprites.css                    |  180 ++++++++++
 htdocs/frontend/stylesheets/style.css                      |   54 +--
 lib/Volkszaehler/Controller/DataController.php             |   58 ++--
 lib/Volkszaehler/Controller/EntityController.php           |   55 +--
 lib/Volkszaehler/Definition/EntityDefinition.json          |   47 ++-
 lib/Volkszaehler/Definition/EntityDefinition.php           |    2 +-
 lib/Volkszaehler/Definition/PropertyDefinition.json        |   41 ++-
 lib/Volkszaehler/Interpreter/DataIterator.php              |   16 +-
 lib/Volkszaehler/Interpreter/Interpreter.php               |   15 +-
 lib/Volkszaehler/Interpreter/MeterInterpreter.php          |   16 +
 lib/Volkszaehler/Interpreter/SQL/MySQLOptimizer.php        |   98 +++++-
 lib/Volkszaehler/Interpreter/SQL/SQLOptimizer.php          |    2 +-
 lib/Volkszaehler/Interpreter/SensorInterpreter.php         |   31 +-
 lib/Volkszaehler/Model/Aggregate.php                       |    2 +-
 lib/Volkszaehler/Model/Data.php                            |    2 +-
 lib/Volkszaehler/Model/Entity.php                          |   17 +-
 lib/Volkszaehler/Model/Property.php                        |    2 +-
 lib/Volkszaehler/Util/Aggregation.php                      |   48 ++-
 lib/Volkszaehler/Util/Console.php                          |  127 -------
 lib/Volkszaehler/Util/ConsoleApplication.php               |   85 +++++
 lib/Volkszaehler/View/HTTP/Request.php                     |   18 +-
 misc/tools/aggregate.php                                   |  164 ++++-----
 misc/tools/dbcopy.json                                     |   46 +++
 misc/tools/install.sh                                      |  135 ++++----
 misc/tools/model_helper.php                                |  103 ++++++
 misc/tools/vzclient                                        |   17 +-
 misc/tools/vzmonitor                                       |    2 +-
 package.json                                               |   25 ++
 test/Tests/DataContext.php                                 |    8 +-
 test/Tests/DataCounterTest.php                             |    1 +
 test/Tests/DataSensorTest.php                              |  264 ++++++++++++++-
 test/Tests/Entity.php                                      |  118 +++++++
 test/Tests/SetupPerformanceData.php                        |    5 +-
 test/phpunit.xml                                           |    6 +-
 55 files changed, 2538 insertions(+), 1733 deletions(-)
 delete mode 100644 composer.lock
 create mode 100644 gulpfile.js
 create mode 100644 htdocs/frontend/images/blank.png
 create mode 100644 htdocs/frontend/images/json.png
 create mode 100644 htdocs/frontend/images/sprites.png
 create mode 100644 htdocs/frontend/images/types/pipe.png
 create mode 100644 htdocs/frontend/javascripts/flot/jquery.flot.axislabels.js
 create mode 100644 htdocs/frontend/javascripts/flot/jquery.flot.xgap.js
 create mode 100644 htdocs/frontend/stylesheets/sprites.css
 delete mode 100644 lib/Volkszaehler/Util/Console.php
 create mode 100644 lib/Volkszaehler/Util/ConsoleApplication.php
 create mode 100644 misc/tools/dbcopy.json
 create mode 100644 misc/tools/model_helper.php
 create mode 100644 package.json
 create mode 100644 test/Tests/Entity.php


dann habe ich neu gebotet und nun ist das Verzeichnis 
/var/www

veeschwunden):

Was ist nun schon wieder?

Verzweifle noch an dem Update.


Gruß

Daniel


> Am 17.12.2014 um 22:55 schrieb Andreas Goetz <cpuidle at gmail.com>:
> 
> > sudo git checkout composer.lock

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://demo.volkszaehler.org/pipermail/volkszaehler-users/attachments/20141218/79114f4b/attachment-0001.html>