diff options
| author |  Avery Pennarun <apenwarr@gmail.com> | 2009-08-26 10:43:43 -0400 |
|---|---|---|
| committer | Avery Pennarun <apenwarr@gmail.com> | 2009-08-26 10:45:13 -0400 |
| commit | 227f78114752eee2e8ae3368089716d73d32dd8b (patch) | |
| tree | 7a0c0f254453c72bc08e1074be0dae8aac20a2e4 /todo | |
| parent | Improve patch to use git --exec-path: add to PATH instead. (diff) | |
| download | tgif-227f78114752eee2e8ae3368089716d73d32dd8b.tar.xz | |
Fix behaviour if you have a branch named the same as your --prefix
We were trying to 'git checkout $prefix', which is ambiguous if $prefix
names a directory *and* a branch. Do 'git checkout -- $prefix' instead.
The main place this appeared was in 'git subtree add'.
Reported by several people.
Diffstat (limited to 'todo')
| -rw-r--r-- | todo | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -20,9 +20,6 @@ automated tests for --squash stuff - test.sh fails in msysgit? - sort error - see Thell's email - "add" command non-obviously requires a commitid; would be easier if it had a "pull" sort of mode instead @@ -43,9 +40,6 @@ should detect (and fix) it if it does. Otherwise the log message looks weird. - totally weird behavior in 'git subtree add' if --prefix matches - a branch name - "pull --squash" should do fetch-synthesize-merge, but instead just does "pull" directly, which doesn't work at all. |