Support git-uncommit and recommit from any subdirectory in addition to the worktree's top-level

Author: rev22

git-recommit

@@ -92,6 +92,11 @@ fi
 
 if [ -n "$patchdir" ]; then
     f="$patchdir""$(basename "$f")"
+else
+    case "$f" in
+	/*)  : ;;
+	*)   f="$topleveldir"/"$f" ;;
+    esac
 fi
 
 if [ -z "$f" ]; then

git-uncommit

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2013 Michele Bini
+# Copyright (c) 2013, 2014 Michele Bini
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the version 3 of the GNU General Public License
@@ -49,6 +49,28 @@ selectbranch() {
   git symbolic-ref HEAD refs/heads/"$1"
 }
 
+noerr() {
+    "$@" 2>/dev/null
+}
+
+# Top level of the work tree, if possible relative to current directory
+topleveldir="$(noerr git rev-parse --show-cdup || noerr git rev-parse --show-toplevel)"
+
+# Current directory, relative to top level of work tree
+prefixdir="$(noerr git rev-parse --show-prefix)"
+
+withfinalslash() {
+    if [ -z "$1" ]; then return; fi
+    case "$1" in
+        */)  println "$1" ;;
+        *)   println "$1"/ ;;
+    esac
+}
+
+topleveldir="$(withfinalslash "$topleveldir")"
+prefixdir="$(withfinalslash "$prefixdir")"
+
+
 f="$(namecommit HEAD)"
 [ -z "f" ] && die "Internal error: Could not create patch name"
 f="$f".patch
@@ -61,9 +83,11 @@ git format-patch --binary -M70% -C70% -N -1 --stdout >"$f"
 
 b="$(branchname)"
 
+f="$prefixdir$f"
+
 git checkout --quiet --detach HEAD^
 
 println "Uncommit: $f"
-println "Uncommit: $f" >>.uncommitted-patches
+println "Uncommit: $f" >>"$topleveldir".uncommitted-patches
 
 [ -n "$b" ] && selectbranch "$b" && git reset --soft HEAD^