Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'maint'

Conflicts:
	Makefile
	magit.el
  • Loading branch information...
commit f90bc1ec39c3216e918e4267372ccadd288aac8d 2 parents 7daf362 + 3fa3849
@sigma sigma authored
Showing with 15 additions and 6 deletions.
  1. +9 −5 Makefile
  2. +6 −1 magit.el
View
14 Makefile
@@ -8,7 +8,7 @@ ELCS=$(ELS:.el=.elc)
ELCS_CONTRIB=$(ELS_CONTRIB:.el=.elc)
DIST_FILES=$(ELS) Makefile magit.texi magit.info README.md magit.spec.in magit-pkg.el.in
DIST_FILES_CONTRIB=$(ELS_CONTRIB) contrib/magit
-ELPA_FILES=$(ELS) magit.info magit-pkg.el
+ELPA_FILES=$(ELS) magit.info dir magit-pkg.el
.PHONY=install
@@ -24,7 +24,7 @@ all: core docs contrib
core: $(ELCS) magit.spec magit-pkg.el 50magit.el
-docs: magit.info
+docs: dir
contrib: $(ELCS_CONTRIB)
@@ -42,14 +42,18 @@ magit.elc: magit.el
$(BATCH) --eval '(byte-compile-file "magit.tmp.el")' #NO_DIST
mv magit.tmp.elc magit.elc #NO_DIST
rm magit.tmp.el #NO_DIST
+
+dir: magit.info
+ install-info --dir=$@ $<
+
magit.info:
dist: magit-$(VERSION).tar.gz
magit-$(VERSION).tar.gz: $(DIST_FILES) $(DIST_FILES_CONTRIB)
mkdir -p magit-$(VERSION)/contrib
- cp --preserve=timestamps $(DIST_FILES) magit-$(VERSION)
- cp --preserve=timestamps $(DIST_FILES_CONTRIB) magit-$(VERSION)/contrib
+ cp -p $(DIST_FILES) magit-$(VERSION)
+ cp -p $(DIST_FILES_CONTRIB) magit-$(VERSION)/contrib
sed -i -e "1 s/=.*/=$(VERSION)/" magit-$(VERSION)/Makefile #NO_DIST
sed -i -e "/NO_DIST/d" magit-$(VERSION)/Makefile #NO_DIST
sed -i -e "s/@GIT_DEV_VERSION@/$(VERSION)/" magit-$(VERSION)/magit.el #NO_DIST
@@ -60,7 +64,7 @@ elpa: magit-$(VERSION).tar
magit-$(VERSION).tar: $(ELPA_FILES)
mkdir magit-$(VERSION)
- cp --preserve=timestamps $(ELPA_FILES) magit-$(VERSION)
+ cp -p $(ELPA_FILES) magit-$(VERSION)
sed -i -e "s/@GIT_DEV_VERSION@/$(VERSION)/" magit-$(VERSION)/magit.el #NO_DIST
tar -cvf magit-$(VERSION).tar magit-$(VERSION)
rm -rf magit-$(VERSION)
View
7 magit.el
@@ -5302,9 +5302,14 @@ values (such as wildcards) that might be of interest.
If LOCAL is nil, the `.gitignore' file is updated.
Otherwise, it is `.git/info/exclude'."
- (let ((ignore-file (if local (concat (magit-git-dir) "info/exclude") ".gitignore")))
+ (let* ((local-ignore-dir (concat (magit-git-dir) "info/"))
+ (ignore-file (if local
+ (concat local-ignore-dir "exclude")
+ ".gitignore")))
(if edit
(setq file (magit-ignore-modifiable-file file edit)))
+ (if (and local (not (file-exists-p local-ignore-dir)))
+ (make-directory local-ignore-dir t))
(with-temp-buffer
(when (file-exists-p ignore-file)
(insert-file-contents ignore-file))
Please sign in to comment.
Something went wrong with that request. Please try again.