summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-11-10 13:32:46 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-11-10 13:32:46 -0400
commitd0886a9ac7b662b2cdfe386af1d81af74925d0b1 (patch)
tree6573d7390fdb1648e426e31a6ef2722e5b53766d
parent99d9c1cf893f1ad6bf400219a47593cf70993768 (diff)
explicity run queue to git add files
-rw-r--r--Command/PreCommit.hs2
-rw-r--r--doc/walkthrough.mdwn1
2 files changed, 1 insertions, 2 deletions
diff --git a/Command/PreCommit.hs b/Command/PreCommit.hs
index 117546359..cd6ce6f08 100644
--- a/Command/PreCommit.hs
+++ b/Command/PreCommit.hs
@@ -33,7 +33,7 @@ start file = do
-- drop that and stage the symlink
g <- Annex.gitRepo
liftIO $ Git.run g ["reset", "-q", "--", file]
- liftIO $ Git.run g ["add", "--", file]
+ Annex.queueRun
-- Fix symlinks as they are committed, this ensures the
-- relative links are not broken when moved around.
diff --git a/doc/walkthrough.mdwn b/doc/walkthrough.mdwn
index cfdf0ddab..61cf29b89 100644
--- a/doc/walkthrough.mdwn
+++ b/doc/walkthrough.mdwn
@@ -166,7 +166,6 @@ and this symlink is what gets committed to git in the end.
# echo "now smaller, but even cooler" > my_cool_big_file
# git commit my_cool_big_file -m "changed an annexed file"
add my_cool_big_file ok
- (Recording state in git...)
[master 64cda67] changed an annexed file
2 files changed, 2 insertions(+), 1 deletions(-)
create mode 100644 .git-annex/SHA1:0b1d8616d0238cb9418a0e0a649bdad2e9e7faae.log