summaryrefslogtreecommitdiff
path: root/contrib/examples/git-gc.sh
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-08-16 18:06:08 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-16 10:02:55 -0700
commit3e7dd9920823fc2a88f8ec5390bd100d707f9129 (patch)
tree199eab0c05cafd2690a62957156419cc0c7bfb66 /contrib/examples/git-gc.sh
parentGit 2.14.4 (diff)
downloadtgif-3e7dd9920823fc2a88f8ec5390bd100d707f9129.tar.xz
cherry-pick: fix --quit not deleting CHERRY_PICK_HEAD
--quit is supposed to be --abort but without restoring HEAD. Leaving CHERRY_PICK_HEAD behind could make other commands mistake that cherry-pick is still ongoing (e.g. "git commit --amend" will refuse to work). Clean it too. For --abort, this job of deleting CHERRY_PICK_HEAD is on "git reset" so we don't need to do anything else. But let's add extra checks in --abort tests to confirm. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-gc.sh')
0 files changed, 0 insertions, 0 deletions