~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a5b29a1) | patch
Optimise the merge operation
authorCatalin Marinas <catalin.marinas@gmail.com>
Tue, 23 Aug 2005 15:44:14 +0000 (16:44 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Tue, 23 Aug 2005 15:44:14 +0000 (16:44 +0100)
commit402ad990d3fd6a92575e9ff6ad9f6109093d894c
tree307daf652d650e76a5302a1aba5f0356f612b3d5tree | snapshot (tar.gz zip)
parenta5b29a1c486dc8f6b3080356296dfed25c210a74commit | diff
Optimise the merge operation

The merge operation performs unnecessary git-checkout-cache which was
already done by git-read-tree or gitmergeonefile.py. The refresh
resulted from a push operation should not check for the tree status
since the index is already up-to-date a successful merge. For an failed
merge, the commit is not performed anyway.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
stgit/commands/common.py diff | blob | blame | history
stgit/git.py diff | blob | blame | history
stgit/stack.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)