diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-07-22 19:09:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-22 20:34:16 -0700 |
| commit | f6e1a4d6dc4d1b3d82d5e87fdd817b3994dda5e0 (patch) | |
| tree | 1322ada9a1dfcd001370437948ad2d4c24b8508b /git-resolve-script | |
| parent | a38e727925bfad369fc98165f6ff161193397f28 (diff) | |
| download | git-f6e1a4d6dc4d1b3d82d5e87fdd817b3994dda5e0.tar.gz git-f6e1a4d6dc4d1b3d82d5e87fdd817b3994dda5e0.tar.xz | |
[PATCH] Audit rev-parse users.
This patch changes rev-parse users that pass a single argument
that is supposed to be a rev parameter to use "--verify".
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-resolve-script')
| -rwxr-xr-x | git-resolve-script | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-resolve-script b/git-resolve-script index fffcb07df..52dd83bae 100755 --- a/git-resolve-script +++ b/git-resolve-script @@ -6,8 +6,8 @@ # . git-sh-setup-script || die "Not a git archive" -head=$(git-rev-parse --revs-only "$1") -merge=$(git-rev-parse --revs-only "$2") +head=$(git-rev-parse --verify "$1") +merge=$(git-rev-parse --verify "$2") merge_msg="$3" dropheads() { |