diff options
| author |  Greg Price <price@ksplice.com> | 2009-12-07 22:28:32 -0500 |
|---|---|---|
| committer |  Eric Wong <normalperson@yhbt.net> | 2009-12-07 20:47:08 -0800 |
| commit | 33f2a3108eeacbd937021470aa6e67c01ceec960 (patch) | |
| tree | 60355f3f6d28b1963a2e9e99e6a505f1e4c1aca1 /builtin-merge-file.c | |
| parent | git-svn: sort svk merge tickets to account for minimal parents (diff) | |
| download | tgif-33f2a3108eeacbd937021470aa6e67c01ceec960.tar.xz | |
git svn: Don't create empty directories whose parents were deleted
Commit 6111b93 "git svn: attempt to create empty dirs on clone+rebase"
will create empty directories 'a/b' and 'a/c' if they were previously
created in SVN, even if their parent directory 'a' was deleted.
For example, unhandled.log may contain lines like this:
r32
+empty_dir: packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/etc/remctl/sipb-xen-auto/acl
+empty_dir: packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/etc/remctl/sipb-xen-auto/machine.d
+empty_dir: packages/sipb-xen-remctl-auto/sipb-xen-remctl-auto/files/etc/remctl/sipb-xen-auto/moira-acl
[...]
r314
-empty_dir: packages/sipb-xen-remctl-auto
[ew: rewrote to be line-wrapped at <= 80-columns]
Reported-by: Evan Broder <broder@mit.edu>
Signed-off-by: Greg Price <price@ksplice.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions