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.

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

Remove extra newline on changes #292

Conversation

BrandonCsSanders
Copy link

What does this implement/fix? Explain your changes.

Fixes #291

Does this close any currently open issues?

#291

@BrandonCsSanders BrandonCsSanders force-pushed the remove-extra-newline-on-changes branch 2 times, most recently from 5b787e1 to 1700b0f Compare December 28, 2018 17:12
@@ -50,7 +50,7 @@ function changes {
decrypted=$(_decrypt "$path" "0" "0" "$homedir" "$passphrase")

# Let's diff the result:
diff_result=$(diff -u <(echo "$decrypted") "$path") || true
diff_result=$(diff -u <(echo -n "$decrypted") "$path") || true
Copy link
Author

Choose a reason for hiding this comment

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

Earlier versions used echo for both decryped and current ... so did not show a diff because both had the extra newline. The switch to using $path rather than echo-ing the content is what surfaced this issue.

@joshrabinowitz
Copy link
Collaborator

@BrandonCsSanders can you please re-create this branch based on the master branch?
The docs in 2.4 aren't up-to-date, new branches should be cut from master.
(The current docs say this: https://github.com/sobolevn/git-secret/blob/master/CONTRIBUTING.md#branches )

@BrandonCsSanders BrandonCsSanders changed the base branch from develop to master December 28, 2018 20:04
@BrandonCsSanders
Copy link
Author

@BrandonCsSanders can you please re-create this branch based on the master branch?
The docs in 2.4 aren't up-to-date, new branches should be cut from master.
(The current docs say this: https://github.com/sobolevn/git-secret/blob/master/CONTRIBUTING.md#branches )

done

@joshrabinowitz
Copy link
Collaborator

joshrabinowitz commented Dec 29, 2018

I'm not sure this is an issue in git-secret master.
Can you confirm it is still an issue with a self-test in master?
I didn't spend a whole lot of time on it but I couldn't reproduce the underlying issue: See PR #293

@joshrabinowitz
Copy link
Collaborator

I figured out the issue, it is explained in #291

@joshrabinowitz
Copy link
Collaborator

Closing this PR as this issue is fixed in #293
Thank you so much for bringing this to our attention, and submitting this PR, @BrandonCsSanders

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

git-secret-changes use of echo adds a newline
2 participants