da się to jakoś przywrócić do "normalności"?
2015-10-28 21:44 GMT+01:00 Marcin marcin@nicram.net:
teraz to sobie zrombałem wszystko :/ w tmp zrobiłem commita, zaczął walić błędami "The file will have its original line endings in your working directory". po powrocie do źródła mam to samo :/
2015-10-28 21:19 GMT+01:00 Marcin marcin@nicram.net:
hmm, .gitattribures jest identyczne ze źródłem :/
#v+marcin@sabayon ~/git $ cp -ar lms /tmp/ cp: cannot open ‘lms/.git/objects/b2/sedSt2INa’ for reading: Permission denied marcin@sabayon ~/git $ l lms/.git/objects/b2/sedSt2INa ---------- 1 marcin marcin 0 Apr 16 2015 lms/.git/objects/b2/sedSt2INa marcin@sabayon ~/git $ cd /tmp/lms/ marcin@sabayon /tmp/lms $ cat .gitattributes *.php text eol=lf *.html text eol=lf *.c text eol=lf *.h text eol=lf *.js text eol=lf *.css text eol=lf *.sh text eol=lf *.txt text eol=lf
lib/LMS.class.php export-subst marcin@sabayon /tmp/lms $ git status
On branch master Your branch is up-to-date with 'origin/master'. Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory)
modified: img/tinymce3/license.txt modified: img/tinymce3/plugins/advhr/css/advhr.css modified: img/tinymce3/plugins/advhr/js/rule.js modified: img/tinymce3/plugins/advimage/css/advimage.css modified: img/tinymce3/plugins/advimage/js/image.js modified: img/tinymce3/plugins/advlink/css/advlink.css modified: img/tinymce3/plugins/advlink/js/advlink.js modified: img/tinymce3/plugins/emotions/js/emotions.js modified: img/tinymce3/plugins/example/js/dialog.js modified: img/tinymce3/plugins/example/langs/en.js modified: img/tinymce3/plugins/example/langs/en_dlg.js modified: img/tinymce3/plugins/fullpage/css/fullpage.css modified: img/tinymce3/plugins/fullpage/js/fullpage.js modified: img/tinymce3/plugins/media/css/media.css modified: img/tinymce3/plugins/media/js/embed.js modified: img/tinymce3/plugins/media/js/media.js modified: img/tinymce3/plugins/paste/js/pastetext.js modified: img/tinymce3/plugins/paste/js/pasteword.js modified: img/tinymce3/plugins/preview/example.html modified: img/tinymce3/plugins/preview/jscripts/embed.js modified: img/tinymce3/plugins/preview/preview.html modified: img/tinymce3/plugins/searchreplace/css/searchreplace.css modified: img/tinymce3/plugins/searchreplace/js/searchreplace.js modified: img/tinymce3/plugins/spellchecker/css/content.css modified: img/tinymce3/plugins/style/css/props.css modified: img/tinymce3/plugins/style/js/props.js modified: img/tinymce3/plugins/table/css/cell.css modified: img/tinymce3/plugins/table/css/row.css modified: img/tinymce3/plugins/table/css/table.css modified: img/tinymce3/plugins/table/js/cell.js modified: img/tinymce3/plugins/table/js/merge_cells.js modified: img/tinymce3/plugins/table/js/row.js modified: img/tinymce3/plugins/table/js/table.js modified: img/tinymce3/plugins/template/css/template.css modified: img/tinymce3/plugins/template/js/template.js modified: img/tinymce3/plugins/visualblocks/css/visualblocks.css modified: img/tinymce3/plugins/xhtmlxtras/css/attributes.css modified: img/tinymce3/plugins/xhtmlxtras/css/popup.css modified: img/tinymce3/plugins/xhtmlxtras/js/abbr.js modified: img/tinymce3/plugins/xhtmlxtras/js/acronym.js modified: img/tinymce3/plugins/xhtmlxtras/js/attributes.js modified: img/tinymce3/plugins/xhtmlxtras/js/cite.js modified: img/tinymce3/plugins/xhtmlxtras/js/del.js modified: img/tinymce3/plugins/xhtmlxtras/js/element_common.js modified: img/tinymce3/plugins/xhtmlxtras/js/ins.js modified: img/tinymce3/themes/advanced/editor_template_src.js modified: img/tinymce3/themes/advanced/js/about.js modified: img/tinymce3/themes/advanced/js/anchor.js modified: img/tinymce3/themes/advanced/js/charmap.js modified: img/tinymce3/themes/advanced/js/image.js modified: img/tinymce3/themes/advanced/js/link.js modified: img/tinymce3/themes/advanced/js/source_editor.js modified: img/tinymce3/themes/advanced/skins/default/content.css modified: img/tinymce3/themes/advanced/skins/default/dialog.css modified: img/tinymce3/themes/advanced/skins/default/ui.css modified:img/tinymce3/themes/advanced/skins/highcontrast/content.css modified: img/tinymce3/themes/advanced/skins/highcontrast/dialog.css modified: img/tinymce3/themes/advanced/skins/highcontrast/ui.css modified: img/tinymce3/themes/advanced/skins/o2k7/content.css modified: img/tinymce3/themes/advanced/skins/o2k7/dialog.css modified: img/tinymce3/themes/advanced/skins/o2k7/ui.css modified: img/tinymce3/themes/advanced/skins/o2k7/ui_black.css modified: img/tinymce3/themes/advanced/skins/o2k7/ui_silver.css modified: img/tinymce3/themes/simple/editor_template_src.js modified: img/tinymce3/themes/simple/skins/default/content.css modified: img/tinymce3/themes/simple/skins/default/ui.css modified: img/tinymce3/themes/simple/skins/o2k7/content.css modified: img/tinymce3/themes/simple/skins/o2k7/ui.css modified: img/tinymce3/utils/editable_selects.js modified: img/tinymce3/utils/form_utils.js modified: img/tinymce3/utils/mctabs.js modified: img/tinymce3/utils/validate.js modified: lib/xajax/copyright.inc.php modified: lib/xajax/xajax_core/plugin_layer/xajaxEventPlugin.inc.php modified: userpanel/style/default/overlib.js
no changes added to commit (use "git add" and/or "git commit -a") marcin@sabayon /tmp/lms $ #v-
2015-10-28 21:07 GMT+01:00 Tomasz Chiliński tomasz.chilinski@chilan.com :
W dniu 28.10.2015 20:51, Marcin napisał(a):
Witam Przekopiowałem cała zawartosc katalogu z gitem na drugiego laptopa. w zrodle "git status" mint lms # git status On branch master Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean mint lms #
kopia binarna katalogu i mam: #v+ mint@mint ~/lms $ git status On branch master Your branch is up-to-date with 'origin/master'.
Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory)
modified: img/tinymce3/license.txt modified: img/tinymce3/plugins/advhr/css/advhr.css modified: img/tinymce3/plugins/advhr/js/rule.js modified: img/tinymce3/plugins/advimage/css/advimage.css modified: img/tinymce3/plugins/advimage/js/image.js modified: img/tinymce3/plugins/advlink/css/advlink.css modified: img/tinymce3/plugins/advlink/js/advlink.js modified: img/tinymce3/plugins/emotions/js/emotions.js modified: img/tinymce3/plugins/example/js/dialog.js modified: img/tinymce3/plugins/example/langs/en.js modified: img/tinymce3/plugins/example/langs/en_dlg.js modified: img/tinymce3/plugins/fullpage/css/fullpage.css modified: img/tinymce3/plugins/fullpage/js/fullpage.js modified: img/tinymce3/plugins/media/css/media.css modified: img/tinymce3/plugins/media/js/embed.js modified: img/tinymce3/plugins/media/js/media.js modified: img/tinymce3/plugins/paste/js/pastetext.js modified: img/tinymce3/plugins/paste/js/pasteword.js modified: img/tinymce3/plugins/preview/example.html modified: img/tinymce3/plugins/preview/jscripts/embed.js modified: img/tinymce3/plugins/preview/preview.html modified:img/tinymce3/plugins/searchreplace/css/searchreplace.css modified: img/tinymce3/plugins/searchreplace/js/searchreplace.js modified: img/tinymce3/plugins/spellchecker/css/content.css modified: img/tinymce3/plugins/style/css/props.css modified: img/tinymce3/plugins/style/js/props.js modified: img/tinymce3/plugins/table/css/cell.css modified: img/tinymce3/plugins/table/css/row.css modified: img/tinymce3/plugins/table/css/table.css modified: img/tinymce3/plugins/table/js/cell.js modified: img/tinymce3/plugins/table/js/merge_cells.js modified: img/tinymce3/plugins/table/js/row.js modified: img/tinymce3/plugins/table/js/table.js modified: img/tinymce3/plugins/template/css/template.css modified: img/tinymce3/plugins/template/js/template.js modified: img/tinymce3/plugins/visualblocks/css/visualblocks.css modified: img/tinymce3/plugins/xhtmlxtras/css/attributes.css modified: img/tinymce3/plugins/xhtmlxtras/css/popup.css modified: img/tinymce3/plugins/xhtmlxtras/js/abbr.js modified: img/tinymce3/plugins/xhtmlxtras/js/acronym.js modified: img/tinymce3/plugins/xhtmlxtras/js/attributes.js modified: img/tinymce3/plugins/xhtmlxtras/js/cite.js modified: img/tinymce3/plugins/xhtmlxtras/js/del.js modified: img/tinymce3/plugins/xhtmlxtras/js/element_common.js modified: img/tinymce3/plugins/xhtmlxtras/js/ins.js modified: img/tinymce3/themes/advanced/editor_template_src.js modified: img/tinymce3/themes/advanced/js/about.js modified: img/tinymce3/themes/advanced/js/anchor.js modified: img/tinymce3/themes/advanced/js/charmap.js modified: img/tinymce3/themes/advanced/js/image.js modified: img/tinymce3/themes/advanced/js/link.js modified: img/tinymce3/themes/advanced/js/source_editor.js modified: img/tinymce3/themes/advanced/skins/default/content.css modified: img/tinymce3/themes/advanced/skins/default/dialog.css modified: img/tinymce3/themes/advanced/skins/default/ui.css modified: img/tinymce3/themes/advanced/skins/highcontrast/content.css modified: img/tinymce3/themes/advanced/skins/highcontrast/dialog.css modified: img/tinymce3/themes/advanced/skins/highcontrast/ui.css modified: img/tinymce3/themes/advanced/skins/o2k7/content.css modified: img/tinymce3/themes/advanced/skins/o2k7/dialog.css modified: img/tinymce3/themes/advanced/skins/o2k7/ui.css modified: img/tinymce3/themes/advanced/skins/o2k7/ui_black.css modified: img/tinymce3/themes/advanced/skins/o2k7/ui_silver.css modified: img/tinymce3/themes/simple/editor_template_src.js modified: img/tinymce3/themes/simple/skins/default/content.css modified: img/tinymce3/themes/simple/skins/default/ui.css modified: img/tinymce3/themes/simple/skins/o2k7/content.css modified: img/tinymce3/themes/simple/skins/o2k7/ui.css modified: img/tinymce3/utils/editable_selects.js modified: img/tinymce3/utils/form_utils.js modified: img/tinymce3/utils/mctabs.js modified: img/tinymce3/utils/validate.js modified: lib/xajax/copyright.inc.php modified: lib/xajax/xajax_core/plugin_layer/xajaxEventPlugin.inc.php modified: userpanel/style/default/overlib.js
no changes added to commit (use "git add" and/or "git commit -a") mint@mint ~/lms $ #v-
Ktos mialby moze sugestie czemu tak sie dzieje? z gory dzieki
Hasło-"wytrych" - gitattributes.
--
Pozdrawiam Marcin / nicraM
-- Pozdrawiam Tomasz Chiliński, Chilan _______________________________________________ lms mailing list lms@lists.lms.org.pl http://lists.lms.org.pl/mailman/listinfo/lms
-- Pozdrawiam Marcin / nicraM
-- Pozdrawiam Marcin / nicraM