summaryrefslogtreecommitdiff
path: root/doc/devblog/day_233__direct_mode_proxy.mdwn
blob: 21a2f2d00c4f75fb4a56b755753af155c9be98a6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
Ever since the direct mode guard was added a year ago, direct mode has been
a lot safer to use, but very limited in the git commands that could be run
in a direct mode repository.

The worst limitation was that there was no way to `git revert` unwanted
changes. But also, there was no way to check out different branches,
or run commands like `git mv`.

Today I made `git annex proxy`, which allows doing all of those things,
and more. [documentation here](http://git-annex.branchable.com/direct_mode/#index5h2)

It's so flexible that I'm not sure where the boundries lie yet, but it
seems it will work for any git command that updates both the work tree and
the index. Some git commands only update one or the other and not both and
won't work with the proxy. As an advanced user tool, I think this is a
great solution. I still want to make a simpler
[[undo command|todo/direct_mode_undo]] that can nicely integrate into file
managers.

The implementation of `git annex proxy` is
[quite simple](http://source.git-annex.branchable.com/?p=source.git;a=blob;f=Command/Proxy.h), because it
reuses all the complicated work tree update code that was already written
for `git annex merge`.

----

And here's the lede I buried: I've gotten two years of funding to work
on git-annex part-time!
[Details in my personal blog](http://joeyh.name/blog/entry/continuing_to_be_pleasantly_surprised/).