Created
June 20, 2013 16:26
-
-
Save mattd/5824290 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Debugger entered--Lisp error: (error "test1.txt: patch does not apply ... [Hit $ to see buffer *magit-process* for details]") | |
signal(error ("test1.txt: patch does not apply ... [Hit $ to see buffer *magit-process* for details]")) | |
error("%s ... [%s buffer %s for details]" "test1.txt: patch does not apply" "Hit $ to see" "*magit-process*") | |
magit-run*(("git" "--no-pager" "apply" "-") nil nil nil nil #<buffer *magit-tmp*>) | |
#[nil "\304\305 B\n\"\306\211\211\211&\207" [magit-git-executable magit-git-standard-options args input magit-run* append nil] 7]() | |
magit-refresh-wrapper(#[nil "\304\305 B\n\"\306\211\211\211&\207" [magit-git-executable magit-git-standard-options args input magit-run* append nil] 7]) | |
magit-run-git-with-input(#<buffer *magit-tmp*> "apply" "-") | |
apply(magit-run-git-with-input #<buffer *magit-tmp*> "apply" "-") | |
magit-apply-hunk-item*([cl-struct-magit-section [cl-struct-magit-section [cl-struct-magit-section nil diffbuf 1 359 ([cl-struct-magit-section #2 "diffstats" 17 67 ([cl-struct-magit-section #4 "diffstat" 49 67 nil nil diffstat (diffstat "test1.txt" completed) nil]) nil diffstats nil nil] #1 [cl-struct-magit-section #2 "diff --git a/test2.txt b/test2.txt" 270 359 nil nil diff (modified "test2.txt" "test2.txt" ("HEAD" . working)) nil]) nil nil nil nil] "diff --git a/test1.txt b/test1.txt" 68 270 (#0) nil diff (modified "test1.txt" "test1.txt" ("HEAD" . working)) nil] "@@ -1,3 +1,5 @@" 212 270 nil nil hunk nil nil] nil) | |
apply(magit-apply-hunk-item* [cl-struct-magit-section [cl-struct-magit-section [cl-struct-magit-section nil diffbuf 1 359 ([cl-struct-magit-section #2 "diffstats" 17 67 ([cl-struct-magit-section #4 "diffstat" 49 67 nil nil diffstat (diffstat "test1.txt" completed) nil]) nil diffstats nil nil] #1 [cl-struct-magit-section #2 "diff --git a/test2.txt b/test2.txt" 270 359 nil nil diff (modified "test2.txt" "test2.txt" ("HEAD" . working)) nil]) nil nil nil nil] "diff --git a/test1.txt b/test1.txt" 68 270 (#0) nil diff (modified "test1.txt" "test1.txt" ("HEAD" . working)) nil] "@@ -1,3 +1,5 @@" 212 270 nil nil hunk nil nil] nil nil) | |
magit-apply-hunk-item([cl-struct-magit-section [cl-struct-magit-section [cl-struct-magit-section nil diffbuf 1 359 ([cl-struct-magit-section #2 "diffstats" 17 67 ([cl-struct-magit-section #4 "diffstat" 49 67 nil nil diffstat (diffstat "test1.txt" completed) nil]) nil diffstats nil nil] #1 [cl-struct-magit-section #2 "diff --git a/test2.txt b/test2.txt" 270 359 nil nil diff (modified "test2.txt" "test2.txt" ("HEAD" . working)) nil]) nil nil nil nil] "diff --git a/test1.txt b/test1.txt" 68 270 (#0) nil diff (modified "test1.txt" "test1.txt" ("HEAD" . working)) nil] "@@ -1,3 +1,5 @@" 212 270 nil nil hunk nil nil]) | |
#[nil "\306\307 \211\205 \310H\n>\204 \311\312\313\314#\210 \315H\316\317 \"\203. \320!\210\321\322\323#\202\265 \316\324 \"\203; \320!\202\265 \316\325 \"\203H \311\326!\202\265 \316\327 \"\203U \311\326!\202\265 \316\330 \"\203b \331 !\202\265 \316\332 \"\203o \333 !\202\265 \316\334 \"\203~ \335\336\306#\202\265 \316\337 \"\206\265 \307 \211\205\235 \f\310H\n>\204\232 \311\312\340\314#\210\f\341H\211\203\260 \311\342 \343N\206\254 #\202\264 \311\344\"**\211%&=?\205\302 %*\207" [*opname* item cl-struct-magit-section-tags info section type "apply" magit-current-section 0 error "%s accessing a non-%s" magit-section-info magit-section 8 magit-section-match (pending commit) magit-apply-commit magit-rewrite-set-commit-property used t (commit) (unstaged *) "Change is already in your working tree" (staged *) (hunk) magit-apply-hunk-item (diff) magit-apply-diff-item (stash) magit-run-git "stash" (run-hook-with-args-until-success (quote magit-*opname*-action-hook)) magit-section-type 7 "Can't %s a %s" magit-description "Nothing to %s here" *value* magit-section-action-success] 6]() | |
magit-refresh-wrapper(#[nil "\306\307 \211\205 \310H\n>\204 \311\312\313\314#\210 \315H\316\317 \"\203. \320!\210\321\322\323#\202\265 \316\324 \"\203; \320!\202\265 \316\325 \"\203H \311\326!\202\265 \316\327 \"\203U \311\326!\202\265 \316\330 \"\203b \331 !\202\265 \316\332 \"\203o \333 !\202\265 \316\334 \"\203~ \335\336\306#\202\265 \316\337 \"\206\265 \307 \211\205\235 \f\310H\n>\204\232 \311\312\340\314#\210\f\341H\211\203\260 \311\342 \343N\206\254 #\202\264 \311\344\"**\211%&=?\205\302 %*\207" [*opname* item cl-struct-magit-section-tags info section type "apply" magit-current-section 0 error "%s accessing a non-%s" magit-section-info magit-section 8 magit-section-match (pending commit) magit-apply-commit magit-rewrite-set-commit-property used t (commit) (unstaged *) "Change is already in your working tree" (staged *) (hunk) magit-apply-hunk-item (diff) magit-apply-diff-item (stash) magit-run-git "stash" (run-hook-with-args-until-success (quote magit-*opname*-action-hook)) magit-section-type 7 "Can't %s a %s" magit-description "Nothing to %s here" *value* magit-section-action-success] 6]) | |
magit-apply-item() | |
call-interactively(magit-apply-item nil nil) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment