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

Error when staging binary files #27

Closed
firedev opened this issue Oct 30, 2015 · 1 comment
Closed

Error when staging binary files #27

firedev opened this issue Oct 30, 2015 · 1 comment
Labels
bug

Comments

@firedev
Copy link

firedev commented Oct 30, 2015 

Error detected while processing function magit#stage_hunk..magit#stage_block..<SNR>32_mg_git_apply:
line    8:
Git error: error: cannot apply binary patch to 'db/local.sqlite3' without full index line^@error: db/local.sqlite3: patch does not apply^@
line    9:
Git cmd: git apply --recount --no-index --cached -
line   10:
Tried to aply this
line   11:
['diff --git a/db/local.sqlite3 b/db/local.sqlite3', 'index 1e19251..b00b745 100644', 'Binary files a/db/local.sqlite3 and b/db/local.sqlite3 differ', '']
Press ENTER or type command to continue
@firedev firedev changed the title Cam Error when staging binary files Oct 30, 2015
@jreybert
Copy link
Owner

OK, this is an easy one (if all bugs could be as easy...). I'll fix it during the week end.

@jreybert jreybert added the bug label Oct 30, 2015
jreybert added a commit that referenced this issue Nov 1, 2015
@jreybert
Merge branch 'dev/fix_add_bin'
3c3baa3 
* dev/fix_add_bin:
  travis: reuse disable vader vim version output
  test/addFile/: add golden files for binary tests
  autoload/magit/utils.vim: fix is_binary function (fixes #27)
  .travis.yml: enable travis for all dev/* branches
  test/: add new tests with new and modified binary files
  plugin/magit.vim: fix stage_block discard
  plugin/magit.vim: stage file when closed (do not need vimagit cached data)
  autoload/magit/git.vim: add git_checkout(), fix git_add() and git_reset()
  plugin/magit.vim: add mg_stage_closed_file function
  plugin/magit.vim: fix big :%s
  autoload/magit/git.vim: git works in a clean environment (no config)
  autoload/magit/git.vim: move all git related functions to git.vim
  autoload/magit/utils.vim: add git_add and git_reset helper functions
  plugin/magit.vim: move git_(un)apply helper functions to utils.vim
  syntax,plugin: fix end of diff display (section title may be non highlighed)
  README.md: add asciinema example (fix #3)
  plugin/magit.vim, autoload/magit/state.vim: add some comments
  plugin/magit.vim: factorize some if statements
  plugin/magit.vim: remove useless window restore commands
  plugin/magit.vim: replace s:set() by get()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@firedev @jreybert