kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
19984 Commits
6 Branches
36 Tags
131 MiB
Tree: 9a2861e32a
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '9a2861e32a'
${ noResults }
Commit Graph

368 Commits (9a2861e32a147d89f22961bd7d3257b8776de4d2)

Author SHA1 Message Date
Simon Hausmann cb4f1280dd Added git-p4 submit --trust-me-like-a-fool for the adventurous users :)
18 years ago
Simon Hausmann 877db584aa Forgot to remove this TODO item when I made --with-origin the default :)
18 years ago
Simon Hausmann d414c74afd Shortcut the case where we have no origin branch
18 years ago
Simon Hausmann 01265103fe Make --with-origin the default for syncing.
18 years ago
Simon Hausmann 417a7a6fc8 Make --with-origin also work without origin :)
18 years ago
Simon Hausmann 4280e53333 Make git-p4 work with packed refs (don't use os.path.exists to check for the
18 years ago
Simon Hausmann 65c5f3e3f2 Avoid creating non-p4 branches in remotes/p4 off of remotes/origin
18 years ago
Simon Hausmann 10f880f8d4 Oops, fix --with-origin to /really/ also call git fetch :)
18 years ago
Simon Hausmann abcd790fe9 Added support for --with-origin with multi-branch imports
18 years ago
Simon Hausmann 2cc58fd99a Forgot to remove this return statement from debugging
18 years ago
Simon Hausmann d1874ed33b Fix creating the remotes/p4 branches based on origin/* for the multi-branch import
18 years ago
Marius Storm-Olsen c1f9197f37 Replace \r\n with \n when importing from p4 on Windows
18 years ago
Simon Hausmann ebd8116870 Load the user map from p4 only once at run-time.
18 years ago
Simon Hausmann b3fd1b2808 Fix multi-branch import with --silent.
18 years ago
Simon Hausmann ad192f2888 Fix p4 execution in git-p4 rollback.
18 years ago
Simon Hausmann 66a2f52395 Catch p4 errors in rollback early enough (before deleting refs!)
18 years ago
Simon Hausmann ac3e0d79ee Oops, fill the /list/ correct with the p4 exit code.
18 years ago
Simon Hausmann a6d5da36af Don't make len(p4Cmd("p4 changes -m 1 //foo/...")) == 0 succeed when the p4 command itself failed.
18 years ago
Simon Hausmann 0c66a78393 Make rollback work with locally imported branches
18 years ago
Simon Hausmann 65d2ade95e Avoid calling git symbolic-ref refs/heads/p4//HEAD (double slash)
18 years ago
Simon Hausmann a396b29267 Doc updates
18 years ago
Simon Hausmann 57284050a8 Use refs/heads/* instead of refs/heads/p4/* for local imports
18 years ago
Simon Hausmann 01a9c9c5a8 Added support for --max-changes=<count> to ease import debugging
18 years ago
Simon Hausmann a028a98e9a Added support for importing multiple branches into refs/heads instead of just refs/remotes
18 years ago
Simon Hausmann 52102d4784 Fixes for rollback, delete branches that did not exist at the specified p4 change
18 years ago
Simon Hausmann af8da89cb7 Fix branch detection in multi-branch imports
18 years ago
Simon Hausmann 5834684d51 Added a rollback command for debugging. It sets back the heads of the p4 branches to the specified p4 change number or earlier.
18 years ago
Simon Hausmann 7944f1425c Make git-p4 submit --direct safer by also creating a git commit
18 years ago
Simon Hausmann cbf5efa61a Detect with git-p4 submit --direct when there are no changes in the working directory
18 years ago
Simon Hausmann faf1bd2026 Fix git symbolic-ref warning on initial clone
18 years ago
Simon Hausmann dc52403696 Fix error detection with git-p4 submit when the requested depot path is not in the client view.
18 years ago
Simon Hausmann 33be3e6550 Fix conversion from old style heads/p4 to remotes/p4/master
18 years ago
Simon Hausmann 341dc1c179 Improved output for multi branch imports and noted another little todo item
18 years ago
Simon Hausmann b1561ee256 Another (potentially life-saving) idea for submit --direct
18 years ago
Simon Hausmann 24f7b53fdd Had an idea for debugging, record it :)
18 years ago
Simon Hausmann 8a5fc95b43 Specifying --detect-branches is now only needed for the initial clone/sync.
18 years ago
Simon Hausmann c1b296b9f1 Added support for git-p4 submit --direct (experimental)
18 years ago
Simon Hausmann 47a130b7bf Use git format-patch and git apply --apply when extracting patches from git and
18 years ago
Simon Hausmann 64ffb06a9c Oops, not only /set/ gitdir on clone, also set it /correctly/ :)
18 years ago
Simon Hausmann 59fa417109 Fix gitdir not being set when cloning. Needed for writing the p4 users cache.
18 years ago
Simon Hausmann b607e71efd Cache the output of "p4 users" for faster syncs on high latency links.
18 years ago
Simon Hausmann 9bda3a8556 Removed unused variable, more cleanups
18 years ago
Simon Hausmann 71b112d4a4 More cleanups and speedups for labels and branches
18 years ago
Simon Hausmann d5904674d1 Cleanup/speed up the branch<> file split and removed change range limitation that I added
18 years ago
Simon Hausmann 29bdbac1cd More work on the incremental importing of multiple branches.
18 years ago
Simon Hausmann 8f9b2e082b Give branches a nice project prefix and don't bail out on clone if we failed
18 years ago
Simon Hausmann 4b97ffb1e4 Started rewriting the branch detection, based on "p4 branches" and "p4 branch -o foo".
18 years ago
Simon Hausmann 66c6a9b559 Removed unused cache variables.
18 years ago
Simon Hausmann 05094f987c Fix branch setup after initial clone.
18 years ago
Simon Hausmann 71bd9bacec Removed todo item that is implemented :)
18 years ago