diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-08-20 02:17:05 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-08-20 02:17:05 -0400 |
| commit | 18a01a0da428c9e1034247e2b40c62e506b73580 (patch) | |
| tree | de74e0ff54a25ae88ce8cdb8c05cdc7585143d29 | |
| parent | c6951ddb522a7d8ee0fc371cf9c37e727e676989 (diff) | |
| download | git-18a01a0da428c9e1034247e2b40c62e506b73580.tar.gz git-18a01a0da428c9e1034247e2b40c62e506b73580.tar.xz | |
git-gui: Allow git-merge to use branch names in conflict markers
Earlier when I rewrote the merge implementation for git-gui I broke
it such that the conflict markers for the "theirs" side of the hunk
was using a full SHA-1 ID in hex, rather than the name of the branch
the user had merged. This was because I got paranoid and passed off
the full SHA-1 to git-merge, instead of giving it the reference name
the user saw in the merge dialog.
I'd still like to resolve the SHA-1 upfront in git-gui and always use
that value throughout the merge, but I can't do that until we have a
full implementation of git-merge written in Tcl. Until then its more
important that the conflict markers be useful to the end-user, so we
need to pass off the ref name and not the SHA-1 ID.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| -rw-r--r-- | lib/merge.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/merge.tcl b/lib/merge.tcl index 5de0d82b1..0e50919d4 100644 --- a/lib/merge.tcl +++ b/lib/merge.tcl @@ -114,7 +114,7 @@ method _start {} { lappend cmd --strategy=recursive lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]] lappend cmd HEAD - lappend cmd $cmit + lappend cmd $name set msg "Merging $current_branch and $stitle" ui_status "$msg..." |