Skip to content

Commit

Permalink
Merge branch 'master' into ralphcallaway-test_methods
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
  • Loading branch information
ChuckJonas committed Oct 31, 2019
2 parents bc0e6ff + c3390fd commit 5a23c0d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sfdx-git-packager",
"description": "Generates a package.xml for difference between two branches",
"version": "0.0.3",
"version": "0.0.4",
"author": "Charlie Jonas @ChuckJonas",
"bugs": "https://github.com/ChuckJonas/sfdx-git-diff-to-pkg/issues",
"dependencies": {
Expand Down
5 changes: 3 additions & 2 deletions src/commands/git/package.ts
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ export default class Package extends SfdxCommand {
}

for (let mdPath of metadataPaths) {

if (isAbsolute(mdPath)) {
mdPath = relative(this.projectPath, mdPath);
}
Expand Down Expand Up @@ -258,7 +257,9 @@ export default class Package extends SfdxCommand {
const notFullyRemoved = [];
for (const path of removed) {
const resolver = getResolver(path);

if (!resolver) {
continue;
}
if (resolver.getIsDirectory()) {
const metadataPaths = await resolver.getMetadataPaths(path, targetRef);
// current implementation will return meta file regardless of whether it exists in org or not
Expand Down

0 comments on commit 5a23c0d

Please sign in to comment.