bug when rename and change some content

[stevemao]

On the next branch

reality:

$ git show head
commit ad3c02c9d4f7879414274b4642bec2867be2029f (HEAD -> master, origin/master)
Author: Steve Mao <maochenyan@gmail.com>
Date:   Tue Aug 1 14:20:55 2017 +1000

    rename and change content

similarity index 85%
rename from b.txt
rename to a.txt
───────────────────────────────────────────────────────────────────────────────────────────────────
renamed: b.txt to a.txt
───────────────────────────────────────────────────────────────────────────────────────────────────

expected:

$ git show head
commit ad3c02c9d4f7879414274b4642bec2867be2029f (HEAD -> master, origin/master)
Author: Steve Mao <maochenyan@gmail.com>
Date:   Tue Aug 1 14:20:55 2017 +1000

    rename and change content

───────────────────────────────────────────────────────────────────────────────────────────────────
renamed: b.txt to a.txt
───────────────────────────────────────────────────────────────────────────────────────────────────

There shouldn't be

similarity index 85%
rename from b.txt
rename to a.txt

You can test this commit: stevemao/diff-so-fancy-test@ad3c02c

[scottchiefbaker]

How do you do a rename AND change content at the same time?

[stevemao]

When the similarity of the content reaches a percentage I believe. In this case its 85%.

You just need to rename and modify the content. You don't want to lose the history of a file just because of a name change.

[scottchiefbaker]

I thought the only way to change a file was git mv a.txt b.txt but that doesn't change any content. Can you walk me through the process so I can recreate this?

[stevemao]

yeah

touch a.txt
echo "height: '10px',
width: '100%',
display: 'block',
position: 'absolute',
bottom: '0'," > a.txt
git add a.txt
git commit -m 'add a.txt'
mv a.txt b.txt
echo "height: '10px',
width: '100%',
display: 'block',
position: 'absolute',
bottom: '0'" > b.txt
git add a.txt b.txt
git diff --staged

[stevemao]

I also found a very strange bug. See this commit: stevemao/diff-so-fancy-test@49d49ee

when you are on master branch and do git show head it looks fine. But if you remove that commit but don't reset the changes git reset HEAD^, then do git diff, you see two deleted:

───────────────────────────────────────────────────────────────────────────────────────────────────
deleted: client/styles/modules/Product/ProductCarousel.scss
───────────────────────────────────────────────────────────────────────────────────────────────────
deleted: client/styles/modules/Product/ProductCarousel.scss
───────────────────────────────────────────────────────────────────────────────────────────────────

Note I can only reproduce the bug when the diff of client/routes/Product/components/ProductCarousel.js is like that

[stevemao]

Another issue might be related: (sorry might be hard to replicate it in the test repo)

$ git diff --staged
───────────────────────────────────────────────────────────────────────────────────────────────────
modified: client/App/components/Routes.js
Use of uninitialized value $next in pattern match (m//) at /Users/whitech/.nvm/versions/node/v6.10.3/bin/diff-so-fancy line 247, <STDIN> line 25.
───────────────────────────────────────────────────────────────────────────────────────────────────

git diff --staged
diff --git client/App/components/Routes.js client/App/components/Routes.js
index d5547f9c..cd26cdbe 100644
--- client/App/components/Routes.js
+++ client/App/components/Routes.js
@@ -13,7 +13,7 @@ import Products from '../../routes/Products/containers/Products';
 import Product from '../../routes/Product/containers/Product';
 import PhotoSelection from '../../routes/PhotoSelection/containers/PhotoSelection';
 import Search from '../../routes/Search/containers/Search';
-import ShoppingCartItem from '../../routes/ShoppingCart/containers/Item';
+import ShoppingCartItem from '../../routes/ShoppingCart/containers/ShoppingCartItem';
 import * as flashActionTypes from '../../constants/flashActionTypes';
 
 export default class Routes extends PureComponent {
@@ -74,7 +74,7 @@ export default class Routes extends PureComponent {
           }
           <Route path="photo-selection/:type(/:query)(/:page)" component={PhotoSelection} {... { showFullHeader: true, noHeader: false, title: 'Select Photos for your project' }} />
           <Route path="my-account" component={HybridViewer} {... { flashNavigateTo: flashActionTypes.SHOW_MY_ACCOUNT, isHybrid: true, title: 'My Account' }} />
-          <Route path="shopping-cart/add-to-cart/:shoppingCartId" component={ShoppingCartItem} />
+          <Route path="shopping-cart/add-to-cart/:shoppingCartId" component={Item} />
           <Route path="shopping-cart" component={HybridViewer} {... { flashNavigateTo: flashActionTypes.SHOW_SHOPPING_CART, isHybrid: true, title: 'Shopping Cart' }} />
           <Route path="sign-in" component={HybridViewer} {... { flashNavigateTo: flashActionTypes.SHOW_SIGN_IN, isHybrid: true, title: 'Sign In' }} />
           <Route path="sign-out" component={HybridViewer} {... { flashNavigateTo: flashActionTypes.SHOW_SIGN_OUT, isHybrid: true, title: 'Sign Out' }} />
diff --git client/routes/ShoppingCart/components/Item.js client/routes/ShoppingCart/components/AddToCart.js
similarity index 100%
rename from client/routes/ShoppingCart/components/Item.js
rename to client/routes/ShoppingCart/components/AddToCart.js
diff --git client/routes/ShoppingCart/containers/AddToCart.js client/routes/ShoppingCart/containers/AddToCart.js
new file mode 100644
index 00000000..0dddb973
--- /dev/null
+++ client/routes/ShoppingCart/containers/AddToCart.js
@@ -0,0 +1,7 @@
+import { connect } from 'react-redux';
+import AddToCart from '../components/AddToCart';
+
+export const mapStateToProps = state => ({
+});
+
+export default connect(mapStateToProps)(AddToCart);
diff --git client/routes/ShoppingCart/containers/Item.js client/routes/ShoppingCart/containers/Item.js
deleted file mode 100644
index 584ad045..00000000
--- client/routes/ShoppingCart/containers/Item.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { connect } from 'react-redux';
-import Item from '../components/Item';
-
-export const mapStateToProps = state => ({
-});
-
-export default connect(mapStateToProps)(Item);



git diff --staged --color
[1;33mdiff --git client/App/components/Routes.js client/App/components/Routes.js[m
[1;33mindex d5547f9c..cd26cdbe 100644[m
[1;33m--- client/App/components/Routes.js[m
[1;33m+++ client/App/components/Routes.js[m
[1;35m@@ -13,7 +13,7 @@[m [mimport Products from '../../routes/Products/containers/Products';[m
 import Product from '../../routes/Product/containers/Product';[m
 import PhotoSelection from '../../routes/PhotoSelection/containers/PhotoSelection';[m
 import Search from '../../routes/Search/containers/Search';[m
[31m-import ShoppingCartItem from '../../routes/ShoppingCart/containers/Item';[m
[32m+[m[32mimport ShoppingCartItem from '../../routes/ShoppingCart/containers/ShoppingCartItem';[m
 import * as flashActionTypes from '../../constants/flashActionTypes';[m
 [m
 export default class Routes extends PureComponent {[m
[1;35m@@ -74,7 +74,7 @@[m [mexport default class Routes extends PureComponent {[m
           }[m
           <Route path="photo-selection/:type(/:query)(/:page)" component={PhotoSelection} {... { showFullHeader: true, noHeader: false, title: 'Select Photos for your project' }} />[m
           <Route path="my-account" component={HybridViewer} {... { flashNavigateTo: flashActionTypes.SHOW_MY_ACCOUNT, isHybrid: true, title: 'My Account' }} />[m
[31m-          <Route path="shopping-cart/add-to-cart/:shoppingCartId" component={ShoppingCartItem} />[m
[32m+[m[32m          <Route path="shopping-cart/add-to-cart/:shoppingCartId" component={Item} />[m
           <Route path="shopping-cart" component={HybridViewer} {... { flashNavigateTo: flashActionTypes.SHOW_SHOPPING_CART, isHybrid: true, title: 'Shopping Cart' }} />[m
           <Route path="sign-in" component={HybridViewer} {... { flashNavigateTo: flashActionTypes.SHOW_SIGN_IN, isHybrid: true, title: 'Sign In' }} />[m
           <Route path="sign-out" component={HybridViewer} {... { flashNavigateTo: flashActionTypes.SHOW_SIGN_OUT, isHybrid: true, title: 'Sign Out' }} />[m
[1;33mdiff --git client/routes/ShoppingCart/components/Item.js client/routes/ShoppingCart/components/AddToCart.js[m
[1;33msimilarity index 100%[m
[1;33mrename from client/routes/ShoppingCart/components/Item.js[m
[1;33mrename to client/routes/ShoppingCart/components/AddToCart.js[m
[1;33mdiff --git client/routes/ShoppingCart/containers/AddToCart.js client/routes/ShoppingCart/containers/AddToCart.js[m
[1;33mnew file mode 100644[m
[1;33mindex 00000000..0dddb973[m
[1;33m--- /dev/null[m
[1;33m+++ client/routes/ShoppingCart/containers/AddToCart.js[m
[1;35m@@ -0,0 +1,7 @@[m
[32m+[m[32mimport { connect } from 'react-redux';[m
[32m+[m[32mimport AddToCart from '../components/AddToCart';[m
[32m+[m
[32m+[m[32mexport const mapStateToProps = state => ({[m
[32m+[m[32m});[m
[32m+[m
[32m+[m[32mexport default connect(mapStateToProps)(AddToCart);[m
[1;33mdiff --git client/routes/ShoppingCart/containers/Item.js client/routes/ShoppingCart/containers/Item.js[m
[1;33mdeleted file mode 100644[m
[1;33mindex 584ad045..00000000[m
[1;33m--- client/routes/ShoppingCart/containers/Item.js[m
[1;33m+++ /dev/null[m
[1;35m@@ -1,7 +0,0 @@[m
[31m-import { connect } from 'react-redux';[m
[31m-import Item from '../components/Item';[m
[31m-[m
[31m-export const mapStateToProps = state => ({[m
[31m-});[m
[31m-[m
[31m-export default connect(mapStateToProps)(Item);[m
git config pager.diff
git config pager.show


Without diff-so-fancy (--no-pager)

git --no-pager diff --staged
diff --git client/App/components/Routes.js client/App/components/Routes.js
index d5547f9c..cd26cdbe 100644
--- client/App/components/Routes.js
+++ client/App/components/Routes.js
@@ -13,7 +13,7 @@ import Products from '../../routes/Products/containers/Products';
 import Product from '../../routes/Product/containers/Product';
 import PhotoSelection from '../../routes/PhotoSelection/containers/PhotoSelection';
 import Search from '../../routes/Search/containers/Search';
-import ShoppingCartItem from '../../routes/ShoppingCart/containers/Item';
+import ShoppingCartItem from '../../routes/ShoppingCart/containers/ShoppingCartItem';
 import * as flashActionTypes from '../../constants/flashActionTypes';
 
 export default class Routes extends PureComponent {
@@ -74,7 +74,7 @@ export default class Routes extends PureComponent {
           }
           <Route path="photo-selection/:type(/:query)(/:page)" component={PhotoSelection} {... { showFullHeader: true, noHeader: false, title: 'Select Photos for your project' }} />
           <Route path="my-account" component={HybridViewer} {... { flashNavigateTo: flashActionTypes.SHOW_MY_ACCOUNT, isHybrid: true, title: 'My Account' }} />
-          <Route path="shopping-cart/add-to-cart/:shoppingCartId" component={ShoppingCartItem} />
+          <Route path="shopping-cart/add-to-cart/:shoppingCartId" component={Item} />
           <Route path="shopping-cart" component={HybridViewer} {... { flashNavigateTo: flashActionTypes.SHOW_SHOPPING_CART, isHybrid: true, title: 'Shopping Cart' }} />
           <Route path="sign-in" component={HybridViewer} {... { flashNavigateTo: flashActionTypes.SHOW_SIGN_IN, isHybrid: true, title: 'Sign In' }} />
           <Route path="sign-out" component={HybridViewer} {... { flashNavigateTo: flashActionTypes.SHOW_SIGN_OUT, isHybrid: true, title: 'Sign Out' }} />
diff --git client/routes/ShoppingCart/components/Item.js client/routes/ShoppingCart/components/AddToCart.js
similarity index 100%
rename from client/routes/ShoppingCart/components/Item.js
rename to client/routes/ShoppingCart/components/AddToCart.js
diff --git client/routes/ShoppingCart/containers/AddToCart.js client/routes/ShoppingCart/containers/AddToCart.js
new file mode 100644
index 00000000..0dddb973
--- /dev/null
+++ client/routes/ShoppingCart/containers/AddToCart.js
@@ -0,0 +1,7 @@
+import { connect } from 'react-redux';
+import AddToCart from '../components/AddToCart';
+
+export const mapStateToProps = state => ({
+});
+
+export default connect(mapStateToProps)(AddToCart);
diff --git client/routes/ShoppingCart/containers/Item.js client/routes/ShoppingCart/containers/Item.js
deleted file mode 100644
index 584ad045..00000000
--- client/routes/ShoppingCart/containers/Item.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { connect } from 'react-redux';
-import Item from '../components/Item';
-
-export const mapStateToProps = state => ({
-});
-
-export default connect(mapStateToProps)(Item);



git --no-pager diff --staged --color
[1;33mdiff --git client/App/components/Routes.js client/App/components/Routes.js[m
[1;33mindex d5547f9c..cd26cdbe 100644[m
[1;33m--- client/App/components/Routes.js[m
[1;33m+++ client/App/components/Routes.js[m
[1;35m@@ -13,7 +13,7 @@[m [mimport Products from '../../routes/Products/containers/Products';[m
 import Product from '../../routes/Product/containers/Product';[m
 import PhotoSelection from '../../routes/PhotoSelection/containers/PhotoSelection';[m
 import Search from '../../routes/Search/containers/Search';[m
[31m-import ShoppingCartItem from '../../routes/ShoppingCart/containers/Item';[m
[32m+[m[32mimport ShoppingCartItem from '../../routes/ShoppingCart/containers/ShoppingCartItem';[m
 import * as flashActionTypes from '../../constants/flashActionTypes';[m
 [m
 export default class Routes extends PureComponent {[m
[1;35m@@ -74,7 +74,7 @@[m [mexport default class Routes extends PureComponent {[m
           }[m
           <Route path="photo-selection/:type(/:query)(/:page)" component={PhotoSelection} {... { showFullHeader: true, noHeader: false, title: 'Select Photos for your project' }} />[m
           <Route path="my-account" component={HybridViewer} {... { flashNavigateTo: flashActionTypes.SHOW_MY_ACCOUNT, isHybrid: true, title: 'My Account' }} />[m
[31m-          <Route path="shopping-cart/add-to-cart/:shoppingCartId" component={ShoppingCartItem} />[m
[32m+[m[32m          <Route path="shopping-cart/add-to-cart/:shoppingCartId" component={Item} />[m
           <Route path="shopping-cart" component={HybridViewer} {... { flashNavigateTo: flashActionTypes.SHOW_SHOPPING_CART, isHybrid: true, title: 'Shopping Cart' }} />[m
           <Route path="sign-in" component={HybridViewer} {... { flashNavigateTo: flashActionTypes.SHOW_SIGN_IN, isHybrid: true, title: 'Sign In' }} />[m
           <Route path="sign-out" component={HybridViewer} {... { flashNavigateTo: flashActionTypes.SHOW_SIGN_OUT, isHybrid: true, title: 'Sign Out' }} />[m
[1;33mdiff --git client/routes/ShoppingCart/components/Item.js client/routes/ShoppingCart/components/AddToCart.js[m
[1;33msimilarity index 100%[m
[1;33mrename from client/routes/ShoppingCart/components/Item.js[m
[1;33mrename to client/routes/ShoppingCart/components/AddToCart.js[m
[1;33mdiff --git client/routes/ShoppingCart/containers/AddToCart.js client/routes/ShoppingCart/containers/AddToCart.js[m
[1;33mnew file mode 100644[m
[1;33mindex 00000000..0dddb973[m
[1;33m--- /dev/null[m
[1;33m+++ client/routes/ShoppingCart/containers/AddToCart.js[m
[1;35m@@ -0,0 +1,7 @@[m
[32m+[m[32mimport { connect } from 'react-redux';[m
[32m+[m[32mimport AddToCart from '../components/AddToCart';[m
[32m+[m
[32m+[m[32mexport const mapStateToProps = state => ({[m
[32m+[m[32m});[m
[32m+[m
[32m+[m[32mexport default connect(mapStateToProps)(AddToCart);[m
[1;33mdiff --git client/routes/ShoppingCart/containers/Item.js client/routes/ShoppingCart/containers/Item.js[m
[1;33mdeleted file mode 100644[m
[1;33mindex 584ad045..00000000[m
[1;33m--- client/routes/ShoppingCart/containers/Item.js[m
[1;33m+++ /dev/null[m
[1;35m@@ -1,7 +0,0 @@[m
[31m-import { connect } from 'react-redux';[m
[31m-import Item from '../components/Item';[m
[31m-[m
[31m-export const mapStateToProps = state => ({[m
[31m-});[m
[31m-[m
[31m-export default connect(mapStateToProps)(Item);[m
git config pager.diff
git config pager.show


[scottchiefbaker]

Can you retest with that fix?

[stevemao]

Looks like my original bug was fixed but #258 (comment) still exists. Sorry should've probably created two tickets just thought those might be related

[scottchiefbaker]

If this issue is fixed, go ahead and close it and create a new issue for me to look at.

[stevemao]

Created two new issues. Thanks!