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

git status again problematic #217

Open
KrisThielemans opened this issue Mar 18, 2024 · 3 comments
Open

git status again problematic #217

KrisThielemans opened this issue Mar 18, 2024 · 3 comments

Comments

@KrisThielemans
Copy link
Member

After installing latest nbstripout (0.7.1):

sirfuser@vagrant:~/devel/SIRF-Exercises$ git checkout master
sirfuser@vagrant:~/devel/SIRF-Exercises$ git fetch origin
sirfuser@vagrant:~/devel/SIRF-Exercises$ git reset --hard origin/master
HEAD is now at 33fae8f replace MR data used for intro/synergistic notebooks (#214)
sirfuser@vagrant:~/devel/SIRF-Exercises$ git pull
Already up to date.
sirfuser@vagrant:~/devel/SIRF-Exercises$ git status
Refresh index: 100% (97/97), done.
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   notebooks/Geometry/a_geometry.ipynb
	modified:   notebooks/Geometry/b_geom_resamp.ipynb
	modified:   notebooks/Geometry/c_fully3dgeom.ipynb
	modified:   notebooks/Geometry/d_manipulation.ipynb
	modified:   notebooks/Geometry/get_nifti_data.ipynb
	modified:   notebooks/MR/e_advanced_recon.ipynb
	modified:   notebooks/MR/f_create_undersampled_kspace.ipynb
	modified:   notebooks/PET/reconstruct_measured_data.ipynb
	modified:   notebooks/SPECT/SPECT_OSEM_measured_data.ipynb
	modified:   notebooks/SPECT/SPECT_OSEM_measured_data_solution.ipynb
	modified:   notebooks/SPECT/SPECT_acquisition_model.ipynb
no changes added to commit (use "git add" and/or "git commit -a")
sirfuser@vagrant:~/devel/SIRF-Exercises$ git diff
sirfuser@vagrant:~/devel/SIRF-Exercises$ 
sirfuser@vagrant:~/devel/SIRF-Exercises$ nbstripout --uninstall
sirfuser@vagrant:~/devel/SIRF-Exercises$ git status
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean

I despair a bit...

@casperdcl Should we just drop the nbstripout --install?

@casperdcl
Copy link
Member

what's the git diff of the allegedly modified notebooks?

@KrisThielemans
Copy link
Member Author

Seems to be only id, e.g.

index 0ec217e..464cd1d 100644
--- a/notebooks/Geometry/a_geometry.ipynb
+++ b/notebooks/Geometry/a_geometry.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "markdown",
-   "id": "94bdaed3",
+   "id": "0",
    "metadata": {},
    "source": [
     "# Geometry in SIRF"
@ -10,7 +10,7 @@
   },
   {
    "cell_type": "markdown",
-   "id": "da4eab04",
+   "id": "1",
    "metadata": {},
    "source": [
     "Authors: David Atkinson\n",

@casperdcl
Copy link
Member

casperdcl commented Apr 12, 2024

I have the latest (nbstripout==0.7.1) and I don't have any complaints from git status.

Maybe an older version was installed?

nbstripout --uninstall
nbstripout --install
git status

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

No branches or pull requests

2 participants