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

Jump to bottom

Cannot discard multiple unstaged changes for files #1733

Closed
Silex opened this issue Feb 17, 2015 · 3 comments
Closed

Cannot discard multiple unstaged changes for files #1733

Silex opened this issue Feb 17, 2015 · 3 comments
Milestone
2.1.0

Comments

@Silex
Copy link
Contributor

Silex commented Feb 17, 2015

Hello,

When I selected multiple files in the unstaged changes section and press k, it correctly asks me if I want to discard changes for these files, then asks me one more time if I want to discard changes, and if I say yes then the following happens:

Debugger entered--Lisp error: (void-function nil)
  nil([cl-struct-magit-section file "Jamroot" #<marker (moves after insertion) at 422 in *magit: ~/work/stvs/provision/*> #<marker at 441 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> t nil nil "69deb0d..128486a" nil [cl-struct-magit-section unstaged nil #<marker (moves after insertion) at 404 in *magit: ~/work/stvs/provision/*> #<marker at 422 in *magit: ~/work/stvs/provision/*> #<marker at 1193 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil [cl-struct-magit-section status nil #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> nil #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil nil ([cl-struct-magit-section branch "develop" #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> #<marker at 36 in *magit: ~/work/stvs/provision/*> #<marker at 128 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #2 ([cl-struct-magit-section branch "origin/develop" #<marker (moves after insertion) at 36 in *magit: ~/work/stvs/provision/*> nil #<marker at 104 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section tag "v5.7.0" #<marker (moves after insertion) at 104 in *magit: ~/work/stvs/provision/*> nil #<marker at 127 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])] [cl-struct-magit-section untracked nil #<marker (moves after insertion) at 128 in *magit: ~/work/stvs/provision/*> #<marker at 145 in *magit: ~/work/stvs/provision/*> #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #2 ([cl-struct-magit-section file "Dockerfile.dev" #<marker (moves after insertion) at 145 in *magit: ~/work/stvs/provision/*> nil #<marker at 160 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "TODO.org" #<marker (moves after insertion) at 160 in *magit: ~/work/stvs/provision/*> nil #<marker at 169 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "copydeb.el" #<marker (moves after insertion) at 169 in *magit: ~/work/stvs/provision/*> nil #<marker at 180 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "data/provision/streams" #<marker (moves after insertion) at 180 in *magit: ~/work/stvs/provision/*> nil #<marker at 203 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "mysql/" #<marker (moves after insertion) at 203 in *magit: ~/work/stvs/provision/*> nil #<marker at 210 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "src/libqt5multimedia5-plugins_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 210 in *magit: ~/work/stvs/provision/*> nil #<marker at 265 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "src/lxc-docker-1.5.0_1.5.0_amd64.deb" #<marker (moves after insertion) at 265 in *magit: ~/work/stvs/provision/*> nil #<marker at 302 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 302 in *magit: ~/work/stvs/provision/*> nil #<marker at 354 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64/" #<marker (moves after insertion) at 354 in *magit: ~/work/stvs/provision/*> nil #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])] #1 [cl-struct-magit-section unpushed nil #<marker (moves after insertion) at 1193 in *magit: ~/work/stvs/provision/*> #<marker at 1211 in *magit: ~/work/stvs/provision/*> #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #2 ([cl-struct-magit-section commit "bd3ced8" #<marker (moves after insertion) at 1211 in *magit: ~/work/stvs/provision/*> nil #<marker at 1228 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section commit "075e4d7" #<marker (moves after insertion) at 1228 in *magit: ~/work/stvs/provision/*> nil #<marker at 1264 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section commit "79978c8" #<marker (moves after insertion) at 1264 in *magit: ~/work/stvs/provision/*> nil #<marker at 1288 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section commit "cd351ee" #<marker (moves after insertion) at 1288 in *magit: ~/work/stvs/provision/*> nil #<marker at 1318 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section commit "e065e59" #<marker (moves after insertion) at 1318 in *magit: ~/work/stvs/provision/*> nil #<marker at 1353 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section commit "4b0782b" #<marker (moves after insertion) at 1353 in *magit: ~/work/stvs/provision/*> nil #<marker at 1409 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])])] (#0 [cl-struct-magit-section file "Makefile" #<marker (moves after insertion) at 522 in *magit: ~/work/stvs/provision/*> #<marker at 542 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> t nil nil "72de5ee..73828c4" nil #1 ([cl-struct-magit-section hunk ("UBUNTU_DEPS+=xfslibs-dev libcurl4-openssl-dev" "-26,7" "+26,7") #<marker (moves after insertion) at 542 in *magit: ~/work/stvs/provision/*> #<marker at 606 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 nil])] [cl-struct-magit-section file "build_with_docker.sh" #<marker (moves after insertion) at 753 in *magit: ~/work/stvs/provision/*> #<marker at 785 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> t nil nil "b49b815..5e2a8b2" nil #1 ([cl-struct-magit-section hunk ("set -e" "-5,4" "+5,4") #<marker (moves after insertion) at 785 in *magit: ~/work/stvs/provision/*> #<marker at 808 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 nil])])] ([cl-struct-magit-section hunk (nil "-1,4" "+1,4") #<marker (moves after insertion) at 441 in *magit: ~/work/stvs/provision/*> #<marker at 457 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #0 nil])] "--reverse")
  funcall(nil [cl-struct-magit-section file "Jamroot" #<marker (moves after insertion) at 422 in *magit: ~/work/stvs/provision/*> #<marker at 441 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> t nil nil "69deb0d..128486a" nil [cl-struct-magit-section unstaged nil #<marker (moves after insertion) at 404 in *magit: ~/work/stvs/provision/*> #<marker at 422 in *magit: ~/work/stvs/provision/*> #<marker at 1193 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil [cl-struct-magit-section status nil #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> nil #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil nil ([cl-struct-magit-section branch "develop" #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> #<marker at 36 in *magit: ~/work/stvs/provision/*> #<marker at 128 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #2 ([cl-struct-magit-section branch "origin/develop" #<marker (moves after insertion) at 36 in *magit: ~/work/stvs/provision/*> nil #<marker at 104 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section tag "v5.7.0" #<marker (moves after insertion) at 104 in *magit: ~/work/stvs/provision/*> nil #<marker at 127 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])] [cl-struct-magit-section untracked nil #<marker (moves after insertion) at 128 in *magit: ~/work/stvs/provision/*> #<marker at 145 in *magit: ~/work/stvs/provision/*> #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #2 ([cl-struct-magit-section file "Dockerfile.dev" #<marker (moves after insertion) at 145 in *magit: ~/work/stvs/provision/*> nil #<marker at 160 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "TODO.org" #<marker (moves after insertion) at 160 in *magit: ~/work/stvs/provision/*> nil #<marker at 169 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "copydeb.el" #<marker (moves after insertion) at 169 in *magit: ~/work/stvs/provision/*> nil #<marker at 180 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "data/provision/streams" #<marker (moves after insertion) at 180 in *magit: ~/work/stvs/provision/*> nil #<marker at 203 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "mysql/" #<marker (moves after insertion) at 203 in *magit: ~/work/stvs/provision/*> nil #<marker at 210 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "src/libqt5multimedia5-plugins_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 210 in *magit: ~/work/stvs/provision/*> nil #<marker at 265 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "src/lxc-docker-1.5.0_1.5.0_amd64.deb" #<marker (moves after insertion) at 265 in *magit: ~/work/stvs/provision/*> nil #<marker at 302 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 302 in *magit: ~/work/stvs/provision/*> nil #<marker at 354 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64/" #<marker (moves after insertion) at 354 in *magit: ~/work/stvs/provision/*> nil #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])] #1 [cl-struct-magit-section unpushed nil #<marker (moves after insertion) at 1193 in *magit: ~/work/stvs/provision/*> #<marker at 1211 in *magit: ~/work/stvs/provision/*> #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #2 ([cl-struct-magit-section commit "bd3ced8" #<marker (moves after insertion) at 1211 in *magit: ~/work/stvs/provision/*> nil #<marker at 1228 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section commit "075e4d7" #<marker (moves after insertion) at 1228 in *magit: ~/work/stvs/provision/*> nil #<marker at 1264 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section commit "79978c8" #<marker (moves after insertion) at 1264 in *magit: ~/work/stvs/provision/*> nil #<marker at 1288 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section commit "cd351ee" #<marker (moves after insertion) at 1288 in *magit: ~/work/stvs/provision/*> nil #<marker at 1318 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section commit "e065e59" #<marker (moves after insertion) at 1318 in *magit: ~/work/stvs/provision/*> nil #<marker at 1353 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section commit "4b0782b" #<marker (moves after insertion) at 1353 in *magit: ~/work/stvs/provision/*> nil #<marker at 1409 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])])] (#0 [cl-struct-magit-section file "Makefile" #<marker (moves after insertion) at 522 in *magit: ~/work/stvs/provision/*> #<marker at 542 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> t nil nil "72de5ee..73828c4" nil #1 ([cl-struct-magit-section hunk ("UBUNTU_DEPS+=xfslibs-dev libcurl4-openssl-dev" "-26,7" "+26,7") #<marker (moves after insertion) at 542 in *magit: ~/work/stvs/provision/*> #<marker at 606 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 nil])] [cl-struct-magit-section file "build_with_docker.sh" #<marker (moves after insertion) at 753 in *magit: ~/work/stvs/provision/*> #<marker at 785 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> t nil nil "b49b815..5e2a8b2" nil #1 ([cl-struct-magit-section hunk ("set -e" "-5,4" "+5,4") #<marker (moves after insertion) at 785 in *magit: ~/work/stvs/provision/*> #<marker at 808 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 nil])])] ([cl-struct-magit-section hunk (nil "-1,4" "+1,4") #<marker (moves after insertion) at 441 in *magit: ~/work/stvs/provision/*> #<marker at 457 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #0 nil])] "--reverse")
  (if (eq type (quote unstaged)) (funcall fn section "--reverse") (if (magit-anything-unstaged-p (if (eq scope (quote file)) (progn nil (or (progn nil (and ... ... ... t)) (error "%s accessing a non-%s" (quote magit-section-value) (quote magit-section))) (aref section 2)) (magit-section-parent-value section))) (progn (let ((inhibit-magit-refresh t)) (funcall fn section "--reverse" "--cached") (funcall fn section "--reverse")) (magit-refresh)) (funcall fn section "--reverse" "--index")))
  (progn (if (eq type (quote unstaged)) (funcall fn section "--reverse") (if (magit-anything-unstaged-p (if (eq scope (quote file)) (progn nil (or (progn nil ...) (error "%s accessing a non-%s" ... ...)) (aref section 2)) (magit-section-parent-value section))) (progn (let ((inhibit-magit-refresh t)) (funcall fn section "--reverse" "--cached") (funcall fn section "--reverse")) (magit-refresh)) (funcall fn section "--reverse" "--index"))))
  (if (or (eq scope (quote file)) (magit-confirm (quote discard) (format "Discard %s" scope))) (progn (if (eq type (quote unstaged)) (funcall fn section "--reverse") (if (magit-anything-unstaged-p (if (eq scope (quote file)) (progn nil (or ... ...) (aref section 2)) (magit-section-parent-value section))) (progn (let ((inhibit-magit-refresh t)) (funcall fn section "--reverse" "--cached") (funcall fn section "--reverse")) (magit-refresh)) (funcall fn section "--reverse" "--index")))))
  (let* ((type (magit-diff-type section)) (scope (magit-diff-scope section t)) (fn (cond ((eq scope (quote region)) (let nil (quote magit-apply-region))) ((eq scope (quote hunk)) (let nil (quote magit-apply-hunk))) ((eq scope (quote file)) (let nil (quote magit-apply-diff))) (t nil)))) (if (or (eq scope (quote file)) (magit-confirm (quote discard) (format "Discard %s" scope))) (progn (if (eq type (quote unstaged)) (funcall fn section "--reverse") (if (magit-anything-unstaged-p (if (eq scope ...) (progn nil ... ...) (magit-section-parent-value section))) (progn (let (...) (funcall fn section "--reverse" "--cached") (funcall fn section "--reverse")) (magit-refresh)) (funcall fn section "--reverse" "--index"))))))
  magit-discard-apply([cl-struct-magit-section file "Jamroot" #<marker (moves after insertion) at 422 in *magit: ~/work/stvs/provision/*> #<marker at 441 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> t nil nil "69deb0d..128486a" nil [cl-struct-magit-section unstaged nil #<marker (moves after insertion) at 404 in *magit: ~/work/stvs/provision/*> #<marker at 422 in *magit: ~/work/stvs/provision/*> #<marker at 1193 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil [cl-struct-magit-section status nil #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> nil #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil nil ([cl-struct-magit-section branch "develop" #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> #<marker at 36 in *magit: ~/work/stvs/provision/*> #<marker at 128 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #2 ([cl-struct-magit-section branch "origin/develop" #<marker (moves after insertion) at 36 in *magit: ~/work/stvs/provision/*> nil #<marker at 104 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section tag "v5.7.0" #<marker (moves after insertion) at 104 in *magit: ~/work/stvs/provision/*> nil #<marker at 127 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])] [cl-struct-magit-section untracked nil #<marker (moves after insertion) at 128 in *magit: ~/work/stvs/provision/*> #<marker at 145 in *magit: ~/work/stvs/provision/*> #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #2 ([cl-struct-magit-section file "Dockerfile.dev" #<marker (moves after insertion) at 145 in *magit: ~/work/stvs/provision/*> nil #<marker at 160 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "TODO.org" #<marker (moves after insertion) at 160 in *magit: ~/work/stvs/provision/*> nil #<marker at 169 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "copydeb.el" #<marker (moves after insertion) at 169 in *magit: ~/work/stvs/provision/*> nil #<marker at 180 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "data/provision/streams" #<marker (moves after insertion) at 180 in *magit: ~/work/stvs/provision/*> nil #<marker at 203 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "mysql/" #<marker (moves after insertion) at 203 in *magit: ~/work/stvs/provision/*> nil #<marker at 210 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "src/libqt5multimedia5-plugins_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 210 in *magit: ~/work/stvs/provision/*> nil #<marker at 265 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "src/lxc-docker-1.5.0_1.5.0_amd64.deb" #<marker (moves after insertion) at 265 in *magit: ~/work/stvs/provision/*> nil #<marker at 302 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 302 in *magit: ~/work/stvs/provision/*> nil #<marker at 354 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64/" #<marker (moves after insertion) at 354 in *magit: ~/work/stvs/provision/*> nil #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])] #1 [cl-struct-magit-section unpushed nil #<marker (moves after insertion) at 1193 in *magit: ~/work/stvs/provision/*> #<marker at 1211 in *magit: ~/work/stvs/provision/*> #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #2 ([cl-struct-magit-section commit "bd3ced8" #<marker (moves after insertion) at 1211 in *magit: ~/work/stvs/provision/*> nil #<marker at 1228 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section commit "075e4d7" #<marker (moves after insertion) at 1228 in *magit: ~/work/stvs/provision/*> nil #<marker at 1264 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section commit "79978c8" #<marker (moves after insertion) at 1264 in *magit: ~/work/stvs/provision/*> nil #<marker at 1288 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section commit "cd351ee" #<marker (moves after insertion) at 1288 in *magit: ~/work/stvs/provision/*> nil #<marker at 1318 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section commit "e065e59" #<marker (moves after insertion) at 1318 in *magit: ~/work/stvs/provision/*> nil #<marker at 1353 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil] [cl-struct-magit-section commit "4b0782b" #<marker (moves after insertion) at 1353 in *magit: ~/work/stvs/provision/*> nil #<marker at 1409 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])])] (#0 [cl-struct-magit-section file "Makefile" #<marker (moves after insertion) at 522 in *magit: ~/work/stvs/provision/*> #<marker at 542 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> t nil nil "72de5ee..73828c4" nil #1 ([cl-struct-magit-section hunk ("UBUNTU_DEPS+=xfslibs-dev libcurl4-openssl-dev" "-26,7" "+26,7") #<marker (moves after insertion) at 542 in *magit: ~/work/stvs/provision/*> #<marker at 606 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 nil])] [cl-struct-magit-section file "build_with_docker.sh" #<marker (moves after insertion) at 753 in *magit: ~/work/stvs/provision/*> #<marker at 785 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> t nil nil "b49b815..5e2a8b2" nil #1 ([cl-struct-magit-section hunk ("set -e" "-5,4" "+5,4") #<marker (moves after insertion) at 785 in *magit: ~/work/stvs/provision/*> #<marker at 808 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 nil])])] ([cl-struct-magit-section hunk (nil "-1,4" "+1,4") #<marker (moves after insertion) at 441 in *magit: ~/work/stvs/provision/*> #<marker at 457 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #0 nil])])
  mapc(magit-discard-apply ([cl-struct-magit-section file "Jamroot" #<marker (moves after insertion) at 422 in *magit: ~/work/stvs/provision/*> #<marker at 441 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> t nil nil "69deb0d..128486a" nil [cl-struct-magit-section unstaged nil #<marker (moves after insertion) at 404 in *magit: ~/work/stvs/provision/*> #<marker at 422 in *magit: ~/work/stvs/provision/*> #<marker at 1193 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil [cl-struct-magit-section status nil #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> nil #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil nil ([cl-struct-magit-section branch "develop" #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> #<marker at 36 in *magit: ~/work/stvs/provision/*> #<marker at 128 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section branch "origin/develop" #<marker (moves after insertion) at 36 in *magit: ~/work/stvs/provision/*> nil #<marker at 104 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section tag "v5.7.0" #<marker (moves after insertion) at 104 in *magit: ~/work/stvs/provision/*> nil #<marker at 127 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])] [cl-struct-magit-section untracked nil #<marker (moves after insertion) at 128 in *magit: ~/work/stvs/provision/*> #<marker at 145 in *magit: ~/work/stvs/provision/*> #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section file "Dockerfile.dev" #<marker (moves after insertion) at 145 in *magit: ~/work/stvs/provision/*> nil #<marker at 160 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "TODO.org" #<marker (moves after insertion) at 160 in *magit: ~/work/stvs/provision/*> nil #<marker at 169 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "copydeb.el" #<marker (moves after insertion) at 169 in *magit: ~/work/stvs/provision/*> nil #<marker at 180 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "data/provision/streams" #<marker (moves after insertion) at 180 in *magit: ~/work/stvs/provision/*> nil #<marker at 203 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "mysql/" #<marker (moves after insertion) at 203 in *magit: ~/work/stvs/provision/*> nil #<marker at 210 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/libqt5multimedia5-plugins_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 210 in *magit: ~/work/stvs/provision/*> nil #<marker at 265 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/lxc-docker-1.5.0_1.5.0_amd64.deb" #<marker (moves after insertion) at 265 in *magit: ~/work/stvs/provision/*> nil #<marker at 302 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 302 in *magit: ~/work/stvs/provision/*> nil #<marker at 354 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64/" #<marker (moves after insertion) at 354 in *magit: ~/work/stvs/provision/*> nil #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])] #2 [cl-struct-magit-section unpushed nil #<marker (moves after insertion) at 1193 in *magit: ~/work/stvs/provision/*> #<marker at 1211 in *magit: ~/work/stvs/provision/*> #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section commit "bd3ced8" #<marker (moves after insertion) at 1211 in *magit: ~/work/stvs/provision/*> nil #<marker at 1228 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "075e4d7" #<marker (moves after insertion) at 1228 in *magit: ~/work/stvs/provision/*> nil #<marker at 1264 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "79978c8" #<marker (moves after insertion) at 1264 in *magit: ~/work/stvs/provision/*> nil #<marker at 1288 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "cd351ee" #<marker (moves after insertion) at 1288 in *magit: ~/work/stvs/provision/*> nil #<marker at 1318 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "e065e59" #<marker (moves after insertion) at 1318 in *magit: ~/work/stvs/provision/*> nil #<marker at 1353 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "4b0782b" #<marker (moves after insertion) at 1353 in *magit: ~/work/stvs/provision/*> nil #<marker at 1409 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])])] (#1 [cl-struct-magit-section file "Makefile" #<marker (moves after insertion) at 522 in *magit: ~/work/stvs/provision/*> #<marker at 542 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> t nil nil "72de5ee..73828c4" nil #2 ([cl-struct-magit-section hunk ("UBUNTU_DEPS+=xfslibs-dev libcurl4-openssl-dev" "-26,7" "+26,7") #<marker (moves after insertion) at 542 in *magit: ~/work/stvs/provision/*> #<marker at 606 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])] [cl-struct-magit-section file "build_with_docker.sh" #<marker (moves after insertion) at 753 in *magit: ~/work/stvs/provision/*> #<marker at 785 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> t nil nil "b49b815..5e2a8b2" nil #2 ([cl-struct-magit-section hunk ("set -e" "-5,4" "+5,4") #<marker (moves after insertion) at 785 in *magit: ~/work/stvs/provision/*> #<marker at 808 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])])] ([cl-struct-magit-section hunk (nil "-1,4" "+1,4") #<marker (moves after insertion) at 441 in *magit: ~/work/stvs/provision/*> #<marker at 457 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #1 nil])] [cl-struct-magit-section file "Makefile" #<marker (moves after insertion) at 522 in *magit: ~/work/stvs/provision/*> #<marker at 542 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> t nil nil "72de5ee..73828c4" nil [cl-struct-magit-section unstaged nil #<marker (moves after insertion) at 404 in *magit: ~/work/stvs/provision/*> #<marker at 422 in *magit: ~/work/stvs/provision/*> #<marker at 1193 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil [cl-struct-magit-section status nil #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> nil #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil nil ([cl-struct-magit-section branch "develop" #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> #<marker at 36 in *magit: ~/work/stvs/provision/*> #<marker at 128 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section branch "origin/develop" #<marker (moves after insertion) at 36 in *magit: ~/work/stvs/provision/*> nil #<marker at 104 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section tag "v5.7.0" #<marker (moves after insertion) at 104 in *magit: ~/work/stvs/provision/*> nil #<marker at 127 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])] [cl-struct-magit-section untracked nil #<marker (moves after insertion) at 128 in *magit: ~/work/stvs/provision/*> #<marker at 145 in *magit: ~/work/stvs/provision/*> #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section file "Dockerfile.dev" #<marker (moves after insertion) at 145 in *magit: ~/work/stvs/provision/*> nil #<marker at 160 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "TODO.org" #<marker (moves after insertion) at 160 in *magit: ~/work/stvs/provision/*> nil #<marker at 169 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "copydeb.el" #<marker (moves after insertion) at 169 in *magit: ~/work/stvs/provision/*> nil #<marker at 180 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "data/provision/streams" #<marker (moves after insertion) at 180 in *magit: ~/work/stvs/provision/*> nil #<marker at 203 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "mysql/" #<marker (moves after insertion) at 203 in *magit: ~/work/stvs/provision/*> nil #<marker at 210 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/libqt5multimedia5-plugins_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 210 in *magit: ~/work/stvs/provision/*> nil #<marker at 265 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/lxc-docker-1.5.0_1.5.0_amd64.deb" #<marker (moves after insertion) at 265 in *magit: ~/work/stvs/provision/*> nil #<marker at 302 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 302 in *magit: ~/work/stvs/provision/*> nil #<marker at 354 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64/" #<marker (moves after insertion) at 354 in *magit: ~/work/stvs/provision/*> nil #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])] #2 [cl-struct-magit-section unpushed nil #<marker (moves after insertion) at 1193 in *magit: ~/work/stvs/provision/*> #<marker at 1211 in *magit: ~/work/stvs/provision/*> #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section commit "bd3ced8" #<marker (moves after insertion) at 1211 in *magit: ~/work/stvs/provision/*> nil #<marker at 1228 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "075e4d7" #<marker (moves after insertion) at 1228 in *magit: ~/work/stvs/provision/*> nil #<marker at 1264 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "79978c8" #<marker (moves after insertion) at 1264 in *magit: ~/work/stvs/provision/*> nil #<marker at 1288 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "cd351ee" #<marker (moves after insertion) at 1288 in *magit: ~/work/stvs/provision/*> nil #<marker at 1318 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "e065e59" #<marker (moves after insertion) at 1318 in *magit: ~/work/stvs/provision/*> nil #<marker at 1353 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "4b0782b" #<marker (moves after insertion) at 1353 in *magit: ~/work/stvs/provision/*> nil #<marker at 1409 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])])] ([cl-struct-magit-section file "Jamroot" #<marker (moves after insertion) at 422 in *magit: ~/work/stvs/provision/*> #<marker at 441 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> t nil nil "69deb0d..128486a" nil #2 ([cl-struct-magit-section hunk (nil "-1,4" "+1,4") #<marker (moves after insertion) at 441 in *magit: ~/work/stvs/provision/*> #<marker at 457 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])] #1 [cl-struct-magit-section file "build_with_docker.sh" #<marker (moves after insertion) at 753 in *magit: ~/work/stvs/provision/*> #<marker at 785 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> t nil nil "b49b815..5e2a8b2" nil #2 ([cl-struct-magit-section hunk ("set -e" "-5,4" "+5,4") #<marker (moves after insertion) at 785 in *magit: ~/work/stvs/provision/*> #<marker at 808 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])])] ([cl-struct-magit-section hunk ("UBUNTU_DEPS+=xfslibs-dev libcurl4-openssl-dev" "-26,7" "+26,7") #<marker (moves after insertion) at 542 in *magit: ~/work/stvs/provision/*> #<marker at 606 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #1 nil])]))
  (progn (mapc (quote magit-discard-apply) sections))
  (if (magit-confirm-files (quote discard) (mapcar (quote magit-section-value) sections) (format "Discard %s changes in" (magit-diff-type))) (progn (mapc (quote magit-discard-apply) sections)))
  magit-discard-files--discard(([cl-struct-magit-section file "Jamroot" #<marker (moves after insertion) at 422 in *magit: ~/work/stvs/provision/*> #<marker at 441 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> t nil nil "69deb0d..128486a" nil [cl-struct-magit-section unstaged nil #<marker (moves after insertion) at 404 in *magit: ~/work/stvs/provision/*> #<marker at 422 in *magit: ~/work/stvs/provision/*> #<marker at 1193 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil [cl-struct-magit-section status nil #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> nil #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil nil ([cl-struct-magit-section branch "develop" #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> #<marker at 36 in *magit: ~/work/stvs/provision/*> #<marker at 128 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section branch "origin/develop" #<marker (moves after insertion) at 36 in *magit: ~/work/stvs/provision/*> nil #<marker at 104 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section tag "v5.7.0" #<marker (moves after insertion) at 104 in *magit: ~/work/stvs/provision/*> nil #<marker at 127 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])] [cl-struct-magit-section untracked nil #<marker (moves after insertion) at 128 in *magit: ~/work/stvs/provision/*> #<marker at 145 in *magit: ~/work/stvs/provision/*> #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section file "Dockerfile.dev" #<marker (moves after insertion) at 145 in *magit: ~/work/stvs/provision/*> nil #<marker at 160 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "TODO.org" #<marker (moves after insertion) at 160 in *magit: ~/work/stvs/provision/*> nil #<marker at 169 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "copydeb.el" #<marker (moves after insertion) at 169 in *magit: ~/work/stvs/provision/*> nil #<marker at 180 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "data/provision/streams" #<marker (moves after insertion) at 180 in *magit: ~/work/stvs/provision/*> nil #<marker at 203 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "mysql/" #<marker (moves after insertion) at 203 in *magit: ~/work/stvs/provision/*> nil #<marker at 210 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/libqt5multimedia5-plugins_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 210 in *magit: ~/work/stvs/provision/*> nil #<marker at 265 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/lxc-docker-1.5.0_1.5.0_amd64.deb" #<marker (moves after insertion) at 265 in *magit: ~/work/stvs/provision/*> nil #<marker at 302 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 302 in *magit: ~/work/stvs/provision/*> nil #<marker at 354 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64/" #<marker (moves after insertion) at 354 in *magit: ~/work/stvs/provision/*> nil #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])] #2 [cl-struct-magit-section unpushed nil #<marker (moves after insertion) at 1193 in *magit: ~/work/stvs/provision/*> #<marker at 1211 in *magit: ~/work/stvs/provision/*> #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section commit "bd3ced8" #<marker (moves after insertion) at 1211 in *magit: ~/work/stvs/provision/*> nil #<marker at 1228 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "075e4d7" #<marker (moves after insertion) at 1228 in *magit: ~/work/stvs/provision/*> nil #<marker at 1264 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "79978c8" #<marker (moves after insertion) at 1264 in *magit: ~/work/stvs/provision/*> nil #<marker at 1288 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "cd351ee" #<marker (moves after insertion) at 1288 in *magit: ~/work/stvs/provision/*> nil #<marker at 1318 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "e065e59" #<marker (moves after insertion) at 1318 in *magit: ~/work/stvs/provision/*> nil #<marker at 1353 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "4b0782b" #<marker (moves after insertion) at 1353 in *magit: ~/work/stvs/provision/*> nil #<marker at 1409 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])])] (#1 [cl-struct-magit-section file "Makefile" #<marker (moves after insertion) at 522 in *magit: ~/work/stvs/provision/*> #<marker at 542 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> t nil nil "72de5ee..73828c4" nil #2 ([cl-struct-magit-section hunk ("UBUNTU_DEPS+=xfslibs-dev libcurl4-openssl-dev" "-26,7" "+26,7") #<marker (moves after insertion) at 542 in *magit: ~/work/stvs/provision/*> #<marker at 606 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])] [cl-struct-magit-section file "build_with_docker.sh" #<marker (moves after insertion) at 753 in *magit: ~/work/stvs/provision/*> #<marker at 785 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> t nil nil "b49b815..5e2a8b2" nil #2 ([cl-struct-magit-section hunk ("set -e" "-5,4" "+5,4") #<marker (moves after insertion) at 785 in *magit: ~/work/stvs/provision/*> #<marker at 808 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])])] ([cl-struct-magit-section hunk (nil "-1,4" "+1,4") #<marker (moves after insertion) at 441 in *magit: ~/work/stvs/provision/*> #<marker at 457 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #1 nil])] [cl-struct-magit-section file "Makefile" #<marker (moves after insertion) at 522 in *magit: ~/work/stvs/provision/*> #<marker at 542 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> t nil nil "72de5ee..73828c4" nil [cl-struct-magit-section unstaged nil #<marker (moves after insertion) at 404 in *magit: ~/work/stvs/provision/*> #<marker at 422 in *magit: ~/work/stvs/provision/*> #<marker at 1193 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil [cl-struct-magit-section status nil #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> nil #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil nil ([cl-struct-magit-section branch "develop" #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> #<marker at 36 in *magit: ~/work/stvs/provision/*> #<marker at 128 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section branch "origin/develop" #<marker (moves after insertion) at 36 in *magit: ~/work/stvs/provision/*> nil #<marker at 104 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section tag "v5.7.0" #<marker (moves after insertion) at 104 in *magit: ~/work/stvs/provision/*> nil #<marker at 127 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])] [cl-struct-magit-section untracked nil #<marker (moves after insertion) at 128 in *magit: ~/work/stvs/provision/*> #<marker at 145 in *magit: ~/work/stvs/provision/*> #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section file "Dockerfile.dev" #<marker (moves after insertion) at 145 in *magit: ~/work/stvs/provision/*> nil #<marker at 160 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "TODO.org" #<marker (moves after insertion) at 160 in *magit: ~/work/stvs/provision/*> nil #<marker at 169 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "copydeb.el" #<marker (moves after insertion) at 169 in *magit: ~/work/stvs/provision/*> nil #<marker at 180 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "data/provision/streams" #<marker (moves after insertion) at 180 in *magit: ~/work/stvs/provision/*> nil #<marker at 203 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "mysql/" #<marker (moves after insertion) at 203 in *magit: ~/work/stvs/provision/*> nil #<marker at 210 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/libqt5multimedia5-plugins_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 210 in *magit: ~/work/stvs/provision/*> nil #<marker at 265 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/lxc-docker-1.5.0_1.5.0_amd64.deb" #<marker (moves after insertion) at 265 in *magit: ~/work/stvs/provision/*> nil #<marker at 302 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 302 in *magit: ~/work/stvs/provision/*> nil #<marker at 354 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64/" #<marker (moves after insertion) at 354 in *magit: ~/work/stvs/provision/*> nil #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])] #2 [cl-struct-magit-section unpushed nil #<marker (moves after insertion) at 1193 in *magit: ~/work/stvs/provision/*> #<marker at 1211 in *magit: ~/work/stvs/provision/*> #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section commit "bd3ced8" #<marker (moves after insertion) at 1211 in *magit: ~/work/stvs/provision/*> nil #<marker at 1228 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "075e4d7" #<marker (moves after insertion) at 1228 in *magit: ~/work/stvs/provision/*> nil #<marker at 1264 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "79978c8" #<marker (moves after insertion) at 1264 in *magit: ~/work/stvs/provision/*> nil #<marker at 1288 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "cd351ee" #<marker (moves after insertion) at 1288 in *magit: ~/work/stvs/provision/*> nil #<marker at 1318 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "e065e59" #<marker (moves after insertion) at 1318 in *magit: ~/work/stvs/provision/*> nil #<marker at 1353 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "4b0782b" #<marker (moves after insertion) at 1353 in *magit: ~/work/stvs/provision/*> nil #<marker at 1409 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])])] ([cl-struct-magit-section file "Jamroot" #<marker (moves after insertion) at 422 in *magit: ~/work/stvs/provision/*> #<marker at 441 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> t nil nil "69deb0d..128486a" nil #2 ([cl-struct-magit-section hunk (nil "-1,4" "+1,4") #<marker (moves after insertion) at 441 in *magit: ~/work/stvs/provision/*> #<marker at 457 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])] #1 [cl-struct-magit-section file "build_with_docker.sh" #<marker (moves after insertion) at 753 in *magit: ~/work/stvs/provision/*> #<marker at 785 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> t nil nil "b49b815..5e2a8b2" nil #2 ([cl-struct-magit-section hunk ("set -e" "-5,4" "+5,4") #<marker (moves after insertion) at 785 in *magit: ~/work/stvs/provision/*> #<marker at 808 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])])] ([cl-struct-magit-section hunk ("UBUNTU_DEPS+=xfslibs-dev libcurl4-openssl-dev" "-26,7" "+26,7") #<marker (moves after insertion) at 542 in *magit: ~/work/stvs/provision/*> #<marker at 606 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #1 nil])]))
  (let ((auto-revert-verbose nil) (inhibit-magit-refresh t) (status (magit-file-status)) delete resurrect rename discard resolve) (let ((--dolist-tail-- sections) section) (while --dolist-tail-- (setq section (car --dolist-tail--)) (let ((file (progn nil (or ... ...) (aref section 2)))) (let* ((val (cons ... ...))) (if (consp val) (let* (...) (if ... ... ...)) nil))) (setq --dolist-tail-- (cdr --dolist-tail--)))) (if resolve (progn (let ((inhibit-magit-refresh t)) (let ((--dolist-tail-- (nreverse resolve)) file) (while --dolist-tail-- (setq file (car --dolist-tail--)) (magit-checkout-stage file (magit-checkout-read-stage file)) (setq --dolist-tail-- (cdr --dolist-tail--))))))) (magit-maybe-backup) (magit-discard-files--resurrect (nreverse resurrect)) (magit-discard-files--delete (nreverse delete)) (magit-discard-files--rename (nreverse rename)) (magit-discard-files--discard (nreverse discard)))
  magit-discard-files(([cl-struct-magit-section file "Jamroot" #<marker (moves after insertion) at 422 in *magit: ~/work/stvs/provision/*> #<marker at 441 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> t nil nil "69deb0d..128486a" nil [cl-struct-magit-section unstaged nil #<marker (moves after insertion) at 404 in *magit: ~/work/stvs/provision/*> #<marker at 422 in *magit: ~/work/stvs/provision/*> #<marker at 1193 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil [cl-struct-magit-section status nil #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> nil #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil nil ([cl-struct-magit-section branch "develop" #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> #<marker at 36 in *magit: ~/work/stvs/provision/*> #<marker at 128 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section branch "origin/develop" #<marker (moves after insertion) at 36 in *magit: ~/work/stvs/provision/*> nil #<marker at 104 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section tag "v5.7.0" #<marker (moves after insertion) at 104 in *magit: ~/work/stvs/provision/*> nil #<marker at 127 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])] [cl-struct-magit-section untracked nil #<marker (moves after insertion) at 128 in *magit: ~/work/stvs/provision/*> #<marker at 145 in *magit: ~/work/stvs/provision/*> #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section file "Dockerfile.dev" #<marker (moves after insertion) at 145 in *magit: ~/work/stvs/provision/*> nil #<marker at 160 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "TODO.org" #<marker (moves after insertion) at 160 in *magit: ~/work/stvs/provision/*> nil #<marker at 169 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "copydeb.el" #<marker (moves after insertion) at 169 in *magit: ~/work/stvs/provision/*> nil #<marker at 180 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "data/provision/streams" #<marker (moves after insertion) at 180 in *magit: ~/work/stvs/provision/*> nil #<marker at 203 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "mysql/" #<marker (moves after insertion) at 203 in *magit: ~/work/stvs/provision/*> nil #<marker at 210 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/libqt5multimedia5-plugins_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 210 in *magit: ~/work/stvs/provision/*> nil #<marker at 265 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/lxc-docker-1.5.0_1.5.0_amd64.deb" #<marker (moves after insertion) at 265 in *magit: ~/work/stvs/provision/*> nil #<marker at 302 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 302 in *magit: ~/work/stvs/provision/*> nil #<marker at 354 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64/" #<marker (moves after insertion) at 354 in *magit: ~/work/stvs/provision/*> nil #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])] #2 [cl-struct-magit-section unpushed nil #<marker (moves after insertion) at 1193 in *magit: ~/work/stvs/provision/*> #<marker at 1211 in *magit: ~/work/stvs/provision/*> #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section commit "bd3ced8" #<marker (moves after insertion) at 1211 in *magit: ~/work/stvs/provision/*> nil #<marker at 1228 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "075e4d7" #<marker (moves after insertion) at 1228 in *magit: ~/work/stvs/provision/*> nil #<marker at 1264 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "79978c8" #<marker (moves after insertion) at 1264 in *magit: ~/work/stvs/provision/*> nil #<marker at 1288 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "cd351ee" #<marker (moves after insertion) at 1288 in *magit: ~/work/stvs/provision/*> nil #<marker at 1318 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "e065e59" #<marker (moves after insertion) at 1318 in *magit: ~/work/stvs/provision/*> nil #<marker at 1353 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "4b0782b" #<marker (moves after insertion) at 1353 in *magit: ~/work/stvs/provision/*> nil #<marker at 1409 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])])] (#1 [cl-struct-magit-section file "Makefile" #<marker (moves after insertion) at 522 in *magit: ~/work/stvs/provision/*> #<marker at 542 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> t nil nil "72de5ee..73828c4" nil #2 ([cl-struct-magit-section hunk ("UBUNTU_DEPS+=xfslibs-dev libcurl4-openssl-dev" "-26,7" "+26,7") #<marker (moves after insertion) at 542 in *magit: ~/work/stvs/provision/*> #<marker at 606 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])] [cl-struct-magit-section file "build_with_docker.sh" #<marker (moves after insertion) at 753 in *magit: ~/work/stvs/provision/*> #<marker at 785 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> t nil nil "b49b815..5e2a8b2" nil #2 ([cl-struct-magit-section hunk ("set -e" "-5,4" "+5,4") #<marker (moves after insertion) at 785 in *magit: ~/work/stvs/provision/*> #<marker at 808 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])])] ([cl-struct-magit-section hunk (nil "-1,4" "+1,4") #<marker (moves after insertion) at 441 in *magit: ~/work/stvs/provision/*> #<marker at 457 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #1 nil])] [cl-struct-magit-section file "Makefile" #<marker (moves after insertion) at 522 in *magit: ~/work/stvs/provision/*> #<marker at 542 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> t nil nil "72de5ee..73828c4" nil [cl-struct-magit-section unstaged nil #<marker (moves after insertion) at 404 in *magit: ~/work/stvs/provision/*> #<marker at 422 in *magit: ~/work/stvs/provision/*> #<marker at 1193 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil [cl-struct-magit-section status nil #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> nil #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil nil ([cl-struct-magit-section branch "develop" #<marker (moves after insertion) at 1 in *magit: ~/work/stvs/provision/*> #<marker at 36 in *magit: ~/work/stvs/provision/*> #<marker at 128 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section branch "origin/develop" #<marker (moves after insertion) at 36 in *magit: ~/work/stvs/provision/*> nil #<marker at 104 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section tag "v5.7.0" #<marker (moves after insertion) at 104 in *magit: ~/work/stvs/provision/*> nil #<marker at 127 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])] [cl-struct-magit-section untracked nil #<marker (moves after insertion) at 128 in *magit: ~/work/stvs/provision/*> #<marker at 145 in *magit: ~/work/stvs/provision/*> #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section file "Dockerfile.dev" #<marker (moves after insertion) at 145 in *magit: ~/work/stvs/provision/*> nil #<marker at 160 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "TODO.org" #<marker (moves after insertion) at 160 in *magit: ~/work/stvs/provision/*> nil #<marker at 169 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "copydeb.el" #<marker (moves after insertion) at 169 in *magit: ~/work/stvs/provision/*> nil #<marker at 180 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "data/provision/streams" #<marker (moves after insertion) at 180 in *magit: ~/work/stvs/provision/*> nil #<marker at 203 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "mysql/" #<marker (moves after insertion) at 203 in *magit: ~/work/stvs/provision/*> nil #<marker at 210 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/libqt5multimedia5-plugins_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 210 in *magit: ~/work/stvs/provision/*> nil #<marker at 265 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/lxc-docker-1.5.0_1.5.0_amd64.deb" #<marker (moves after insertion) at 265 in *magit: ~/work/stvs/provision/*> nil #<marker at 302 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64.deb" #<marker (moves after insertion) at 302 in *magit: ~/work/stvs/provision/*> nil #<marker at 354 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section file "src/qtmultimedia5-examples_5.2.1-0ubuntu5_amd64/" #<marker (moves after insertion) at 354 in *magit: ~/work/stvs/provision/*> nil #<marker at 403 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])] #2 [cl-struct-magit-section unpushed nil #<marker (moves after insertion) at 1193 in *magit: ~/work/stvs/provision/*> #<marker at 1211 in *magit: ~/work/stvs/provision/*> #<marker at 1410 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #3 ([cl-struct-magit-section commit "bd3ced8" #<marker (moves after insertion) at 1211 in *magit: ~/work/stvs/provision/*> nil #<marker at 1228 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "075e4d7" #<marker (moves after insertion) at 1228 in *magit: ~/work/stvs/provision/*> nil #<marker at 1264 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "79978c8" #<marker (moves after insertion) at 1264 in *magit: ~/work/stvs/provision/*> nil #<marker at 1288 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "cd351ee" #<marker (moves after insertion) at 1288 in *magit: ~/work/stvs/provision/*> nil #<marker at 1318 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "e065e59" #<marker (moves after insertion) at 1318 in *magit: ~/work/stvs/provision/*> nil #<marker at 1353 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil] [cl-struct-magit-section commit "4b0782b" #<marker (moves after insertion) at 1353 in *magit: ~/work/stvs/provision/*> nil #<marker at 1409 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #5 nil])])] ([cl-struct-magit-section file "Jamroot" #<marker (moves after insertion) at 422 in *magit: ~/work/stvs/provision/*> #<marker at 441 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> t nil nil "69deb0d..128486a" nil #2 ([cl-struct-magit-section hunk (nil "-1,4" "+1,4") #<marker (moves after insertion) at 441 in *magit: ~/work/stvs/provision/*> #<marker at 457 in *magit: ~/work/stvs/provision/*> #<marker at 522 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])] #1 [cl-struct-magit-section file "build_with_docker.sh" #<marker (moves after insertion) at 753 in *magit: ~/work/stvs/provision/*> #<marker at 785 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> t nil nil "b49b815..5e2a8b2" nil #2 ([cl-struct-magit-section hunk ("set -e" "-5,4" "+5,4") #<marker (moves after insertion) at 785 in *magit: ~/work/stvs/provision/*> #<marker at 808 in *magit: ~/work/stvs/provision/*> #<marker at 1192 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #4 nil])])] ([cl-struct-magit-section hunk ("UBUNTU_DEPS+=xfslibs-dev libcurl4-openssl-dev" "-26,7" "+26,7") #<marker (moves after insertion) at 542 in *magit: ~/work/stvs/provision/*> #<marker at 606 in *magit: ~/work/stvs/provision/*> #<marker at 753 in *magit: ~/work/stvs/provision/*> nil nil nil nil nil #1 nil])]))
  (let nil (magit-discard-files (magit-region-sections)))
  (if (null x) (let nil (magit-discard-files (magit-region-sections))) (let nil (magit-discard-apply it)))
  (let* ((x (cdr x))) (if (null x) (let nil (magit-discard-files (magit-region-sections))) (let nil (magit-discard-apply it))))
  (cond ((eq x (quote list)) (let* ((x (cdr x))) (if (null x) (let nil (magit-discard-files (progn nil (or ... ...) (aref it 12)))) (let nil (magit-discard-apply it))))) ((eq x (quote files)) (let* ((x (cdr x))) (if (null x) (let nil (magit-discard-files (magit-region-sections))) (let nil (magit-discard-apply it))))) ((eq x (quote file)) (let* ((x (cdr x))) (if (null x) (let nil (magit-discard-files (list it))) (let nil (magit-discard-apply it))))) (t (let nil (magit-discard-apply it))))
  (let* ((x (car x))) (cond ((eq x (quote list)) (let* ((x (cdr x))) (if (null x) (let nil (magit-discard-files (progn nil ... ...))) (let nil (magit-discard-apply it))))) ((eq x (quote files)) (let* ((x (cdr x))) (if (null x) (let nil (magit-discard-files (magit-region-sections))) (let nil (magit-discard-apply it))))) ((eq x (quote file)) (let* ((x (cdr x))) (if (null x) (let nil (magit-discard-files (list it))) (let nil (magit-discard-apply it))))) (t (let nil (magit-discard-apply it)))))
  (if (consp x) (let* ((x (car x))) (cond ((eq x (quote list)) (let* ((x (cdr x))) (if (null x) (let nil (magit-discard-files ...)) (let nil (magit-discard-apply it))))) ((eq x (quote files)) (let* ((x (cdr x))) (if (null x) (let nil (magit-discard-files ...)) (let nil (magit-discard-apply it))))) ((eq x (quote file)) (let* ((x (cdr x))) (if (null x) (let nil (magit-discard-files ...)) (let nil (magit-discard-apply it))))) (t (let nil (magit-discard-apply it))))) (let nil (magit-discard-apply it)))
  (let* ((x (cdr val))) (if (consp x) (let* ((x (car x))) (cond ((eq x (quote list)) (let* ((x ...)) (if (null x) (let nil ...) (let nil ...)))) ((eq x (quote files)) (let* ((x ...)) (if (null x) (let nil ...) (let nil ...)))) ((eq x (quote file)) (let* ((x ...)) (if (null x) (let nil ...) (let nil ...)))) (t (let nil (magit-discard-apply it))))) (let nil (magit-discard-apply it))))
  (cond ((eq x (quote committed)) (let* ((x (cdr val))) (if (consp x) (let* ((x (cdr x))) (if (null x) (let nil (user-error "Cannot discard committed changes")) (let nil (magit-discard-apply it)))) (let nil (magit-discard-apply it))))) ((eq x (quote undefined)) (let* ((x (cdr val))) (if (consp x) (let* ((x (cdr x))) (if (null x) (let nil (user-error "Cannot discard this change")) (let nil (magit-discard-apply it)))) (let nil (magit-discard-apply it))))) (t (let* ((x (cdr val))) (if (consp x) (let* ((x (car x))) (cond ((eq x ...) (let* ... ...)) ((eq x ...) (let* ... ...)) ((eq x ...) (let* ... ...)) (t (let nil ...)))) (let nil (magit-discard-apply it))))))
  (let* ((x (car val))) (cond ((eq x (quote committed)) (let* ((x (cdr val))) (if (consp x) (let* ((x ...)) (if (null x) (let nil ...) (let nil ...))) (let nil (magit-discard-apply it))))) ((eq x (quote undefined)) (let* ((x (cdr val))) (if (consp x) (let* ((x ...)) (if (null x) (let nil ...) (let nil ...))) (let nil (magit-discard-apply it))))) (t (let* ((x (cdr val))) (if (consp x) (let* ((x ...)) (cond (... ...) (... ...) (... ...) (t ...))) (let nil (magit-discard-apply it)))))))
  (if (consp val) (let* ((x (car val))) (cond ((eq x (quote committed)) (let* ((x (cdr val))) (if (consp x) (let* (...) (if ... ... ...)) (let nil (magit-discard-apply it))))) ((eq x (quote undefined)) (let* ((x (cdr val))) (if (consp x) (let* (...) (if ... ... ...)) (let nil (magit-discard-apply it))))) (t (let* ((x (cdr val))) (if (consp x) (let* (...) (cond ... ... ... ...)) (let nil (magit-discard-apply it))))))) (let nil (magit-discard-apply it)))
  (let* ((val (list (magit-diff-type) (magit-diff-scope)))) (if (consp val) (let* ((x (car val))) (cond ((eq x (quote committed)) (let* ((x ...)) (if (consp x) (let* ... ...) (let nil ...)))) ((eq x (quote undefined)) (let* ((x ...)) (if (consp x) (let* ... ...) (let nil ...)))) (t (let* ((x ...)) (if (consp x) (let* ... ...) (let nil ...)))))) (let nil (magit-discard-apply it))))
  (progn (let* ((val (list (magit-diff-type) (magit-diff-scope)))) (if (consp val) (let* ((x (car val))) (cond ((eq x (quote committed)) (let* (...) (if ... ... ...))) ((eq x (quote undefined)) (let* (...) (if ... ... ...))) (t (let* (...) (if ... ... ...))))) (let nil (magit-discard-apply it)))))
  (if it (progn (let* ((val (list (magit-diff-type) (magit-diff-scope)))) (if (consp val) (let* ((x (car val))) (cond ((eq x ...) (let* ... ...)) ((eq x ...) (let* ... ...)) (t (let* ... ...)))) (let nil (magit-discard-apply it))))))
  (let ((it (magit-current-section))) (if it (progn (let* ((val (list (magit-diff-type) (magit-diff-scope)))) (if (consp val) (let* ((x ...)) (cond (... ...) (... ...) (t ...))) (let nil (magit-discard-apply it)))))))
  magit-discard()
  funcall-interactively(magit-discard)
  #<subr call-interactively>(magit-discard nil nil)
  ad-Advice-call-interactively(#<subr call-interactively> magit-discard nil nil)
  apply(ad-Advice-call-interactively #<subr call-interactively> (magit-discard nil nil))
  call-interactively(magit-discard nil nil)
  command-execute(magit-discard)

The section was folded when I did that (M-1). Pressing k for single file works fine.
@Silex
Copy link
Contributor Author

Silex commented Feb 18, 2015

Also trying to discard changes in a binary file fails, even for single file selection.

@Silex Silex changed the title cannot discard multiple unstaged changes for files Fannot discard multiple unstaged changes for files Feb 23, 2015
@Silex Silex changed the title Fannot discard multiple unstaged changes for files Cannot discard multiple unstaged changes for files Feb 23, 2015
tarsius added a commit that referenced this issue Feb 27, 2015
@tarsius
magit-{discard,reverse}-apply: fix acting on multiple files
7b227ee 
c3535ab injected an additional argument
before `magit-diff-scope's SINGULAR argument without adjusting callers
accordingly.  Fixes #1733.
@tarsius
Copy link
Member

tarsius commented Feb 27, 2015

Please open a new issue for the problem with binary files - it's not related.

@tarsius tarsius closed this as completed Feb 27, 2015
@Silex
Copy link
Contributor Author

Silex commented Feb 27, 2015

Alright, thanks

@tarsius tarsius modified the milestone: 2.1.0 Apr 26, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Milestone
2.1.0
Development

No branches or pull requests
2 participants
@Silex @tarsius