From 0ca61f9895594c7b4978ba56bb0a46fe3c7b9d05 Mon Sep 17 00:00:00 2001 From: "jhannwong@c9c7a67b5632a4bbc0c959cfeb3d340e02f28565" Date: Thu, 17 Dec 2015 02:25:02 +0000 Subject: --- ...-Pick_function_throws_error_with_git-annex.mdwn | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 doc/bugs/SmartGit__39__s_Cherry-Pick_function_throws_error_with_git-annex.mdwn diff --git a/doc/bugs/SmartGit__39__s_Cherry-Pick_function_throws_error_with_git-annex.mdwn b/doc/bugs/SmartGit__39__s_Cherry-Pick_function_throws_error_with_git-annex.mdwn new file mode 100644 index 000000000..9bad58b80 --- /dev/null +++ b/doc/bugs/SmartGit__39__s_Cherry-Pick_function_throws_error_with_git-annex.mdwn @@ -0,0 +1,43 @@ +### Please describe the problem. + +In SmartGit, doing a cherry-pick invokes the following 2 commands. + +``git cherry-pick --no-commit `` +``git commit "--author=''" "--date=''" --file=/var/folders/bw/jh4pq43918gfd_r7qxzkkt_40000gq/T/smartgit3129597356340000806tmp/commit7268815197345344355.tmp`` + +The error is _git 'annex' is not a git command_. + + +### What steps will reproduce the problem? + +``git-annex init `` + +Do some commits in 2 branches. +Do a cherry-pick in SmartGit. + + +### What version of git-annex are you using? On what operating system? + +PLEASE provide instructions here on how to get the git-annex version. +(It is ``git-annex version``. And why is ``git-annex | less`` blanking out when I press any key?) + +git-annex: 5.20151019 + +OS: Mac OS El Capitan. + + +### Please provide any additional information below. + +[[!format sh """ +# If you can, paste a complete transcript of the problem occurring here. +# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log + + +# End of transcript or log. +"""]] + +### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) + +Yes. Lots. Am an expert at it now. + +This can either be a problem with SmartGit, or a problem with the hacks that git-annex puts into a standard git repo. -- cgit v1.2.3