Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create git repository with initial commit #1288

Merged
merged 11 commits into from
Jan 19, 2018
Merged

Create git repository with initial commit #1288

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
03435a2
Create git repo with initial commit
mauricedb Dec 15, 2016
ec1fe18
Fixe commit message
mauricedb Dec 27, 2016
a721762
Added the git repo to the docs
mauricedb Dec 29, 2016
66fdb9a
Bail if we are in a mercurial repository
mauricedb Feb 9, 2017
f725934
Removed Chore from commit mesage
mauricedb Feb 9, 2017
e61343f
Create repo after installing react and react-dom
mauricedb Feb 12, 2017
05367bc
Removed docs
mauricedb Feb 12, 2017
b9cfee9
Merge branch 'next' into git-init
gaearon Jan 15, 2018
ff65875
Commit changes when ejecting
mauricedb Jan 16, 2018
7f15e12
Update after review
mauricedb Jan 19, 2018
bbd5c9a
git add -A instead of git add . after code review
mauricedb Jan 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 42 additions & 1 deletion packages/react-scripts/scripts/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,47 @@ process.on('unhandledRejection', err => {
const fs = require('fs-extra');
const path = require('path');
const chalk = require('chalk');
const execSync = require('child_process').execSync;
const spawn = require('react-dev-utils/crossSpawn');
const { defaultBrowsers } = require('react-dev-utils/browsersHelper');
const os = require('os');

function insideGitRepository() {
try {
execSync('git rev-parse --is-inside-work-tree', {stdio: 'ignore'});
return true;
} catch (e) {
return false;
}
}

function insideMercurialRepository() {
try {
execSync('hg --cwd . root', {stdio: 'ignore'});
return true;
} catch (e) {
return false;
}
}

function gitInit() {
try {
execSync('git --version', {stdio: 'ignore'});

if (insideGitRepository() || insideMercurialRepository()) {
return false;
}

execSync('git init', {stdio: 'ignore'});
execSync('git add .', {stdio: 'ignore'});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be git add -A?
(infact git add . covers create and update but this one feels more inclusive)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sendilkumarn Sure, no problem but there really is no difference. Using git add -A is the same as git add . with Git 2. With Git 1 it isn't the same but the difference is in deleted files. As this is a newly created repo there is not going to be any deleted files.

execSync('git commit -m "Initial commit from Create React App"', {stdio: 'ignore'});

return true;
} catch (e) {
return false;
}
}

module.exports = function(
appPath,
appName,
Expand Down Expand Up @@ -104,7 +141,7 @@ module.exports = function(
args = ['install', '--save', verbose && '--verbose'].filter(e => e);
}
args.push('react', 'react-dom');

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: can remove the space

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

// Install additional template dependencies, if present
const templateDependenciesPath = path.join(
appPath,
Expand Down Expand Up @@ -134,6 +171,10 @@ module.exports = function(
}
}

if (gitInit()) {
console.log('Initializing git repository');
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is done after git initialized so i guess it's better to say git repository initialized rather than initializing

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

}

// Display the most elegant way to cd.
// This needs to handle an undefined originalDirectory for
// backward compatibility with old global-cli's.
Expand Down
6 changes: 6 additions & 0 deletions tasks/e2e-kitchensink.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@ rm .babelrc
# Finally, let's check that everything still works after ejecting.
# ******************************************************************************

# Commiting changes
git config user.email "you@example.com"
git config user.name "Your Name"
git add .
git commit -m "Before npm run eject"

# Eject...
echo yes | npm run eject

Expand Down
6 changes: 6 additions & 0 deletions tasks/e2e-simple.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,12 @@ verify_module_scope
# Finally, let's check that everything still works after ejecting.
# ******************************************************************************

# Commiting changes
git config user.email "you@example.com"
git config user.name "Your Name"
git add .
git commit -m "Before npm run eject"

# Eject...
echo yes | npm run eject

Expand Down