Home | About | Sematext search-lucene.com search-hadoop.com
NEW: Monitor These Apps!
elasticsearch, apache solr, apache hbase, hadoop, redis, casssandra, amazon cloudwatch, mysql, memcached, apache kafka, apache zookeeper, apache storm, ubuntu, centOS, red hat, debian, puppet labs, java, senseiDB
 Search Hadoop and all its subprojects:

Switch to Threaded View
HBase >> mail # dev >> Re: Line ending woes


Copy link to this message
-
Re: Line ending woes
I shudder to think of committing a normalization of line endings. I would
suggest where CRLF has crept into the code base, we can fix it where we
find it. To avoid new commits of it, we could consider adding a line ending
style check to dev-support/test-patch.sh.
On Thu, Jan 24, 2013 at 10:40 AM, Nick Dimiduk <[EMAIL PROTECTED]> wrote:

> Hi devs,
>
> One of the recent line-ending commits has mucked with my sandbox. Following
> a pull from trunk in a clean sandbox (or a fresh clone), git status reveals
> edits. The diff shows ^M characters to be the cause.
>
> soleil:tmp ndimiduk$ *git clone git://git.apache.org/hbase.git*
> Cloning into 'hbase'...
> remote: Counting objects: 155364, done.
> remote: Compressing objects: 100% (36184/36184), done.
> Receiving objects: 100% (155364/155364), 140.29 MiB | 546 KiB/s, done.
> remote: Total 155364 (delta 89833), reused 144508 (delta 80136)
> Resolving deltas: 100% (89833/89833), done.
> soleil:tmp ndimiduk$ cd hbase/
> soleil:hbase ndimiduk$ *git status*
> # On branch trunk
> # 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:
> hbase-server/src/main/resources/hbase-webapps/static/js/jquery.min.js
> #       modified:
>
> hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestRecoverableZooKeeper.java
> #
> no changes added to commit (use "git add" and/or "git commit -a")
> soleil:hbase ndimiduk$ *git diff*
> *warning: CRLF will be replaced by LF in
> hbase-server/src/main/resources/hbase-webapps/static/js/jquery.min.js.*
> *The file will have its original line endings in your working directory.*
> *warning: CRLF will be replaced by LF in
>
> hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestRecoverableZooKeeper.java.
> *
> *The file will have its original line endings in your working directory.*
> diff --git
> a/hbase-server/src/main/resources/hbase-webapps/static/js/jquery.min.js
> b/hbase-server/src/main/resources/hbase-webapps/static/js/jquery.min.js
> index 83589da..3883779 100644
> --- a/hbase-server/src/main/resources/hbase-webapps/static/js/jquery.min.js
> +++ b/hbase-server/src/main/resources/hbase-webapps/static/js/jquery.min.js
> @@ -1,2 +1,2 @@
> -/*! jQuery v1.8.3 jquery.com | jquery.org/license */
> +/*! jQuery v1.8.3 jquery.com | jquery.org/license */
>  (function(e,t){function _(e){var t=M[e]={};return
> v.each(e.split(y),function(e,n){t[n]=!0}),t}function
> H(e,n,r){if(r===t&&e.nodeType===1){var
> i="data-"+n.replace(P,"-$1").toLowerCase();r=e.get
> \ No newline at end of file
> diff --git
>
> a/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestRecoverableZooKeeper.java
>
> b/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestRecoverableZooKeeper.j
> index 6bf5869..f805ca4 100644
> ---
>
> a/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestRecoverableZooKeeper.java
> +++
>
> b/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestRecoverableZooKeeper.java
> @@ -1,123 +1,123 @@
> ...
>
> I searched about, hoping for a solution. This link [0] appears promising.
> performing the steps outlined results in a commit and a clean working
> directory, but my git-foo is weak in this area. Can anyone advise to the
> best approach here? For reference, this development machine is running OSX
> (relevant?) on the infernal case-insensitive-but-preserving filesystem
> (unrelated?).
>
> Thanks,
> Nick
>
> [0]: https://help.github.com/articles/dealing-with-line-endings
>

--
Best regards,

   - Andy

Problems worthy of attack prove their worth by hitting back. - Piet Hein
(via Tom White)
NEW: Monitor These Apps!
elasticsearch, apache solr, apache hbase, hadoop, redis, casssandra, amazon cloudwatch, mysql, memcached, apache kafka, apache zookeeper, apache storm, ubuntu, centOS, red hat, debian, puppet labs, java, senseiDB