rebase-i-p: delay saving current-commit to REWRITTEN if squashing

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 8d81095765b1e73fa79e2950c47fd06f3c475ac7..0d40f0ecca30a6c86f2f7016be02d8e936bc1dab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -637,8 +637,8 @@ ifeq ($(uname_S),SunOS)
        NO_MEMMEM = YesPlease
        NO_HSTRERROR = YesPlease
        NO_MKDTEMP = YesPlease
+       OLD_ICONV = UnfortunatelyYes
        ifeq ($(uname_R),5.8)
-               NEEDS_LIBICONV = YesPlease
                NO_UNSETENV = YesPlease
                NO_SETENV = YesPlease
                NO_C99_FORMAT = YesPlease