git freeze fails if you have backup files in your git checkout? |
||
Issue description
danakj0:src [desktop] (ui-paintopbuffer)% git reparent-branch playback-range
Reparenting ui-paintopbuffer to track playback-range (was origin/master)
Traceback (most recent call last):
File "/usr/local/google/home/danakj/s/depot_tools/git_reparent_branch.py", line 90, in <module>
sys.exit(main(sys.argv[1:]))
File "/usr/local/google/home/danakj/s/depot_tools/git_reparent_branch.py", line 85, in main
return git_rebase_update.main(['--no-fetch'])
File "/usr/local/google/home/danakj/s/depot_tools/git_rebase_update.py", line 254, in main
git.freeze() # just in case there are any local changes.
File "/usr/local/google/home/danakj/s/depot_tools/git_common.py", line 425, in freeze
untracked_bytes += os.stat(os.path.join(root_path, f)).st_size
OSError: [Errno 2] No such file or directory: '/usr/local/google/home/danakj/s/c/src/cc/paint/.#BUILD.gn'
danakj0:src [desktop] (ui-paintopbuffer)% git reparent-branch playback-range
usage: git_reparent_branch.py [-h] [--root] [--lkgr] [new_parent]
git_reparent_branch.py: error: Cannot reparent a branch to its existing parent
da
danakj0:src [desktop] (ui-paintopbuffer)% git st
On branch ui-paintopbuffer
Your branch is ahead of 'playback-range' by 1 commit.
(use "git push" to publish your local commits)
Untracked files:
(use "git add <file>..." to include in what will be committed)
cc/paint/.#BUILD.gn
cc/paint/.#paint_op_player.cc
cc/paint/paint_op_player.cc
cc/paint/paint_op_player.h
cc/test/.#test_skcanvas.h
test-profile-151362
,
May 19 2017
They are not ignored by git, they are just files sitting in the directory that are not git-added. That's why they show up in git status fwiw. I just manually ignore them :)
,
May 27 2017
If you have files that you would like (any) git tools to ignore, you need to add them to one of the .gitignore files. If these are your personal files, you can add them to the repo's .git/info/exclude file. Please see the documentation for gitignore: https://git-scm.com/docs/gitignore |
||
►
Sign in to add a comment |
||
Comment 1 by aga...@chromium.org
, May 18 2017Owner: iannucci@chromium.org
Status: Assigned (was: Untriaged)
Summary: git freeze fails if you have backup files in your git checkout? (was: git reparent-branch fails if you have backup files in your git checkout?)