After you do a "git status", what is the return code?
In bash, it's:
git status
echo $?
If it's non-zero, but everything appears to be fine, then I was wrong in my
assumption about git's return statuses. I don't have access to the git
tree here, so I would have to look at it later tonight.
Thanks!
Jason
On Wed, Jul 25, 2012 at 12:33 PM, <steinbrt.rci.rutgers.edu> wrote:
> Hi all,
>
> I also think, while individual compile directives would be useful, we
> would also have to enforce some policy on how people should use them and
> which ones are acceptable and so on. As long as only the softcore module
> would need a 'precise' option, it may not be worth the effort to create a
> better option system.
>
> Jason, I have prepared the bug fix for A12 (its fixed in the A13 tree
> already) as described on the wiki, but get an error message from
> check_patches:
>
> [steinbrt.tcbpc142 amber]$ ./check_patches.py -b bugfix.8
> [steinbrt.tcbpc142 amber]$
>
> works ok, but then
>
> [steinbrt.tcbpc142 amber]$ ./check_patches.py -b bugfix.8 -a
> I will now try applying this patch.
> You did not tell me what commit to apply the patch on. I'm guessing
> you want the second-newest commit: 3236d34e2daa196766a9cedaf19269f7095b32c9
> I could not do a git-status. Not enough resources?
>
> but git status works fine from the command line:
>
> [steinbrt.tcbpc142 amber]$ git status
> # On branch amber12-with-patches
> # Your branch is ahead of 'origin/amber12-with-patches' by 1 commit.
> #
> nothing to commit (use -u to show untracked files)
>
> and the log shows that the script would have picked the right commit:
>
> [steinbrt.tcbpc142 amber]$ git log
> commit 8fc53fad4ef8ef2ea02aab9563e59a555250ad42
> Author: Joe Q. Developer <thomas.steinbrecher.kit.edu>
> Date: Wed Jul 25 18:24:53 2012 +0200
>
> bugfix.8: remove compiler optimization from softcore.F90 due to
> compiler problems
>
> commit 3236d34e2daa196766a9cedaf19269f7095b32c9
> Merge: e6c1def 1be6dc3
> Author: Daniel R. Roe <Daniel.R.Roe.gmail.com>
> Date: Wed Jul 25 09:09:56 2012 -0600
>
> Merge branch 'amber12-with-patches' of git.ambermd.org:amber into
> amber12-with-patches
>
> commit 1be6dc30bb4eee2b586e9845aa4122f99041956a
> [...]
>
>
>
> Any ideas what Im doing wrong?
>
> Thomas
>
> Dr. Thomas Steinbrecher
> formerly at the
> BioMaps Institute
> Rutgers University
> 610 Taylor Rd.
> Piscataway, NJ 08854
>
> _______________________________________________
> AMBER-Developers mailing list
> AMBER-Developers.ambermd.org
> http://lists.ambermd.org/mailman/listinfo/amber-developers
>
>
--
Jason M. Swails
Quantum Theory Project,
University of Florida
Ph.D. Candidate
352-392-4032
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Wed Jul 25 2012 - 10:00:03 PDT
