diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:48:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:48:40 -0700 |
| commit | bc918acf708a839bbc350e014d599fdd458319ca (patch) | |
| tree | 3b93414f5146cf1e76ecfd005162feedc19f30e5 /git-rebase.sh | |
| parent | 8d8975aca7c2b031a2386cd8f266109a8c6e1973 (diff) | |
| parent | 2e6e276decde2a9f04fc29bce734a49d3ba8f484 (diff) | |
| download | git-bc918acf708a839bbc350e014d599fdd458319ca.tar.gz git-bc918acf708a839bbc350e014d599fdd458319ca.tar.xz | |
Merge branch 'rr/rebase-sha1-by-string-query'
Allow various commit objects to be given to "git rebase" by ':/look
for this string' syntax, e.g. "git rebase --onto ':/there'".
* rr/rebase-sha1-by-string-query:
rebase: use peel_committish() where appropriate
sh-setup: add new peel_committish() helper
t/rebase: add failing tests for a peculiar revision
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 2d5c2bd0f..54015e3ea 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -436,7 +436,7 @@ then shift ;; esac - upstream=`git rev-parse --verify "${upstream_name}^0"` || + upstream=$(peel_committish "${upstream_name}") || die "$(eval_gettext "invalid upstream \$upstream_name")" upstream_arg="$upstream_name" else @@ -472,7 +472,7 @@ case "$onto_name" in fi ;; *) - onto=$(git rev-parse --verify "${onto_name}^0") || + onto=$(peel_committish "$onto_name") || die "$(eval_gettext "Does not point to a valid commit: \$onto_name")" ;; esac |