diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-22 19:02:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-22 19:04:06 -0800 |
| commit | 744633cbf23d3ed505f96ffc212b30c96b79fb90 (patch) | |
| tree | d4c2432fb2c7b745540dbed573e4ce39db4c3adc /git-merge.sh | |
| parent | 6dc78e696b8597204b903073da932fc5ed0f419e (diff) | |
| download | git-744633cbf23d3ed505f96ffc212b30c96b79fb90.tar.gz git-744633cbf23d3ed505f96ffc212b30c96b79fb90.tar.xz | |
checkout - eye candy.
This implements "eye candy" similar to the pack-object/unpack-object
to entertain users while a large tree is being checked out after
a clone or a pull.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge.sh b/git-merge.sh index 2b4a603df..c258ea78b 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -130,7 +130,7 @@ case "$#,$common,$no_commit" in echo "Updating from $head to $1." git-update-index --refresh 2>/dev/null new_head=$(git-rev-parse --verify "$1^0") && - git-read-tree -u -m $head "$new_head" && + git-read-tree -u -v -m $head "$new_head" && finish "$new_head" "Fast forward" dropsave exit 0 @@ -146,7 +146,7 @@ case "$#,$common,$no_commit" in echo "Trying really trivial in-index merge..." git-update-index --refresh 2>/dev/null - if git-read-tree --trivial -m -u $common $head "$1" && + if git-read-tree --trivial -m -u -v $common $head "$1" && result_tree=$(git-write-tree) then echo "Wonderful." |