diff options
| author |  René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2012-04-10 20:55:58 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-04-10 16:36:18 -0700 |
| commit | 97e5954bdcf46c76e4a8147172ff7c5a4f633e0d (patch) | |
| tree | 8e45d9a4bc4a60e44615fed5fdf2740fa7c9a8ab /git-sh-setup.sh | |
| parent | Git 1.7.9.3 (diff) | |
| download | tgif-97e5954bdcf46c76e4a8147172ff7c5a4f633e0d.tar.xz | |
unpack-trees: don't perform any index operation if we're not merging
src[0] points to the index entry in the merge case and to the first
tree to unpack in the non-merge case. We only want to mark the index
entry, so check first if we're merging.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-sh-setup.sh')
0 files changed, 0 insertions, 0 deletions