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

New branch is not "based on" selection #1089

Closed
guyer opened this issue Mar 13, 2022 · 1 comment · Fixed by #1095
Closed

New branch is not "based on" selection #1089

guyer opened this issue Mar 13, 2022 · 1 comment · Fixed by #1095
Assignees
Labels
bug Good first issue Good first issue to be tackled by new contributors status:Help Wanted

Comments

@guyer
Copy link

guyer commented Mar 13, 2022

Description

'Create branch based on...' is ignored. Branch is based on current branch.

Screen Shot 2022-03-13 at 2 07 44 PM

Screen Shot 2022-03-13 at 2 08 10 PM

Screen Shot 2022-03-13 at 2 08 58 PM

Screen Shot 2022-03-13 at 2 09 18 PM

Screen Shot 2022-03-13 at 2 09 29 PM

Screen Shot 2022-03-13 at 2 09 35 PM

Reproduce

  1. Create an empty directory.
  2. Select the git icon tab.
  3. Click 'Initialize a Repository'.
  4. Create a notebook.
  5. Add notebook to 'Staged' and commit.
  6. Make a branch. For 'Create branch based on...' select 'master'.
  7. Add content to notebook, save, stage, and commit to branch.
  8. Make another branch. For 'Create branch based on...', again select 'master'.
  9. Observe that notebook content is not empty, as it should be based on
    'master'.
  10. Select 'History' tab.
  11. Observe that new branch points to same commit as previous branch, not
    to 'master'.

Expected behavior

New branch should point to 'master'.

Context

  • Python package version:
# packages in environment at /Users/teaching/anaconda3:
#
# Name                    Version                   Build  Channel
jupyterlab-git            0.34.2             pyhd8ed1ab_0    conda-forge
  • Extension version:
JupyterLab v3.2.1
/Users/teaching/anaconda3/share/jupyter/labextensions
        nbdime-jupyterlab v2.1.1 enabled OK
        @jupyterlab/git v0.34.2 enabled OK (python, jupyterlab-git)
        @jupyter-widgets/jupyterlab-manager v3.0.0 enabled OK (python, jupyterlab_widgets)

Other labextensions (built into JupyterLab)
   app dir: /Users/teaching/anaconda3/share/jupyter/lab
  • Git version:
git version 2.32.0 (Apple Git-132)
  • Operating System and its version:
    • macOS Big Sur 11.6.4
    • Windows 11 Home 21H2 22000.318
Command Line Output See https://gist.github.com/guyer/74bd39276f5f85b1d839a17fa10ccbd0.
Web Browser Output
remoteEntry.e72301ad2381112336b1.js:1 Unsatisfied version 3.2.1 of shared singleton module @jupyterlab/application (required ^3.3.0-alpha.16)
d @ remoteEntry.e72301ad2381112336b1.js:1
remoteEntry.e72301ad2381112336b1.js:1 Unsatisfied version 3.2.1 of shared singleton module @jupyterlab/codeeditor (required ^3.3.0-alpha.16)
d @ remoteEntry.e72301ad2381112336b1.js:1
remoteEntry.e72301ad2381112336b1.js:1 Unsatisfied version 5.2.1 of shared singleton module @jupyterlab/coreutils (required ^5.3.0-alpha.16)
d @ remoteEntry.e72301ad2381112336b1.js:1
remoteEntry.e72301ad2381112336b1.js:1 No satisfying version (^3.3.0-alpha.16) of shared module @jupyterlab/outputarea found in shared scope default.
Available versions: 3.2.1 from @jupyterlab/application-top
p @ remoteEntry.e72301ad2381112336b1.js:1
remoteEntry.e72301ad2381112336b1.js:1 No satisfying version (^3.3.0-alpha.16) of shared module @jupyterlab/docregistry found in shared scope default.
Available versions: 3.2.1 from @jupyterlab/application-top
p @ remoteEntry.e72301ad2381112336b1.js:1
remoteEntry.e72301ad2381112336b1.js:1 No satisfying version (^3.3.0-alpha.16) of shared module @jupyterlab/nbformat found in shared scope default.
Available versions: 3.2.1 from @jupyterlab/application-top
p @ remoteEntry.e72301ad2381112336b1.js:1
remoteEntry.e72301ad2381112336b1.js:1 Unsatisfied version 6.2.1 of shared singleton module @jupyterlab/services (required ^6.3.0-alpha.16)
d @ remoteEntry.e72301ad2381112336b1.js:1
remoteEntry.e72301ad2381112336b1.js:1 Unsatisfied version 3.2.1 of shared singleton module @jupyterlab/rendermime (required ^3.3.0-alpha.16)
d @ remoteEntry.e72301ad2381112336b1.js:1
remoteEntry.e72301ad2381112336b1.js:1 Unsatisfied version 3.2.1 of shared singleton module @jupyterlab/docmanager (required ^3.3.0-alpha.16)
d @ remoteEntry.e72301ad2381112336b1.js:1
remoteEntry.e72301ad2381112336b1.js:1 Unsatisfied version 3.2.1 of shared singleton module @jupyterlab/codemirror (required ^3.3.0-alpha.16)
d @ remoteEntry.e72301ad2381112336b1.js:1
remoteEntry.e72301ad2381112336b1.js:1 Unsatisfied version 3.2.1 of shared singleton module @jupyterlab/translation (required ^3.3.0-alpha.16)
d @ remoteEntry.e72301ad2381112336b1.js:1
remoteEntry.e72301ad2381112336b1.js:1 Unsatisfied version 3.2.1 of shared singleton module @jupyterlab/filebrowser (required ^3.3.0-alpha.16)
d @ remoteEntry.e72301ad2381112336b1.js:1
remoteEntry.e72301ad2381112336b1.js:1 Unsatisfied version 3.2.1 of shared singleton module @jupyterlab/statusbar (required ^3.3.0-alpha.16)
d @ remoteEntry.e72301ad2381112336b1.js:1
remoteEntry.e72301ad2381112336b1.js:1 Unsatisfied version 3.2.1 of shared singleton module @jupyterlab/settingregistry (required ^3.3.0-alpha.16)
d @ remoteEntry.e72301ad2381112336b1.js:1
remoteEntry.e72301ad2381112336b1.js:1 Unsatisfied version 3.2.1 of shared singleton module @jupyterlab/mainmenu (required ^3.3.0-alpha.16)
d @ remoteEntry.e72301ad2381112336b1.js:1
remoteEntry.e72301ad2381112336b1.js:1 Unsatisfied version 3.2.1 of shared singleton module @jupyterlab/ui-components (required ^3.3.0-alpha.15)
d @ remoteEntry.e72301ad2381112336b1.js:1
remoteEntry.e72301ad2381112336b1.js:1 Unsatisfied version 3.2.1 of shared singleton module @jupyterlab/apputils (required ^3.3.0-alpha.16)
d @ remoteEntry.e72301ad2381112336b1.js:1
1902.84e773fc133a804e6fdf.js?v=84e773fc133a804e6fdf:2 $ref: keywords ignored in schema at path "#/properties/codeCellConfig"
e @ 1902.84e773fc133a804e6fdf.js?v=84e773fc133a804e6fdf:2
1902.84e773fc133a804e6fdf.js?v=84e773fc133a804e6fdf:2 $ref: keywords ignored in schema at path "#/properties/markdownCellConfig"
e @ 1902.84e773fc133a804e6fdf.js?v=84e773fc133a804e6fdf:2
1902.84e773fc133a804e6fdf.js?v=84e773fc133a804e6fdf:2 $ref: keywords ignored in schema at path "#/properties/rawCellConfig"
e @ 1902.84e773fc133a804e6fdf.js?v=84e773fc133a804e6fdf:2
1902.84e773fc133a804e6fdf.js?v=84e773fc133a804e6fdf:2 $ref: keywords ignored in schema at path "#/properties/codeCellConfig"
e @ 1902.84e773fc133a804e6fdf.js?v=84e773fc133a804e6fdf:2
1902.84e773fc133a804e6fdf.js?v=84e773fc133a804e6fdf:2 $ref: keywords ignored in schema at path "#/properties/markdownCellConfig"
e @ 1902.84e773fc133a804e6fdf.js?v=84e773fc133a804e6fdf:2
1902.84e773fc133a804e6fdf.js?v=84e773fc133a804e6fdf:2 $ref: keywords ignored in schema at path "#/properties/rawCellConfig"
e @ 1902.84e773fc133a804e6fdf.js?v=84e773fc133a804e6fdf:2
jlab_core.075245c92eb560303156.js?v=075245c92eb560303156:2 Starting application in workspace: "default"
:8890/api/contents/Desktop/test_branch/Untitled.ipynb?content=0&1647194791516:1          Failed to load resource: the server responded with a status of 404 (Not Found)
:8890/git/test_branch/log?1647194833024:1          Failed to load resource: the server responded with a status of 500 (Internal Server Error)
269.4e818cfc1607f513a609.js?v=4e818cfc1607f513a609:1 Uncaught (in promise) Error: fatal: your current branch 'master' does not have any commits yet
at ve (:8890/lab/extensions/@jupyterlab/git/static/269.4e818cfc1607f513a609.js?v=4e818cfc1607f513a609:1:26945)
at async :8890/lab/extensions/@jupyterlab/git/static/269.4e818cfc1607f513a609.js?v=4e818cfc1607f513a609:1:36256
at async Ce.execute (:8890/lab/extensions/@jupyterlab/git/static/269.4e818cfc1607f513a609.js?v=4e818cfc1607f513a609:1:27547)
at async Se.log (:8890/lab/extensions/@jupyterlab/git/static/269.4e818cfc1607f513a609.js?v=4e818cfc1607f513a609:1:36184)
at async Nn.refreshHistory (:8890/lab/extensions/@jupyterlab/git/static/269.4e818cfc1607f513a609.js?v=4e818cfc1607f513a609:1:136117)
at async Nn.refreshView (:8890/lab/extensions/@jupyterlab/git/static/269.4e818cfc1607f513a609.js?v=4e818cfc1607f513a609:1:136358)

jlab_core.075245c92eb560303156.js?v=075245c92eb560303156:2 Starting WebSocket: ws://localhost:8890/api/kernels/7965c9c4-20cd-4dbf-b354-001ff3cfbf8e
jlab_core.075245c92eb560303156.js?v=075245c92eb560303156:2 Starting WebSocket: ws://localhost:8890/api/kernels/7965c9c4-20cd-4dbf-b354-001ff3cfbf8e
jlab_core.075245c92eb560303156.js?v=075245c92eb560303156:2 Starting WebSocket: ws://localhost:8890/api/kernels/7965c9c4-20cd-4dbf-b354-001ff3cfbf8e
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/main.1fc20c20fd6272f9d048.js.map?v=1fc20c20fd6272f9d048: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/4570.44c948d7eae0f307f23c.js.map?v=44c948d7eae0f307f23c: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/9473.f6adb1fcd9ac2f6ab565.js.map?v=f6adb1fcd9ac2f6ab565: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/4155.784ca1752696680bf373.js.map?v=784ca1752696680bf373: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/6700.9bfbe77418dd01d623dd.js.map?v=9bfbe77418dd01d623dd: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/1036.f2d455e7057498f51450.js.map?v=f2d455e7057498f51450: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/2719.f0b62700d12f05ae9649.js.map?v=f0b62700d12f05ae9649: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/1033.fc4792a37de5b414eb76.js.map?v=fc4792a37de5b414eb76: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/7294.46e9d2dfa68082780e97.js.map?v=46e9d2dfa68082780e97: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/7755.d506a1d9dadf30b1e490.js.map?v=d506a1d9dadf30b1e490: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/7084.8cbd74268350b25b03e6.js.map?v=8cbd74268350b25b03e6: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/4631.96a143e70f005fef7b59.js.map?v=96a143e70f005fef7b59: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/3935.e00facce2e55a4af6e62.js.map?v=e00facce2e55a4af6e62: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/7616.d412fb880534d79eb96c.js.map?v=d412fb880534d79eb96c: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/1057.1a1aee857cdaddbae1d3.js.map?v=1a1aee857cdaddbae1d3: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/807.19c29345bd81fb8caca3.js.map?v=19c29345bd81fb8caca3: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/8086.1dfabaac37d971e2cc4c.js.map?v=1dfabaac37d971e2cc4c: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/1902.84e773fc133a804e6fdf.js.map?v=84e773fc133a804e6fdf: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/3502.fbe0c610be82ba1360db.js.map?v=fbe0c610be82ba1360db: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/2440.b1cec08f1bbdf244e2bb.js.map?v=b1cec08f1bbdf244e2bb: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/1249.39ca2df011ac8354b8d2.js.map?v=39ca2df011ac8354b8d2: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/5815.4b6b9a453a8a559f1470.js.map?v=4b6b9a453a8a559f1470: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/4151.c3dc0e633a876895c62c.js.map?v=c3dc0e633a876895c62c: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/1358.9ab4f57e8227ce75f427.js.map?v=9ab4f57e8227ce75f427: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/3496.ecb0e7fcc54191234ae6.js.map?v=ecb0e7fcc54191234ae6: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/911.0c08f040896753efc653.js.map?v=0c08f040896753efc653: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/4429.9d0e9af89b4ab5bf2a29.js.map?v=9d0e9af89b4ab5bf2a29: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/126.7dbfc7317b0b535d2b27.js.map?v=7dbfc7317b0b535d2b27: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/7796.eb71435b425bb2aea842.js.map?v=eb71435b425bb2aea842: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/jlab_core.075245c92eb560303156.js.map?v=075245c92eb560303156: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE
DevTools failed to load source map: Could not load content for http://localhost:8890/static/lab/714.d38baae8faccca175d4b.js.map?v=d38baae8faccca175d4b: HTTP error: status code 404, net::ERR_HTTP_RESPONSE_CODE_FAILURE

@guyer guyer added the bug label Mar 13, 2022
@fcollonval
Copy link
Member

Thanks for reporting @guyer and all the logs that make it clear this is a frontend issue as the git command executed was ['git', 'checkout', '-b', 'numpy', 'math'] when it should have been ['git', 'checkout', '-b', 'numpy', 'master'].

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Good first issue Good first issue to be tackled by new contributors status:Help Wanted
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants