Skip to content

G
git

李少辉-开发者 / git
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

体验新版 GitCode，发现更多精彩内容 >>

切换分支/标签
  1. 16 1月, 2013 6 次提交
  3. 27 11月, 2012 5 次提交
  5. 09 11月, 2012 1 次提交
  7. 17 9月, 2012 11 次提交
  9. 21 8月, 2012 1 次提交
  11. 12 8月, 2012 2 次提交
  13. 13 7月, 2012 1 次提交
  15. 06 7月, 2012 3 次提交
  17. 12 5月, 2012 2 次提交
  19. 01 5月, 2012 3 次提交
    • P
      git p4: submit files with wildcards · 9d7d446a
      由 Pete Wyckoff 提交于 
      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
084f6306 (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
084f6306 (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: NLuke Diamand <luke@diamand.org>
Signed-off-by: NPete Wyckoff <pw@padd.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      9d7d446a
    • P
      git p4: fix writable file after rename or copy · b6ad6dcc
      由 Pete Wyckoff 提交于 
      The way rename works is with a "p4 integrate", optionally
followed by a "p4 edit" if the change is not a 100% rename.
Contents are generated by applying a patch, not doing a file
system rename.  Copy is similar.

In this case, p4 does not fix the permissions back to read-only.
Make sure this happens by calling "p4 sync -f".
Signed-off-by: NPete Wyckoff <pw@padd.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      b6ad6dcc
    • P
      git p4: bring back files in deleted client directory · 8d7ec362
      由 Pete Wyckoff 提交于 
      The code to auto-create the client directory, added in 0591cfa8
(git-p4: ensure submit clientPath exists before chdir,
2011-12-09), works when the client directory never existed.

But if the directory is summarily removed without telling p4,
the sync operation will not bring back all the files.  Always
do "sync -f" if the client directory is newly created.
Reported-by: NGary Gibbons <ggibbons@perforce.com>
Signed-off-by: NPete Wyckoff <pw@padd.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      8d7ec362
  21. 25 4月, 2012 3 次提交
  23. 12 4月, 2012 1 次提交
    • L
      git p4: import/export of labels to/from p4 · 06804c76
      由 Luke Diamand 提交于 
      The existing label import code looks at each commit being
imported, and then checks for labels at that commit. This
doesn't work in the real world though because it will drop
labels applied on changelists that have already been imported,
a common pattern.

This change adds a new --import-labels option. With this option,
at the end of the sync, git p4 gets sets of labels in p4 and git,
and then creates a git tag for each missing p4 label.

This means that tags created on older changelists are
still imported.

Tags that could not be imported are added to an ignore
list.

The same sets of git and p4 tags and labels can also be used to
derive a list of git tags to export to p4. This is enabled with
--export-labels in 'git p4 submit'.
Signed-off-by: NLuke Diamand <luke@diamand.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
      06804c76
  25. 10 4月, 2012 1 次提交