Selective cache invalidation

lib/git-shell-out-strategy.js

@@ -510,14 +510,17 @@ export default class GitShellOutStrategy {
    * Branches
    */
   async getCurrentBranch() {
-    const content = await readFile(path.join(this.workingDir, '.git', 'HEAD'));
-    if (content.startsWith('ref: ')) {
+    try {
       // The common case: you're on a branch
       return {
         name: (await this.exec(['symbolic-ref', '--short', 'HEAD'])).trim(),
         isDetached: false,
       };
-    } else {
+    } catch (e) {
+      if (!/not a symbolic ref/.test(e.stdErr)) {
+        throw e;
+      }
+
       // Detached HEAD
       return {
         name: (await this.exec(['describe', '--contains', '--all', 'HEAD'])).trim(),

lib/models/file-system-change-observer.js

@@ -57,16 +57,16 @@ export default class FileSystemChangeObserver {
           const isNonGitFile = event => !event.directory.split(path.sep).includes('.git') && event.file !== '.git';
           const isWatchedGitFile = event => {
             return ['config', 'index', 'HEAD', 'MERGE_HEAD'].includes(event.file || event.newFile) ||
-              event.directory.includes(path.join('.git', 'refs', 'remotes'));
+              event.directory.includes(path.join('.git', 'refs'));
           };
           const filteredEvents = events.filter(e => isNonGitFile(e) || isWatchedGitFile(e));
           if (filteredEvents.length) {
             this.logger.showEvents(filteredEvents);
-            this.emitter.emit('did-change');
+            this.didChange(filteredEvents);
             const workdirOrHeadEvent = filteredEvents.find(e => !['config', 'index'].includes(e.file || e.newFile));
             if (workdirOrHeadEvent) {
               this.logger.showWorkdirOrHeadEvents();
-              this.emitter.emit('did-change-workdir-or-head');
+              this.didChangeWorkdirOrHead();
             }
           }
         },

lib/models/repository-states/state.js

@@ -130,7 +130,7 @@ export default class State {
   }
 
   @shouldDelegate
-  observeFilesystemChange() {
+  observeFilesystemChange(events) {
     this.repository.refresh();
   }
 
@@ -309,11 +309,6 @@ export default class State {
     return Promise.resolve([]);
   }
 
-  @shouldDelegate
-  isPartiallyStaged(fileName) {
-    return Promise.resolve(false);
-  }
-
   @shouldDelegate
   getFilePatchForPath(filePath, options = {}) {
     return Promise.resolve(null);

lib/models/repository.js

@@ -171,6 +171,15 @@ export default class Repository {
     });
   }
 
+  async isPartiallyStaged(fileName) {
+    const {unstagedFiles, stagedFiles} = await this.getStatusesForChangedFiles();
+    const u = unstagedFiles[fileName];
+    const s = stagedFiles[fileName];
+    return (u === 'modified' && s === 'modified') ||
+      (u === 'added' && s === 'modified') ||
+      (u === 'modified' && s === 'deleted');
+  }
+
   async getRemoteForBranch(branchName) {
     const name = await this.getConfig(`branch.${branchName}.remote`);
     if (name === null) {
@@ -181,7 +190,14 @@ export default class Repository {
   }
 
   async saveDiscardHistory() {
+    if (this.isDestroyed()) {
+      return;
+    }
+
     const historySha = await this.createDiscardHistoryBlob();
+    if (this.isDestroyed()) {
+      return;
+    }
     await this.setConfig('atomGithub.historySha', historySha);
   }
 }
@@ -251,7 +267,6 @@ const delegates = [
 
   'getStatusesForChangedFiles',
   'getStagedChangesSinceParentCommit',
-  'isPartiallyStaged',
   'getFilePatchForPath',
   'readFileFromIndex',
 

lib/models/workspace-change-observer.js

@@ -1,3 +1,4 @@
+import path from 'path';
 import {CompositeDisposable, Disposable, Emitter} from 'event-kit';
 
 import nsfw from 'nsfw';
@@ -74,7 +75,8 @@ export default class WorkspaceChangeObserver {
         gitDirectoryPath,
         events => {
           const filteredEvents = events.filter(e => {
-            return ['config', 'index', 'HEAD', 'MERGE_HEAD'].includes(e.file || e.newFile);
+            return ['config', 'index', 'HEAD', 'MERGE_HEAD'].includes(e.file || e.newFile) ||
+              e.directory.includes(path.join('.git', 'refs'));
           });
           if (filteredEvents.length) {
             this.logger.showEvents(filteredEvents);
@@ -109,10 +111,10 @@ export default class WorkspaceChangeObserver {
     }
   }
 
-  activeRepositoryContainsPath(path) {
+  activeRepositoryContainsPath(filePath) {
     const repository = this.getRepository();
     if (repository) {
-      return path.indexOf(repository.getWorkingDirectoryPath()) !== -1;
+      return filePath.indexOf(repository.getWorkingDirectoryPath()) !== -1;
     } else {
       return false;
     }

package.json

@@ -90,6 +90,7 @@
     "eslint-plugin-promise": "^3.5.0",
     "eslint-plugin-react": "^6.7.1",
     "eslint-plugin-standard": "^3.0.1",
+    "lodash.isequal": "^4.5.0",
     "hock": "^1.3.2",
     "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",

test/fixtures/repo-multi-commits-files/a.txt

@@ -0,0 +1 @@
+foo

test/fixtures/repo-multi-commits-files/b.txt

@@ -0,0 +1,2 @@
+bar
+bar 2

test/fixtures/repo-multi-commits-files/c.txt

@@ -0,0 +1,2 @@
+baz
+baz 2

test/fixtures/repo-multi-commits-files/dot-git/COMMIT_EDITMSG

@@ -0,0 +1 @@
+Another commit

test/fixtures/repo-multi-commits-files/dot-git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

test/fixtures/repo-multi-commits-files/dot-git/config

@@ -0,0 +1,7 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = true

test/fixtures/repo-multi-commits-files/dot-git/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

test/fixtures/repo-multi-commits-files/dot-git/hooks/applypatch-msg.sample

@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
+test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
+:

test/fixtures/repo-multi-commits-files/dot-git/hooks/commit-msg.sample

@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}

test/fixtures/repo-multi-commits-files/dot-git/hooks/post-update.sample

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info

test/fixtures/repo-multi-commits-files/dot-git/hooks/pre-applypatch.sample

@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+precommit="$(git rev-parse --git-path hooks/pre-commit)"
+test -x "$precommit" && exec "$precommit" ${1+"$@"}
+:

test/fixtures/repo-multi-commits-files/dot-git/hooks/pre-commit.sample

@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --

test/fixtures/repo-multi-commits-files/dot-git/hooks/pre-push.sample

@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local sha1> <remote ref> <remote sha1>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+z40=0000000000000000000000000000000000000000
+
+while read local_ref local_sha remote_ref remote_sha
+do
+	if [ "$local_sha" = $z40 ]
+	then
+		# Handle delete
+		:
+	else
+		if [ "$remote_sha" = $z40 ]
+		then
+			# New branch, examine all commits
+			range="$local_sha"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_sha..$local_sha"
+		fi
+
+		# Check for WIP commit
+		commit=`git rev-list -n 1 --grep '^WIP' "$range"`
+		if [ -n "$commit" ]
+		then
+			echo >&2 "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0

test/fixtures/repo-multi-commits-files/dot-git/hooks/pre-rebase.sample

@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up-to-date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+exit 0
+
+################################################################
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".

test/fixtures/repo-multi-commits-files/dot-git/hooks/prepare-commit-msg.sample

@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples.  The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+case "$2,$3" in
+  merge,)
+    /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+#   /usr/bin/perl -i.bak -pe '
+#      print "\n" . `git diff --cached --name-status -r`
+#	 if /^#/ && $first++ == 0' "$1" ;;
+
+  *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"

test/fixtures/repo-multi-commits-files/dot-git/hooks/update.sample

@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to blocks unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0

test/fixtures/repo-multi-commits-files/dot-git/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

test/fixtures/repo-multi-commits-files/dot-git/logs/HEAD

@@ -0,0 +1,6 @@
+0000000000000000000000000000000000000000 f44d312c2f07c2b69ae48bdc2d1e2f125df388d1 Nathan Sobo <nathan@github.com> 1466116715 -0600	commit (initial): Initial commit
+f44d312c2f07c2b69ae48bdc2d1e2f125df388d1 9e6cfd1e2160f22c7c45259b720f0cc62c748c7c Antonio Scandurra <as-cii@github.com> 1466159114 +0200	commit (amend): Initial commit
+9e6cfd1e2160f22c7c45259b720f0cc62c748c7c 306c2d32d8fb911cb59da3bc2d600db0c7842fd9 Antonio Scandurra <as-cii@github.com> 1466604506 +0200	commit (amend): Initial commit
+306c2d32d8fb911cb59da3bc2d600db0c7842fd9 66d11860af6d28eb38349ef83de475597cb0e8b4 Antonio Scandurra <as-cii@github.com> 1466604645 +0200	commit (amend): Initial commit
+66d11860af6d28eb38349ef83de475597cb0e8b4 452fd1b53795bdc838e89448f2954a2c1125ac08 Ash Wilson <smashwilson@github.com> 1493132091 -0400	commit: Another commit
+452fd1b53795bdc838e89448f2954a2c1125ac08 8fd7c1d85c8c3c78ad9c8a21c328b1905df638c7 Ash Wilson <smashwilson@github.com> 1493135077 -0400	commit (amend): Another commit

test/fixtures/repo-multi-commits-files/dot-git/logs/refs/heads/master

@@ -0,0 +1,6 @@
+0000000000000000000000000000000000000000 f44d312c2f07c2b69ae48bdc2d1e2f125df388d1 Nathan Sobo <nathan@github.com> 1466116715 -0600	commit (initial): Initial commit
+f44d312c2f07c2b69ae48bdc2d1e2f125df388d1 9e6cfd1e2160f22c7c45259b720f0cc62c748c7c Antonio Scandurra <as-cii@github.com> 1466159114 +0200	commit (amend): Initial commit
+9e6cfd1e2160f22c7c45259b720f0cc62c748c7c 306c2d32d8fb911cb59da3bc2d600db0c7842fd9 Antonio Scandurra <as-cii@github.com> 1466604506 +0200	commit (amend): Initial commit
+306c2d32d8fb911cb59da3bc2d600db0c7842fd9 66d11860af6d28eb38349ef83de475597cb0e8b4 Antonio Scandurra <as-cii@github.com> 1466604645 +0200	commit (amend): Initial commit
+66d11860af6d28eb38349ef83de475597cb0e8b4 452fd1b53795bdc838e89448f2954a2c1125ac08 Ash Wilson <smashwilson@github.com> 1493132091 -0400	commit: Another commit
+452fd1b53795bdc838e89448f2954a2c1125ac08 8fd7c1d85c8c3c78ad9c8a21c328b1905df638c7 Ash Wilson <smashwilson@github.com> 1493135077 -0400	commit (amend): Another commit

test/fixtures/repo-multi-commits-files/dot-git/objects/5b/0f8e2fae7d9a5bda8a5a8e08b8d9ffac4ea5fb

@@ -0,0 +1 @@
+x
+)JMU06f040031QH�+�(a��}�����y��N�����3[
�L�

test/fixtures/repo-multi-commits-files/dot-git/objects/66/d11860af6d28eb38349ef83de475597cb0e8b4

@@ -0,0 +1,3 @@
+x
eͱ� �qg��vS��4FG�>�q%��B�����������f
���� �qf�z�"j�"{fLa`l�=s@�m����
+L5V�w\�Y�-���0���N��j�����"��
+S���Fzw���ڡ�p�vԽd�􂟤>��;�

test/fixtures/repo-multi-commits-files/dot-git/objects/f4/4d312c2f07c2b69ae48bdc2d1e2f125df388d1

@@ -0,0 +1,2 @@
+x
��K
+1]�}
%��d��u��t�c&����z�����Z@�����A�Hz�/�#�|d��.���3*ڤ�$�:<X�w�^U�Ƨ0�p��:4p�Vk���P����*���k��:�

test/fixtures/repo-multi-commits-files/dot-git/refs/heads/master

@@ -0,0 +1 @@
+8fd7c1d85c8c3c78ad9c8a21c328b1905df638c7

test/fixtures/repo-multi-commits-files/subdir-1/a.txt

@@ -0,0 +1 @@
+foo

test/fixtures/repo-multi-commits-files/subdir-1/b.txt

@@ -0,0 +1,2 @@
+bar
+subbar 2

test/fixtures/repo-multi-commits-files/subdir-1/c.txt

@@ -0,0 +1,2 @@
+baz
+subbaz 2

test/github-package.test.js

@@ -552,8 +552,8 @@ describe('GithubPackage', function() {
 
       repository1 = contextPool.getContext(workdirPath1).getRepository();
       repository2 = contextPool.getContext(workdirPath2).getRepository();
-      sinon.stub(repository1, 'refresh');
-      sinon.stub(repository2, 'refresh');
+      sinon.stub(repository1, 'observeFilesystemChange');
+      sinon.stub(repository2, 'observeFilesystemChange');
     });
 
     it('refreshes the appropriate Repository and Atom GitRepository when a file is changed in workspace 1', async function() {
@@ -563,7 +563,7 @@ describe('GithubPackage', function() {
 
       fs.writeFileSync(path.join(workdirPath1, 'a.txt'), 'some changes', 'utf8');
 
-      await assert.async.isTrue(repository1.refresh.called);
+      await assert.async.isTrue(repository1.observeFilesystemChange.called);
       await assert.async.isTrue(atomGitRepository1.refreshStatus.called);
     });
 
@@ -574,21 +574,21 @@ describe('GithubPackage', function() {
 
       fs.writeFileSync(path.join(workdirPath2, 'b.txt'), 'other changes', 'utf8');
 
-      await assert.async.isTrue(repository2.refresh.called);
+      await assert.async.isTrue(repository2.observeFilesystemChange.called);
       await assert.async.isTrue(atomGitRepository2.refreshStatus.called);
     });
 
     it('refreshes the appropriate Repository and Atom GitRepository when a commit is made in workspace 1', async function() {
       await repository1.git.exec(['commit', '-am', 'commit in repository1']);
 
-      await assert.async.isTrue(repository1.refresh.called);
+      await assert.async.isTrue(repository1.observeFilesystemChange.called);
       await assert.async.isTrue(atomGitRepository1.refreshStatus.called);
     });
 
     it('refreshes the appropriate Repository and Atom GitRepository when a commit is made in workspace 2', async function() {
       await repository2.git.exec(['commit', '-am', 'commit in repository2']);
 
-      await assert.async.isTrue(repository2.refresh.called);
+      await assert.async.isTrue(repository2.observeFilesystemChange.called);
       await assert.async.isTrue(atomGitRepository2.refreshStatus.called);
     });
   });