summaryrefslogtreecommitdiff
path: root/git-gui/lib
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2007-10-19 00:54:59 -0400
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2007-10-19 03:47:07 -0400
commitcfa5b2b7faa1a620ec6599a63fa5b9b45bd62b57 (patch)
treec0b728d7ec2e7108a609919deb7f97436cafc4f8 /git-gui/lib
parentfetch: if not fetching from default remote, ignore default merge (diff)
downloadtgif-cfa5b2b7faa1a620ec6599a63fa5b9b45bd62b57.tar.xz
Avoid scary errors about tagged trees/blobs during git-fetch
This is the same bug as 42a32174b600f139b489341b1281fb1bfa14c252. The warning "Object $X is a tree, not a commit" is bogus and is not relevant here. If its not a commit we just need to make sure we don't mark it for merge as we fill out FETCH_HEAD. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'git-gui/lib')
0 files changed, 0 insertions, 0 deletions