diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 12:56:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org.(none)> | 2005-04-19 12:56:47 -0700 |
| commit | 8ccfbf3279b07028035aeb58baed5c4a79b63567 (patch) | |
| tree | 79c21a1f0b5ac1eab8ac9044564468048f320fd6 /git-pull-script | |
| parent | a3a65234dba0f90a0b8e06fa7b5f269fe5126761 (diff) | |
| download | git-8ccfbf3279b07028035aeb58baed5c4a79b63567.tar.gz git-8ccfbf3279b07028035aeb58baed5c4a79b63567.tar.xz | |
Update "git-pull-script" to use "read-tree -m" for
reading a single tree too. That should speed up a
trivial merge noticeably.
Also, don't bother reading back the tree we just wrote
when we committed a real merge. It had better be the
same one we still have..
Diffstat (limited to 'git-pull-script')
| -rwxr-xr-x | git-pull-script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-pull-script b/git-pull-script index 43114167a..77d68d7da 100755 --- a/git-pull-script +++ b/git-pull-script @@ -35,7 +35,7 @@ if [ "$common" == "$head" ]; then echo "Destroying all noncommitted data!" echo "Kill me within 3 seconds.." sleep 3 - read-tree $merge_tree && checkout-cache -f -a && update-cache --refresh + read-tree -m $merge_tree && checkout-cache -f -a && update-cache --refresh echo $merge_head > .git/HEAD exit 0 fi @@ -45,4 +45,4 @@ result_tree=$(write-tree) || exit 1 result_commit=$(echo "Merge $merge_repo" | commit-tree $result_tree -p $head -p $merge_head) echo "Committed merge $result_commit" echo $result_commit > .git/HEAD -read-tree $result_tree && checkout-cache -f -a && update-cache --refresh +checkout-cache -f -a && update-cache --refresh |