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

Jump to bottom

gitup chokes on unrelated .git directory #88

Closed
michael-o opened this issue Feb 19, 2023 · 3 comments
Closed

gitup chokes on unrelated .git directory #88

michael-o opened this issue Feb 19, 2023 · 3 comments
Assignees
@johnmehr
Labels
bug Something isn't working

Comments

@michael-o
Copy link
Contributor

Output:

root@bsd1srv:~
# gitup ports && gitup src
# Scanning local repository...
gitup: A .git directory was found -- gitup does not update this directory which will cause problems for the official Git client.  If you wish to use gitup, please remove /usr/ports/www/py-html5lib/work-py37/html5lib-1.0.1/html5lib/tests/testdata/.git and rerun gitup.: File exists

with

root@bsd1srv:~
# gitup -V
gitup version 0.98

I'd expect that gitup checks only at the root of the target directory, but not everywhere.
@johnmehr johnmehr self-assigned this Feb 28, 2023
@johnmehr johnmehr added the bug Something isn't working label Feb 28, 2023
johnmehr added a commit that referenced this issue Mar 5, 2023
@johnmehr
Added fix for Issue #88
ba2aa9b
@johnmehr
Copy link
Owner

johnmehr commented Mar 5, 2023

This should be fixed now. Thanks!

@michael-o
Copy link
Contributor Author

Will test tomorrow!

@michael-o
Copy link
Contributor Author

Interesting:

root@deblndw013x3j:/usr/ports/www/py-html5lib
# find . -name .git -type d
root@deblndw013x3j:/usr/ports/www/py-html5lib
# find . -name .git -type f
./work-py37/html5lib-1.0.1/html5lib/tests/testdata/.git
root@deblndw013x3j:/usr/ports/www/py-html5lib
# cat ./work-py37/html5lib-1.0.1/html5lib/tests/testdata/.git
gitdir: ../../../../html5lib-python/.git/worktrees/html5lib-python-b/modules/testdata

So I guess you should check for dir as well, just to make sure.

But I can confirm that a new gitup run does not print the warning. So issue is fixed.

freebsd-git pushed a commit to freebsd/freebsd-ports that referenced this issue Mar 7, 2023
@nunotexbsd
net/gitup: Update to 0.98-2 (bugfixes)
a9247f5 
ChangeLog:
 - File and permission changes are not being properly processed
   johnmehr/gitup#89
 - gitup chokes on unrelated .git directory
   johnmehr/gitup#88

MFH:		2023Q1 (bugfixes)
freebsd-git pushed a commit to freebsd/freebsd-ports that referenced this issue Mar 7, 2023
@nunotexbsd
net/gitup: Update to 0.98-2 (bugfixes)
456e807 
ChangeLog:
 - File and permission changes are not being properly processed
   johnmehr/gitup#89
 - gitup chokes on unrelated .git directory
   johnmehr/gitup#88

MFH:		2023Q1 (bugfixes)
(cherry picked from commit a9247f5)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@johnmehr johnmehr

Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@michael-o @johnmehr