From f3df29449a252f80e1f4d08e26a837bf1846d7f4 Mon Sep 17 00:00:00 2001
From: Volker Braun <vbraun.name@gmail.com>
Date: Fri, 29 Nov 2013 17:31:08 +0000
Subject: [PATCH 1/2] update git to latest upstream version 1.8.4.4

---
 build/pkgs/git/checksums.ini       | 6 +++---
 build/pkgs/git/package-version.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/pkgs/git/checksums.ini b/build/pkgs/git/checksums.ini
index d9f0f44d191..849020a0ef7 100644
--- a/build/pkgs/git/checksums.ini
+++ b/build/pkgs/git/checksums.ini
@@ -1,3 +1,3 @@
-sha1=8cce24a390595d6e62c3aa66bef332ab95900173
-md5=9b178a549f64e6f896b634e76ce4c1a6
-cksum=3835145085
+sha1=8640f3c97a93b7b7788147f6eef1097b24192b2b
+md5=cfeec35a50177d3aecdb15f1e89a55cc
+cksum=4106921953
diff --git a/build/pkgs/git/package-version.txt b/build/pkgs/git/package-version.txt
index dc374d5e1c4..0c330a316ca 100644
--- a/build/pkgs/git/package-version.txt
+++ b/build/pkgs/git/package-version.txt
@@ -1 +1 @@
-1.7.12.2.p0
+1.8.4.4

From f6fcc98dffa65e6e9ce165aff1fa6929325278bb Mon Sep 17 00:00:00 2001
From: Volker Braun <vbraun.name@gmail.com>
Date: Fri, 29 Nov 2013 19:13:12 +0000
Subject: [PATCH 2/2] fixing git interface doctests for new git version

---
 src/sage/dev/git_interface.py | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/sage/dev/git_interface.py b/src/sage/dev/git_interface.py
index 3f48d35ac55..0ead62290fe 100644
--- a/src/sage/dev/git_interface.py
+++ b/src/sage/dev/git_interface.py
@@ -215,20 +215,13 @@ def _execute(self, cmd, *args, **kwds):
             GitError: git returned with non-zero exit code (129) for
             "git -c user.email=doc@test.test -c user.name=doctest status --foo".
             output to stderr: error: unknown option `foo'
-             usage: git status [options] [--] <filepattern>...
+             usage: git status [options] [--] ...
             <BLANKLINE>
                  -v, --verbose         be verbose
                  -s, --short           show status concisely
                  -b, --branch          show branch information
                  --porcelain           machine-readable output
-                 -z, --null            terminate entries with NUL
-                 -u, --untracked-files[=<mode>]
-                                       show untracked files, optional modes: all, normal, no. (Default: all)
-                 --ignored             show ignored files
-                 --ignore-submodules[=<when>]
-                                       ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)
-                 --column[=<style>]    list untracked files in columns
-            <BLANKLINE>
+            ...
         """
         exit_code, stdout, stderr, cmd = self._run_git(cmd, args, kwds)
         if exit_code:
@@ -262,20 +255,13 @@ def _execute_silent(self, cmd, *args, **kwds):
             GitError: git returned with non-zero exit code (129) for
             "git -c user.email=doc@test.test -c user.name=doctest status --foo".
             output to stderr: error: unknown option `foo'
-             usage: git status [options] [--] <filepattern>...
+             usage: git status [options] [--] ...
             <BLANKLINE>
                  -v, --verbose         be verbose
                  -s, --short           show status concisely
                  -b, --branch          show branch information
                  --porcelain           machine-readable output
-                 -z, --null            terminate entries with NUL
-                 -u, --untracked-files[=<mode>]
-                                       show untracked files, optional modes: all, normal, no. (Default: all)
-                 --ignored             show ignored files
-                 --ignore-submodules[=<when>]
-                                       ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)
-                 --column[=<style>]    list untracked files in columns
-            <BLANKLINE>
+            ...
         """
         exit_code, stdout, stderr, cmd = self._run_git(cmd, args, kwds)
         if exit_code:
@@ -758,14 +744,12 @@ def clean_wrapper(self, remove_untracked_files=False,
 
             sage: git.clean_wrapper(remove_untracked_files=True)
             Removing untracked
-            Not removing untracked_dir/
             sage: git.clean_wrapper(
             ....:     remove_untracked_files=True, remove_untracked_directories=True)
             Removing untracked_dir/
             sage: git.clean_wrapper(
             ....:     remove_untracked_files=True, remove_ignored=True)
             Removing ignored
-            Not removing ignored_dir/
             sage: git.clean_wrapper(
             ....:     remove_untracked_files=True,
             ....:     remove_untracked_directories=True,