diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-27 19:23:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-27 19:23:51 -0800 |
| commit | 455d0f5c23a600ff8c94642ca5123f1bd2f1ec0d (patch) | |
| tree | d6674efc969ac919afdaf98202aab53a14d20871 /contrib/fast-import | |
| parent | 608efb875f89a946d5cb37b2dd4077132618e0e1 (diff) | |
| parent | 539eec48f0a101b45c5f150a2bbc067fd85bc96d (diff) | |
| download | git-455d0f5c23a600ff8c94642ca5123f1bd2f1ec0d.tar.gz | |
Merge branch 'maint'
* maint:
sha1_file.c: resolve confusion EACCES vs EPERM
sha1_file: avoid bogus "file exists" error message
git checkout: don't warn about unborn branch if -f is already passed
bash: offer refs instead of filenames for 'git revert'
bash: remove dashed command leftovers
git-p4: fix keyword-expansion regex
fast-export: use an unsorted string list for extra_refs
Add new testcase to show fast-export does not always exports all tags
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 9f0a5f92c1..b44fbfc9b3 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -981,7 +981,7 @@ class P4Sync(Command): if stat['type'] in ('text+ko', 'unicode+ko', 'binary+ko'): text = re.sub(r'(?i)\$(Id|Header):[^$]*\$',r'$\1$', text) elif stat['type'] in ('text+k', 'ktext', 'kxtext', 'unicode+k', 'binary+k'): - text = re.sub(r'\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$',r'$\1$', text) + text = re.sub(r'\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$\n]*\$',r'$\1$', text) contents[stat['depotFile']] = text |