development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-gui: Simplify error case for unsupported merge types

Browse source 
If we are given a merge type we don't understand in checkout_op there
is probably a bug in git-gui somewhere that allowed this unknown merge
strategy to come into this part of the code path.  We currently only
recognize three merge types ('none', 'ff' and 'reset') but are going
to be supporting more in the future.  Rather than keep editing this
message I'm going with a very generic "Uh, we don't do that!" type of
error.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2007-07-20 03:37:43 -04:00
parent f66b8a68f2
commit eea1ab6e23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/checkout_op.tcl
View file

@ -208,7 +208,7 @@ method _update_ref {} {
}
}
default {
_error $this "Only 'ff' and 'reset' merge is currently supported."
_error $this "Merge strategy '$merge_type' not supported."
return 0
}
}