1. Stefan Saasen
  2. git

Commits

Jonathan Nieder  committed 29b6754

am: remove rebase-apply directory before gc

When git am does an automatic gc it doesn't clean up the rebase-apply
directory until after this has finished. This means that if the user
aborts the gc then future am or rebase operations will report that an
existing operation is in progress, which is undesirable and confusing.

Reported by Mark Brown <broonie@debian.org> through
http://bugs.debian.org/570966

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

  • Participants
  • Parent commits 689b8c2
  • Branches master

Comments (0)

Files changed (1)

File git-am.sh

View file
 	go_next
 done
 
-git gc --auto
-
 rm -fr "$dotest"
+git gc --auto