diff options
author | Nika Layzell <nika@thelayzells.com> | 2019-11-24 20:25:49 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-11-25 11:01:22 +0900 |
commit | 0a8e3036a304d99de24432d65a3d3920dd6e2e46 (patch) | |
tree | 86f62e83756ab1e1b94c49f2e6201b1b952ec8e9 /t/t4100/t-apply-7.patch | |
parent | The first batch post 2.24 cycle (diff) | |
download | tgif-0a8e3036a304d99de24432d65a3d3920dd6e2e46.tar.xz |
reset: parse rev as tree-ish in patch mode
Since 2f328c3d ("reset $sha1 $pathspec: require $sha1 only to be
treeish", 2013-01-14), we allowed "git reset $object -- $path" to reset
individual paths that match the pathspec to take the blob from a tree
object, not necessarily a commit, while the form to reset the tip of the
current branch to some other commit still must be given a commit.
Like resetting with paths, "git reset --patch" does not update HEAD, and
need not require a commit. The path-filtered form, "git reset --patch
$object -- $pathspec", has accepted a tree-ish since 2f328c3d.
"git reset --patch" is documented as accepting a <tree-ish> since
bf44142f ("reset: update documentation to require only tree-ish with
paths", 2013-01-16). Documentation changes are not required.
Loosen the restriction that requires a commit for the unfiltered "git
reset --patch $object".
Signed-off-by: Nika Layzell <nika@thelayzells.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4100/t-apply-7.patch')
0 files changed, 0 insertions, 0 deletions