Gitlet / testing / samples / test38-bad-resets-err.in
test38-bad-resets-err.in
Raw
# Various error cases for reset
# Check reset command.
I setup2.inc
> branch other
<<<
+ h.txt wug2.txt
> add h.txt
<<<
> rm g.txt
<<<
> commit "Add h.txt and remove g.txt"
<<<
> log
===
${COMMIT_HEAD}
Add h.txt and remove g.txt

===
${COMMIT_HEAD}
Two files

===
${COMMIT_HEAD}
initial commit
<<<*
D INIT "${3}"
D TWO "${2}"
D MASTER1 "${1}"

> checkout other
<<<
# Almost certain not to exist.
> reset 025052f2b193d417df998517a4c539918801b430
No commit with that id exists.
<<<
+ h.txt wug3.txt
> reset ${MASTER1}
There is an untracked file in the way; delete it, or add and commit it first.
<<<