raxod502
commented
7 years ago Try M-x straight-normalize-package RET magit RET followed by M-x straight-thaw-versions RET.
Closed redpanda1234 closed 7 years ago
raxod502
commented
7 years ago Try M-x straight-normalize-package RET magit RET followed by M-x straight-thaw-versions RET.
redpanda1234
commented
7 years ago M-x straight-normalize-package RET magit RET yielded
In repository "magit", HEAD is even with branch "master", but detached.
a Attach HEAD to branch "master"
e Dired and open recursive edit
g Magit and open recursive edit
C-g CancelI chose a and moved on to M-x straight-thaw-versions RET, which errored with
Debugger entered--Lisp error: (wrong-type-argument stringp nil)
string-match("\\`\\(?:\\(?:/.*/\\)?git-credential-\\)?cache\\'" nil nil)
#[0 "\304\3051�\306 \"\307\n\310\311\312$)0\202�\210\304\313\314\203\224�\203\224�@\203-�\304\262\202\210�\315!\211A\262\242\316\304\313\317#)\266\203\205\204�\211\304\211\211\313\304:\203|�\262\211A\262\242\262@\262\320\230\203q�\262\304\211\262\202r�\313\203|�A\262\202M�\266\205\206\204�\321\322!\266\203\262\210\211T\262A\262\202�\266\211\207" [magit-git-environment process-environment magit-git-executable inhibit-changing-match-data nil (error) append process-lines "config" "--get-all" "credential.helper" t 0 split-string "\\`\\(?:\\(?:/.*/\\)?git-credential-\\)?cache\\'" string-match "--socket" expand-file-name "~/.git-credential-cache/socket"] 16]()
funcall(#[0 "\304\3051�\306 \"\307\n\310\311\312$)0\202�\210\304\313\314\203\224�\203\224�@\203-�\304\262\202\210�\315!\211A\262\242\316\304\313\317#)\266\203\205\204�\211\304\211\211\313\304:\203|�\262\211A\262\242\262@\262\320\230\203q�\262\304\211\262\202r�\313\203|�A\262\202M�\266\205\206\204�\321\322!\266\203\262\210\211T\262A\262\202�\266\211\207" [magit-git-environment process-environment magit-git-executable inhibit-changing-match-data nil (error) append process-lines "config" "--get-all" "credential.helper" t 0 split-string "\\`\\(?:\\(?:/.*/\\)?git-credential-\\)?cache\\'" string-match "--socket" expand-file-name "~/.git-credential-cache/socket"] 16])
eval((funcall (function #[0 "\304\3051�\306 \"\307\n\310\311\312$)0\202�\210\304\313\314\203\224�\203\224�@\203-�\304\262\202\210�\315!\211A\262\242\316\304\313\317#)\266\203\205\204�\211\304\211\211\313\304:\203|�\262\211A\262\242\262@\262\320\230\203q�\262\304\211\262\202r�\313\203|�A\262\202M�\266\205\206\204�\321\322!\266\203\262\210\211T\262A\262\202�\266\211\207" [magit-git-environment process-environment magit-git-executable inhibit-changing-match-data nil (error) append process-lines "config" "--get-all" "credential.helper" t 0 split-string "\\`\\(?:\\(?:/.*/\\)?git-credential-\\)?cache\\'" string-match "--socket" expand-file-name "~/.git-credential-cache/socket"] 16])))
custom-initialize-reset(magit-credential-cache-daemon-socket (funcall (function #[0 "\304\3051�\306 \"\307\n\310\311\312$)0\202�\210\304\313\314\203\224�\203\224�@\203-�\304\262\202\210�\315!\211A\262\242\316\304\313\317#)\266\203\205\204�\211\304\211\211\313\304:\203|�\262\211A\262\242\262@\262\320\230\203q�\262\304\211\262\202r�\313\203|�A\262\202M�\266\205\206\204�\321\322!\266\203\262\210\211T\262A\262\202�\266\211\207" [magit-git-environment process-environment magit-git-executable inhibit-changing-match-data nil (error) append process-lines "config" "--get-all" "credential.helper" t 0 split-string "\\`\\(?:\\(?:/.*/\\)?git-credential-\\)?cache\\'" string-match "--socket" expand-file-name "~/.git-credential-cache/socket"] 16])))
custom-declare-variable(magit-credential-cache-daemon-socket (funcall (function #[0 "\304\3051�\306 \"\307\n\310\311\312$)0\202�\210\304\313\314\203\224�\203\224�@\203-�\304\262\202\210�\315!\211A\262\242\316\304\313\317#)\266\203\205\204�\211\304\211\211\313\304:\203|�\262\211A\262\242\262@\262\320\230\203q�\262\304\211\262\202r�\313\203|�A\262\202M�\266\205\206\204�\321\322!\266\203\262\210\211T\262A\262\202�\266\211\207" [magit-git-environment process-environment magit-git-executable inhibit-changing-match-data nil (error) append process-lines "config" "--get-all" "credential.helper" t 0 split-string "\\`\\(?:\\(?:/.*/\\)?git-credential-\\)?cache\\'" string-match "--socket" expand-file-name "~/.git-credential-cache/socket"] 16])) "If non-nil, start a credential cache daemon using this socket.\n\nWhen using Git's cache credential helper in the normal way, Emacs\nsends a SIGHUP to the credential daemon after the git subprocess\nhas exited, causing the daemon to also quit. This can be avoided\nby starting the `git-credential-cache--daemon' process directly\nfrom Emacs.\n\nThe function `magit-maybe-start-credential-cache-daemon' takes\ncare of starting the daemon if necessary, using the value of this\noption as the socket. If this option is nil, then it does not\nstart any daemon. Likewise if another daemon is already running,\nthen it starts no new daemon. This function has to be a member\nof the hook variable `magit-credential-hook' for this to work.\nIf an error occurs while starting the daemon, most likely because\nthe necessary executable is missing, then the function removes\nitself from the hook, to avoid further futile attempts." :package-version (magit . "2.3.0") :group magit-process :type (choice (file :tag "Socket") (const :tag "Don't start a cache daemon" nil)))
byte-code("\300\301!\210\300\302!\210\300\303!\210\300\304!\210\300\305!\210\300\306!\210\300\307!\210\310\311\312\313\314DD\315\316\317\320\321&\210\310\322\312\313\323DD\324\325\326\316\317\320\327& \210\310\330\312\313\331DD\332\316\317\320\333&\210\310\334\312\313\335DD\336\325\337\316\317\320\340& \210\310\341\312\313\342DD\343\325\344\316\317\320\345& \210\310\346\312\313\347DD\350\325\351\316\317\320\352& \210\310\353\312\313\354DD\355\325\356\316\317\320\357& \210\310\360\312\313\361DD\362\325\363\316\317\320\364\365\366& \210\310\367\312\313\370DD\371\325\372\316\317\320\373& \210\310\374\312\313\375DD\376\325\377\316\317\320\201@�& \210\201A�\201B�\201C�\201D�\316\201E�%\210\201A�\201F�\201G�\201H�\316\201E�%\207" [require cl-lib dash with-editor magit-utils magit-section magit-git magit-mode custom-declare-variable magit-process-connection-type funcall function #[0 "\301=?\207" [system-type cygwin] 2] "Connection type used for the Git process.\n\nIf nil, use pipes: this is usually more efficient, and works on Cygwin.\nIf t, use ptys: this enables Magit to prompt for passphrases when needed." :group magit-process :type (choice (const :tag "pipe" nil) (const :tag "pty" t)) magit-need-cygwin-noglob #[0 "\304=\205B�\305\306!r\211q\210\307\310\311\312\313!\314\"\315$\216\316 \n\"\31711�\320 \321p\321\322\323\324\325&0\2029�\326\327\330\331$\262\210)\332 \333\232*\262\207" [system-type magit-git-environment process-environment magit-git-executable windows-nt generate-new-buffer " *temp*" make-byte-code 0 "\301\300!\205 �\302\300!\207" vconcat vector [buffer-name kill-buffer] 2 append (file-error) process-file nil "-c" "alias.echo=!echo" "echo" "x{0}" lwarn magit-process :warning "Could not run Git: %S" buffer-string "x0\n"] 10] "Whether to use a workaround for Cygwin's globbing behavior.\n\nIf non-nil, add environment variables to `process-environment' to\nprevent the git.exe distributed by Cygwin and MSYS2 from\nattempting to perform glob expansion when called from a native\nWindows build of Emacs. See #2246." :package-version (magit . "2.3.0") (choice (const :tag "Yes" t) (const :tag "No" nil)) magit-process-popup-time #[0 "\300\207" [-1] 1] "Popup the process buffer if a command takes longer than this many seconds." (choice (const :tag "Never" -1) (const :tag "Immediately" 0) (integer :tag "After this many seconds")) magit-process-log-max #[0 "\300\207" [32] 1] "Maximum number of sections to keep in a process log buffer.\nWhen adding a new section would go beyond the limit set here,\nthen the older half of the sections are remove. Sections that\nbelong to processes that are still running are never removed.\nWhen this is nil, no sections are ever removed." (magit . "2.1.0") (choice (const :tag "Never remove old sections" nil) integer) magit-credential-cache-daemon-socket #[0 "\304\3051�\306 \"\307\n\310\311\312$)0\202�\210\304\313\314\203\224�\203\224�@\203-�\304\262\202\210�\315!\211A\262\242\316\304\313\317#)\266\203\205\204�\211\304\211\211\313\304:\203|�\262\211A\262\242\262@\262\320\230\203q�\262\304\211\262\202r�\313\203|�A\262\202M�\266\205\206\204�\321\322!\266\203\262\210\211T\262A\262\202�\266\211\207" [magit-git-environment process-environment magit-git-executable inhibit-changing-match-data nil (error) append process-lines "config" "--get-all" "credential.helper" t 0 split-string "\\`\\(?:\\(?:/.*/\\)?git-credential-\\)?cache\\'" string-match "--socket" expand-file-name "~/.git-credential-cache/socket"] 16] "If non-nil, start a credential cache daemon using this socket.\n\nWhen using Git's cache credential helper in the normal way, Emacs\nsends a SIGHUP to the credential daemon after the git subprocess\nhas exited, causing the daemon to also quit. This can be avoided\nby starting the `git-credential-cache--daemon' process directly\nfrom Emacs.\n\nThe function `magit-maybe-start-credential-cache-daemon' takes\ncare of starting the daemon if necessary, using the value of this\noption as the socket. If this option is nil, then it does not\nstart any daemon. Likewise if another daemon is already running,\nthen it starts no new daemon. This function has to be a member\nof the hook variable `magit-credential-hook' for this to work.\nIf an error occurs while starting the daemon, most likely because\nthe necessary executable is missing, then the function removes\nitself from the hook, to avoid further futile attempts." (magit . "2.3.0") (choice (file :tag "Socket") (const :tag "Don't start a cache daemon" nil)) magit-process-yes-or-no-prompt-regexp #[0 "\300\207" [" [[(]\\([Yy]\\(?:es\\)?\\)[/|]\\([Nn]o?\\)[])] ?[?:] ?$"] 1 " [[(]\\([Yy]\\(?:es\\)?\\)[/|]\\([Nn]o?\\)[])] ?[?:] ?$"] "Regexp matching Yes-or-No prompts of Git and its subprocesses." (magit . "2.1.0") regexp magit-process-password-prompt-regexps #[0 "\300\207" [("^\\(Enter \\)?[Pp]assphrase\\( for \\(RSA \\)?key '.*'\\)?: ?$" "^\\(Enter \\)?[Pp]assword\\( for '\\(?99:.*\\)'\\)?: ?$" "^.*'s password: ?$" "^Yubikey for .*: ?$" "^Enter PIN for .*: ?$")] 1] "List of regexps matching password prompts of Git and its subprocesses.\nAlso see `magit-process-find-password-functions'." (magit . "2.8.0") (repeat (regexp)) magit-process-find-password-functions #[0 "\300\207" [nil] 1] ...] 12)
require(magit-process)
byte-code("\300\301!\210\300\302!\210\300\303!\210\300\304!\210\300\305!\210\300\306!\210\300\307!\210\300\310!\210\311\312\313\314\315\316\315\317\315\320\321\322& \210\311\323\313\324\315\325\321\312&\210\311\326\313\327\321\312%\210\311\330\313\331\321\312%\210\311\332\313\333\315\334\315\335\321\330& \210\311\336\313\337\321\312%\210\311\340\313\341\315\342\321\312&\210\311\343\313\344\315\345\321\312\321\340& \210\311\346\313\347\321\312\321\350&\210\311\351\313\352\321\312%\210\353\336\301\354#\210\353\346\355\354#\210\353\336\356\354#\210\353\346\357\354#\210\353\336\360\354#\210\353\346\361\354#\210\353\307\362\354#\210\311\363\313\364\315\365\315\366\315\367\315\370\321\312\321\351\321\323&\210\353\363\371\372#\210\353\373\371\372#\210\353\363\374\372#\210\353\363\375\372#\210\353\363\376\372#\210\377\201@�!\207" [require magit-popup magit-utils magit-section magit-git magit-mode magit-margin magit-process magit-autorevert custom-declare-group magit nil "Controlling Git from Emacs." :link (url-link "https://magit.vc") (info-link "(magit)FAQ") (info-link "(magit)") :group tools magit-essentials "Options that every Magit user should briefly think about.\n\nEach of these options falls into one or more of these categories:\n\n* Options that affect Magit's behavior in fundamental ways.\n* Options that affect safety.\n* Options that affect performance.\n* Options that are of a personal nature." (info-link "(magit)Essential Settings") magit-miscellaneous "Miscellanous Magit options." magit-commands "Options controlling behavior of certain commands." magit-git-arguments "Options controlling what arguments are passed to Git.\n\nMost of these options can be set using the respective popup,\nand it is recommended that you do that because then you can\nbe certain that Magit supports the arguments that you select.\n\nAn option `magit-NAME-argument' specifies the arguments that\nare enabled by default by the popup `magit-NAME-popup'." (info-link "(magit-popup)Customizing Existing Popups") (info-link "(magit-popup)Usage") magit-modes "Modes used or provided by Magit." magit-buffers "Options concerning Magit buffers." (info-link "(magit)Modes and Buffers") magit-refresh "Options controlling how Magit buffers are refreshed." (info-link "(magit)Automatic Refreshing of Magit Buffers") magit-faces "Faces used by Magit." faces magit-extensions "Extensions to Magit." custom-add-to-group custom-group magit-popup-faces git-commit git-commit-faces git-rebase git-rebase-faces ...] 18)
require(magit-core)
byte-code("\300\301!\210\300\302!\210\300\303!\210\300\304!\210\300\305!\210\300\306!\210\300\307!\210\300\310!\210\300\311!\210\300\312!\210\300\313\314\315#\207" [require cl-lib dash with-editor git-commit magit-core magit-diff magit-apply magit-log magit-repos format-spec package nil t] 4)
require(magit)
byte-code("\301\302!\210\301\303!\210\304\305\306\307\310\311\312\313&\210\314\315\316\317\320DD\321\312\305\322\323&\210\314\324\316\317\325DD\326\327\330\312\305\322\323\331\332& \210\314\333\316\317\334DD\335\327\336\312\305\322\323& \210\314\337\316\317\340DD\341\327\342\312\305\322\343& \210\314\344\316\317\345DD\346\327\347\312\305\322\343& \210\314\350\316\317\351DD\352\327\353\312\305\312\354\322\355\356\357\360\361\362\363\364\"&\207" [magit-log-margin--custom-type require magit subr-x custom-declare-group magit-status nil "Inspect and manipulate Git repositories." :link (info-link "(magit)Status Buffer") :group magit-modes custom-declare-variable magit-status-mode-hook funcall function #[0 "\300\207" [nil] 1] "Hook run after entering Magit-Status mode." :type hook magit-status-headers-hook #[0 "\300\207" [(magit-insert-error-header magit-insert-diff-filter-header magit-insert-head-branch-header magit-insert-upstream-branch-header magit-insert-push-branch-header magit-insert-tags-header)] 1] "Hook run to insert headers into the status buffer.\n\nThis hook is run by `magit-insert-status-headers', which in turn\nhas to be a member of `magit-status-sections-hook' to be used at\nall." :package-version (magit . "2.1.0") :options (magit-insert-error-header magit-insert-diff-filter-header magit-insert-repo-header magit-insert-remote-header magit-insert-head-branch-header magit-insert-upstream-branch-header magit-insert-push-branch-header magit-insert-tags-header) magit-status-sections-hook #[0 "\300\207" [(magit-insert-status-headers magit-insert-merge-log magit-insert-rebase-sequence magit-insert-am-sequence magit-insert-sequencer-sequence magit-insert-bisect-output magit-insert-bisect-rest magit-insert-bisect-log magit-insert-untracked-files magit-insert-unstaged-changes magit-insert-staged-changes magit-insert-stashes magit-insert-unpulled-from-upstream magit-insert-unpulled-from-pushremote magit-insert-unpushed-to-upstream magit-insert-unpushed-to-pushremote)] 1] "Hook run to insert sections into a status buffer." (magit . "2.4.0") magit-status-expand-stashes #[0 "\300\207" [t] 1] "Whether the list of stashes is expanded initially." (magit . "2.3.0") boolean magit-status-show-hashes-in-headers #[0 "\300\207" [nil] 1] "Whether headers in the status buffer show hashes.\nThe functions which respect this option are\n`magit-insert-head-branch-header',\n`magit-insert-upstream-branch-header', and\n`magit-insert-push-branch-header'." (magit . "2.4.0") magit-status-margin #[0 "\301A@\302\301\3038\257\207" [magit-log-margin nil magit-log-margin-width 4] 6] "Format of the margin in `magit-status-mode' buffers.\n\nThe value has the form (INIT STYLE WIDTH AUTHOR AUTHOR-WIDTH).\n\nIf INIT is non-nil, then the margin is shown initially.\nSTYLE controls how to format the committer date. It can be one\n of `age' (to show the age of the commit), `age-abbreviated' (to\n abbreviate the time unit to a character), or a string (suitable\n for `format-time-string') to show the actual date.\nWIDTH controls the width of the margin. This exists for forward\n compatibility and currently the value should not be changed.\nAUTHOR controls whether the name of the author is also shown by\n default.\nAUTHOR-WIDTH has to be an integer. When the name of the author\n is shown, then this specifies how much space is used to do so." (magit . "2.9.0") magit-margin :initialize magit-custom-initialize-reset :set-after (magit-log-margin) :set ...] 20)
autoload-do-load((autoload "magit-status" "Show the status of the current Git repository in a buffer.\nWith a prefix argument prompt for a repository to be shown.\nWith two prefix arguments prompt for an arbitrary directory.\nIf that directory isn't the root of an existing repository,\nthen offer to initialize it as a new repository.\n\n(fn &optional DIRECTORY)" t nil) magit-status)
command-execute(magit-status)Oh, my bad. Probably the easiest way to do this would be to just go to ~/.emacs.d/straight/repos/magit, fetch the latest version, and check out the revision specified in Radian's versions.el (hopefully when straight.el is improved, this will be easier to do automatically).
redpanda1234
commented
7 years ago It worked, thanks!
magit-status gives error "Wrong type argument: stringp, nil".
Backtrace "helpfully" provided below