diff options
author | Pete Wyckoff <pw@padd.com> | 2012-04-29 20:57:17 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-04-30 16:00:08 -0700 |
commit | 9d7d446ae94d03ff3b7b32e7341198d9b2c5b222 (patch) | |
tree | 66615bb835b2d131acd1a46b1b012f3584e69053 /builtin/rerere.c | |
parent | git p4: fix writable file after rename or copy (diff) | |
download | tgif-9d7d446ae94d03ff3b7b32e7341198d9b2c5b222.tar.xz |
git p4: submit files with wildcards
There are four wildcard characters in p4. Files with these
characters can be added to p4 repos using the "-f" option. They
are stored in %xx notation, and when checked out, p4 converts
them back to normal.
When adding files with wildcards in git, the submit path must
be careful to use the encoded names in some places, and it
must use "-f" to add them. All other p4 commands that operate
on the client directory expect encoded filenames as arguments.
Support for wildcards in the clone/sync path was added in
084f630 (git-p4: decode p4 wildcard characters, 2011-02-19),
but that change did not handle the submit path.
There was a problem with wildcards in the sync path too. Commit
084f630 (git-p4: decode p4 wildcard characters, 2011-02-19)
handled files with p4 wildcards that were added or modified in
p4. Do this for deleted files, and also in branch detection
checks, too.
Reported-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rerere.c')
0 files changed, 0 insertions, 0 deletions