summaryrefslogtreecommitdiff
path: root/t/t5515-fetch-merge-logic.sh
diff options
context:
space:
mode:
authorLibravatar Fraser Tweedale <frase@frase.id.au>2013-01-31 22:22:51 +1000
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-31 08:09:53 -0800
commit1d2c14df1605a05118524b2382402d689f69d737 (patch)
treef6edee51fadd210a4483ed223bfaf790e5eccbc3 /t/t5515-fetch-merge-logic.sh
parentpush: Provide situational hints for non-fast-forward errors (diff)
downloadtgif-1d2c14df1605a05118524b2382402d689f69d737.tar.xz
push: fix segfault when HEAD points nowhere
After a push of a branch other than the current branch fails in a no-ff error and if you are still on an unborn branch, the code recently added to report the failure dereferenced a null pointer while checking the name of the current branch. Signed-off-by: Fraser Tweedale <frase@frase.id.au> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515-fetch-merge-logic.sh')
0 files changed, 0 insertions, 0 deletions