guilt

   1 #!/bin/sh
   2 #
   3 # Copyright (c) Josef "Jeff" Sipek, 2006-2010
   4 #
   5
   6 GUILT_VERSION="0.33"
   7 GUILT_NAME="Lullaby"
   8
   9 # If the first argument is one of the below, display the man page instead of
  10 # the rather silly and mostly useless usage string
  11 case $1 in
  12         -h|--h|--he|--hel|--help)
  13         shift
  14         exec "guilt-help" "`basename $0`"
  15         exit
  16         ;;
  17         -V|--ver|--versi|--versio|--version)
  18         echo "Guilt version $GUILT_VERSION"
  19         exit
  20         ;;
  21 esac
  22
  23 # we change directories ourselves
  24 SUBDIRECTORY_OK=1
  25
  26 . "$(git --exec-path)/git-sh-setup"
  27
  28 #
  29 # Git version check
  30 #
  31 gitver=`git --version | cut -d' ' -f3 | sed -e 's/^debian\.//'`
  32 case "$gitver" in
  33         1.5.*)  ;; # git config
  34         1.6.*)  ;; # git config
  35         1.7.*)  ;; # git config
  36         *)      die "Unsupported version of git ($gitver)" ;;
  37 esac
  38
  39 #
  40 # Shell library
  41 #
  42
  43 # echo -n is a bashism, use printf instead
  44 _disp()
  45 {
  46         printf "%b" "$*"
  47 }
  48
  49 # echo -e is a bashism, use printf instead
  50 disp()
  51 {
  52         printf "%b\n" "$*"
  53 }
  54
  55 noerr()
  56 {
  57         "$@" 2>/dev/null
  58 }
  59
  60 silent()
  61 {
  62         "$@" >/dev/null 2>/dev/null
  63 }
  64
  65 ########
  66
  67 guilt_commands()
  68 {
  69         find "`dirname $0`" -maxdepth 1 -name "guilt-*" -type f -perm +111 | sed -e "s/.*\\/`basename $0`-//"
  70 }
  71
  72 if [ "`basename $0`" = "guilt" ]; then
  73         # being run as standalone
  74
  75         # by default, we shouldn't fail
  76         cmd=
  77
  78         if [ $# -ne 0 ]; then
  79                 # take first arg, and try to execute it
  80
  81                 arg="$1"
  82                 dir=`dirname $0`
  83
  84                 if [ -x "$dir/guilt-$arg" ]; then
  85                         cmd=$arg
  86                 else
  87                         # might be a short handed
  88                         for command in $(guilt_commands); do
  89                                 case $command in
  90                                 $arg*)
  91                                         if [ -x "$dir/guilt-$command" ]; then
  92                                                 cmd=$command
  93                                         fi
  94                                         ;;
  95                                 esac
  96                         done
  97                 fi
  98                 if [ -n "$cmd" ]; then
  99                         shift
 100                         exec "$dir/guilt-$cmd" "$@"
 101
 102                         # this is not reached because of the exec
 103                         die "Exec failed! Something is terribly wrong!"
 104                 else
 105                         disp "Command $arg not found" >&2
 106                         disp "" >&2
 107                 fi
 108         fi
 109
 110         # no args passed or invalid command entered, just output help summary
 111
 112         disp "Guilt v$GUILT_VERSION"
 113         disp ""
 114         disp "Pick a command:"
 115         guilt_commands | sort | column | column -t | sed -e 's/^/       /'
 116
 117         disp ""
 118         disp "Example:"
 119         disp "\tguilt-push"
 120         disp "or"
 121         disp "\tguilt push"
 122
 123         # now, let's exit
 124         exit 1
 125 fi
 126
 127 ########
 128
 129 #
 130 # Library goodies
 131 #
 132
 133 # usage: valid_patchname <patchname>
 134 valid_patchname()
 135 {
 136         case "$1" in
 137                 /*|./*|../*|*/./*|*/../*|*/.|*/..|*/|*\ *|*\    *)
 138                         return 1;;
 139                 *:*)
 140                         return 1;;
 141                 *)
 142                         return 0;;
 143         esac
 144 }
 145
 146 get_branch()
 147 {
 148         silent git symbolic-ref HEAD || \
 149                 die "Working on a detached HEAD is unsupported."
 150
 151         git symbolic-ref HEAD | sed -e 's,^refs/heads/,,'
 152 }
 153
 154 verify_branch()
 155 {
 156         [ ! -d "$GIT_DIR/patches" ] &&
 157                 die "Patches directory doesn't exist, try guilt-init"
 158         [ ! -d "$GIT_DIR/patches/$branch" ] &&
 159                 die "Branch $branch is not initialized, try guilt-init"
 160         [ ! -f "$GIT_DIR/patches/$branch/series" ] &&
 161                 die "Branch $branch does not have a series file"
 162         [ ! -f "$GIT_DIR/patches/$branch/status" ] &&
 163                 die "Branch $branch does not have a status file"
 164         [ -f "$GIT_DIR/patches/$branch/applied" ] &&
 165                 die "Warning: Branch $branch has 'applied' file - guilt is not compatible with stgit"
 166 }
 167
 168 get_top()
 169 {
 170         tail -1 "$GUILT_DIR/$branch/status"
 171 }
 172
 173 get_prev()
 174 {
 175         if [ `wc -l < "$GUILT_DIR/$branch/status"` -gt 1 ]; then
 176                 tail -n 2 "$GUILT_DIR/$branch/status" | head -n 1
 177         fi
 178 }
 179
 180 get_full_series()
 181 {
 182         # ignore all lines matching:
 183         #       - empty lines
 184         #       - whitespace only
 185         #       - optional whitespace followed by '#' followed by more
 186         #         optional whitespace
 187         # also remove comments from end of lines
 188         sed -n -e "/^[[:space:]]*\(#.*\)*\$/ ! {
 189                 s/[[:space:]]*#.*\$//
 190
 191                 p
 192                 }
 193                 " $series
 194 }
 195
 196 get_series()
 197 {
 198         get_full_series | while read p; do
 199                 check_guards "$p" && echo "$p"
 200         done
 201 }
 202
 203 # usage: check_guards <patch>
 204 # Returns 0 if the patch should be pushed
 205 check_guards()
 206 {
 207         get_guards "$1" | while read guard; do
 208                 g=`echo $guard | sed "s/^[+-]//"`
 209                 case "$guard" in
 210                         +*)
 211                                 # Push +guard *only if* guard selected
 212                                 silent grep -F "$g" "$guards_file" || return 1
 213                                 ;;
 214                         -*)
 215                                 # Push -guard *unless* guard selected
 216                                 silent grep -F "$g" "$guards_file" && return 1
 217                                 true
 218                                 ;;
 219                 esac
 220         done
 221
 222         # propagate return from subshell
 223         return $?
 224 }
 225
 226 # usage: get_guards <patch>
 227 get_guards()
 228 {
 229         awk -v pname="$1" '
 230 ($1 == pname) {
 231         guards = "";
 232
 233         for(i=2; i<=NF; i++) {
 234                 sub(/#[^+-]*/, "", $i);
 235                 if (length($i)) {
 236                         if (length(guards))
 237                                 guards = guards " " $i;
 238                         else
 239                                 guards = $i;
 240                 }
 241         }
 242
 243         print guards;
 244 }' < "$series"
 245 }
 246
 247 # usage: set_guards <patch> <guards...>
 248 set_guards()
 249 {
 250         (
 251                 p="$1"
 252                 shift
 253                 for x in "$@"; do
 254                         case "$x" in
 255                                 [+-]*)
 256                                         awk -v pname="$p" -v newguard="$x" '{
 257 if ($1 == pname)
 258         print $0 " #" newguard;
 259 else
 260         print $0;
 261 }' < "$series" > "$series.tmp"
 262                                         mv "$series.tmp" "$series"
 263                                         ;;
 264                                 *)
 265                                         echo "'$x' is not a valid guard name" >&2
 266                                         ;;
 267                         esac
 268                 done
 269         )
 270 }
 271
 272 # usage: unset_guards <patch> <guards...>
 273 unset_guards()
 274 {
 275         (
 276                 p="$1"
 277                 shift
 278                 for x in "$@"; do
 279                         awk -v pname="$p" -v oldguard="$x" '{
 280 if ($1 == pname) {
 281         guards = "";
 282
 283         for(i=2; i<=NF; i++) {
 284                 if ($i == "#" oldguard)
 285                         continue;
 286
 287                 if (length(guards))
 288                         guards = guards " " $i;
 289                 else
 290                         guards = $i;
 291         }
 292
 293         if (length(guards))
 294                 print $1 " " guards;
 295         else
 296                 print $1;
 297 } else
 298         print $0;
 299 }' < "$series" > "$series.tmp"
 300                         mv "$series.tmp" "$series"
 301                 done
 302         )
 303 }
 304
 305 # usage: do_make_header <hash>
 306 do_make_header()
 307 {
 308         # we should try to work with commit objects only
 309         if [ `git cat-file -t "$1"` != "commit" ]; then
 310                 disp "Hash $1 is not a commit object" >&2
 311                 disp "Aborting..." >&2
 312                 exit 2
 313         fi
 314
 315         git cat-file -p "$1" | awk '
 316                 BEGIN{headers=1; firstline=1}
 317                 /^author / && headers {
 318                         sub(/^author +/, "");
 319                         sub(/ [0-9]* [+-]*[0-9][0-9]*$/, "");
 320                         author=$0
 321                 }
 322                 !headers {
 323                         print
 324                         if (firstline) {
 325                                 firstline = 0;
 326                                 print "\nFrom: " author;
 327                         }
 328                 }
 329                 /^$/ && headers { headers = 0 }
 330         '
 331 }
 332
 333 # usage: do_get_patch patchfile
 334 do_get_patch()
 335 {
 336         cat "$1" | awk '
 337 BEGIN{}
 338 /^(diff |---$|--- )/,/END{}/
 339 '
 340 }
 341
 342 # usage: do_get_header patchfile
 343 do_get_header()
 344 {
 345         # The complexity arises from the fact that we want to ignore the
 346         # From line and the empty line after it if it exists
 347
 348         # 2nd line skips the From line
 349         # 3rd line skips the empty line right after a From line
 350         # 4th line terminates execution when we encounter the diff
 351         cat "$1" | awk '
 352 BEGIN{skip=0}
 353 /^Subject:/ && (NR==1){print substr($0, 10); next}
 354 /^From:/{skip=1; next}
 355 /^[ \t\f\n\r\v]*$/ && (skip==1){skip=0; next}
 356 /^(diff |---$|--- )/{exit}
 357 {print $0}
 358 END{}
 359 '
 360 }
 361
 362 # usage: do_get_full_header patchfile
 363 do_get_full_header()
 364 {
 365         # 2nd line checks for the begining of a patch
 366         # 3rd line outputs the line if it didn't get pruned by the above rules
 367         cat "$1" | awk '
 368 BEGIN{}
 369 /^(diff |---$|--- )/{exit}
 370 {print $0}
 371 END{}
 372 '
 373 }
 374
 375 # usage: assert_head_check
 376 assert_head_check()
 377 {
 378         if ! head_check refs/patches/$branch/`get_top`; then
 379                 die "aborting..."
 380         fi
 381 }
 382
 383 # usage: head_check <expected hash>
 384 head_check()
 385 {
 386         # make sure we're not doing funky things to commits that don't
 387         # belong to us
 388
 389         case "$1" in
 390                 '')
 391                         # the expected hash is empty
 392                         return 0 ;;
 393                 refs/patches/$branch/)
 394                         # the expected hash is an invalid rev
 395                         return 0 ;;
 396         esac
 397
 398         if [ "`git rev-parse refs/heads/$branch`" != "`git rev-parse $1`" ]; then
 399                 disp "Expected HEAD commit $1" >&2
 400                 disp "                 got `git rev-parse refs/heads/$branch`" >&2
 401                 return 1
 402         fi
 403         return 0
 404 }
 405
 406 # usage: series_insert_patch <patchname>
 407 series_insert_patch()
 408 {
 409         awk -v top="`get_top`" -v new="$1" \
 410                 'BEGIN{if (top == "") print new;}
 411                 {
 412                         print $0;
 413                         if (top != "" && top == $0) print new;
 414                 }' "$series" > "$series.tmp"
 415         mv "$series.tmp" "$series"
 416 }
 417
 418 # usage: series_remove_patch <patchname>
 419 series_remove_patch()
 420 {
 421         grep -v "^$1\([[:space:]].*\)\?$" < "$series" > "$series.tmp"
 422         mv "$series.tmp" "$series"
 423 }
 424
 425 # usage: series_rename_patch <oldname> <newname>
 426 series_rename_patch()
 427 {
 428         # Rename the patch, but preserve comments on the line
 429         awk -v old="$1" -v new="$2" '
 430 {
 431         if (index($0, old) == 1)
 432                 print new substr($0, length(old) + 1);
 433         else
 434                 print $0;
 435 }' "$series" > "$series.tmp"
 436
 437         mv "$series.tmp" "$series"
 438 }
 439
 440 # usage: series_rename_patch <oldpatchname> <newpatchname>
 441 ref_rename_patch()
 442 {
 443         git update-ref "refs/patches/$branch/$2" `git rev-parse "refs/patches/$branch/$1"`
 444         remove_ref "refs/patches/$branch/$1"
 445 }
 446
 447 # Beware! This is one of the few (only?) places where we modify the applied
 448 # file directly
 449 #
 450 # usage: applied_rename_patch <oldname> <newname>
 451 applied_rename_patch()
 452 {
 453         awk -v old="$1" -v new="$2" \
 454                         'BEGIN{FS=":"}
 455                         { if ($0 == old)
 456                                 print new;
 457                         else
 458                                 print;
 459                         }' "$applied" > "$applied.tmp"
 460
 461         mv "$applied.tmp" "$applied"
 462 }
 463
 464 # usage: remove_patch_refs
 465 # reads patch names from stdin
 466 remove_patch_refs()
 467 {
 468         while read pname; do
 469                 remove_ref "refs/patches/$branch/$pname"
 470         done
 471 }
 472
 473 # usage: pop_many_patches <commitish> <number of patches>
 474 pop_many_patches()
 475 {
 476         assert_head_check
 477
 478         (
 479                 cd_to_toplevel
 480
 481                 # remove the patches refs
 482                 tail -$2 < "$applied" | remove_patch_refs
 483
 484                 git reset --hard "$1" > /dev/null
 485                 head -n "-$2" < "$applied" > "$applied.tmp"
 486                 mv "$applied.tmp" "$applied"
 487         )
 488 }
 489
 490 # usage: pop_all_patches
 491 pop_all_patches()
 492 {
 493         pop_many_patches \
 494                 `git rev-parse refs/patches/$branch/$(head -1 "$applied")^` \
 495                 `wc -l < "$applied"`
 496 }
 497
 498 # usage: remove_ref <refname>
 499 remove_ref()
 500 {
 501         (
 502                 # does the ref exist?
 503                 r=`git show-ref --verify -s "$1" 2> /dev/null`
 504                 [ $? -ne 0 ] && exit 0
 505
 506                 # remove it
 507                 git update-ref -d "$1" "$r"
 508         )
 509 }
 510
 511 # usage: commit patchname parent
 512 commit()
 513 {
 514         (
 515                 TMP_MSG=`get_tmp_file msg`
 516
 517                 p="$GUILT_DIR/$branch/$1"
 518                 pname="$1"
 519                 cd_to_toplevel
 520
 521                 git diff-files --name-only | (while read n; do git update-index "$n" ; done)
 522
 523                 # grab a commit message out of the patch
 524                 do_get_header "$p" > "$TMP_MSG"
 525
 526                 # make a default commit message if patch doesn't contain one
 527                 [ ! -s "$TMP_MSG" ] && echo "patch $pname" > "$TMP_MSG"
 528
 529                 # extract a From line from the patch header, and set
 530                 # GIT_AUTHOR_{NAME,EMAIL}
 531                 author_str=`sed -n -e '/^From:/ { s/^From: //; p; q; }; /^(diff |---$|--- )/ q' "$p"`
 532                 if [ ! -z "$author_str" ]; then
 533                         GIT_AUTHOR_NAME=`echo $author_str | sed -e 's/ *<.*$//'`
 534                         export GIT_AUTHOR_NAME="${GIT_AUTHOR_NAME:-" "}"
 535                         export GIT_AUTHOR_EMAIL="`echo $author_str | sed -e 's/[^<]*//'`"
 536                 fi
 537
 538                 # must strip nano-second part otherwise git gets very
 539                 # confused, and makes up strange timestamps from the past
 540                 # (chances are it decides to interpret it as a unix
 541                 # timestamp).
 542                 export GIT_AUTHOR_DATE="`stat -c %y "$p" | sed -e '
 543 s/^\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\) \([0-9]\{2\}\):\([0-9]\{2\}\):\([0-9]\{2\}\)\.[0-9]* \(.*\)$/\1-\2-\3 \4:\5:\6 \7/'`"
 544                 export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
 545
 546                 # commit
 547                 treeish=`git write-tree`
 548                 commitish=`git commit-tree $treeish -p $2 < "$TMP_MSG"`
 549                 git update-ref HEAD $commitish
 550
 551                 # mark patch as applied
 552                 git update-ref "refs/patches/$branch/$pname" HEAD
 553
 554                 rm -f "$TMP_MSG"
 555         )
 556 }
 557
 558 # usage: push_patch patchname [bail_action]
 559 push_patch()
 560 {
 561         __push_patch_bail=0
 562
 563         (
 564                 TMP_LOG=`get_tmp_file log`
 565
 566                 p="$GUILT_DIR/$branch/$1"
 567                 pname="$1"
 568                 bail_action="$2"
 569                 reject="--reject"
 570
 571                 assert_head_check
 572                 cd_to_toplevel
 573
 574                 # apply the patch if and only if there is something to apply
 575                 if [ `git apply --numstat "$p" | wc -l` -gt 0 ]; then
 576                         if [ "$bail_action" = abort ]; then
 577                                 reject=""
 578                         fi
 579                         git apply -C$guilt_push_diff_context --index \
 580                                 $reject "$p" > /dev/null 2> "$TMP_LOG"
 581                         __push_patch_bail=$?
 582
 583                         if [ $__push_patch_bail -ne 0 ]; then
 584                                 cat "$TMP_LOG" >&2
 585                                 if [ "$bail_action" = "abort" ]; then
 586                                         rm -f "$TMP_LOG" "$TMP_MSG"
 587                                         return $__push_patch_bail
 588                                 fi
 589                         fi
 590                 fi
 591
 592                 commit "$pname" HEAD
 593
 594                 echo "$pname" >> $applied
 595
 596                 rm -f "$TMP_LOG"
 597         )
 598
 599         # sub-shell funky-ness
 600         __push_patch_bail=$?
 601
 602         return $__push_patch_bail
 603 }
 604
 605 # usage: must_commit_first
 606 must_commit_first()
 607 {
 608         git update-index --refresh --unmerged -q > /dev/null
 609         [ `git diff-files | wc -l` -eq 0 ] || return $?
 610         [ `git diff-index HEAD | wc -l` -eq 0 ]
 611         return $?
 612 }
 613
 614 # usage: fold_patch patchname
 615 fold_patch()
 616 {
 617         set -- "$1" "`get_top`"
 618
 619         assert_head_check
 620
 621         push_patch "$1"
 622
 623         # merge the patch headers
 624         (
 625                 pcur="$GUILT_DIR/$branch/$2"
 626                 pnext="$GUILT_DIR/$branch/$1"
 627                 TMP_CUR=`get_tmp_file diff-cur`
 628                 TMP_NEXT=`get_tmp_file diff-next`
 629                 TMP_DIFF=`get_tmp_file diff`
 630                 do_get_full_header "$pcur" > "$TMP_CUR"
 631                 do_get_full_header "$pnext" > "$TMP_NEXT"
 632                 do_get_patch "$pcur" > "$TMP_DIFF"
 633
 634                 case "`stat -c %s \"$TMP_CUR\"`,`stat -c %s \"$TMP_NEXT\"`" in
 635                         *,0)
 636                                 # since the new patch header is empty, we
 637                                 # don't have to do anything
 638                                 ;;
 639                         0,*)
 640                                 # current is empty; new is not
 641                                 mv "$pcur" "$pcur~"
 642                                 cat "$TMP_NEXT" > "$pcur"
 643                                 cat "$TMP_DIFF" >> "$pcur"
 644                                 ;;
 645                         *,*)
 646                                 mv "$pcur" "$pcur~"
 647                                 cat "$TMP_CUR" > "$pcur"
 648                                 echo >> "$pcur"
 649                                 echo "Header from folded patch '$1':" >> "$pcur"
 650                                 echo >> "$pcur"
 651                                 cat "$TMP_NEXT" >> "$pcur"
 652                                 cat "$TMP_DIFF" >> "$pcur"
 653                                 ;;
 654                 esac
 655
 656                 rm -f "$TMP_CUR" "$TMP_NEXT" "$TMP_DIFF"
 657         )
 658
 659         __refresh_patch "$2" HEAD^^ 2 "" ""
 660
 661         series_remove_patch "$1"
 662 }
 663
 664 # usage: refresh_patch patchname gengitdiff incldiffstat
 665 refresh_patch()
 666 {
 667         __refresh_patch "$1" HEAD^ 1 "$2" "$3"
 668 }
 669
 670 # usage: __refresh_patch patchname commitish number_of_commits gengitdiff
 671 #                        incldiffstat
 672 __refresh_patch()
 673 {
 674         assert_head_check
 675
 676         (
 677                 TMP_DIFF=`get_tmp_file diff`
 678
 679                 cd_to_toplevel
 680                 p="$GUILT_DIR/$branch/$1"
 681                 pname="$1"
 682
 683                 # get the patch header
 684                 do_get_full_header "$p" > "$TMP_DIFF"
 685
 686                 [ ! -z "$4" ] && diffopts="-C -M --find-copies-harder"
 687
 688                 if [ -n "$5" -o $diffstat = "true" ]; then
 689                         (
 690                                 echo "---"
 691                                 git diff --stat $diffopts "$2"
 692                                 echo ""
 693                         ) >> "$TMP_DIFF"
 694                 fi
 695
 696                 # get the new patch
 697                 git diff --binary $diffopts "$2" >> "$TMP_DIFF"
 698
 699                 # move the new patch in
 700                 mv "$p" "$p~"
 701                 mv "$TMP_DIFF" $p
 702
 703                 # commit
 704                 commit "$pname" "HEAD~$3"
 705
 706                 # drop folded patches
 707                 N=`expr "$3" - 1`
 708
 709                 # remove the patches refs
 710                 tail -$N < "$applied" | remove_patch_refs
 711
 712                 head -n "-$N" < "$applied" > "$applied.tmp"
 713                 mv "$applied.tmp" "$applied"
 714         )
 715 }
 716
 717 # usage: munge_hash_range <hash range>
 718 #
 719 # this means:
 720 #       <hash>                  - one commit
 721 #       <hash>..                - hash until head (excludes hash, includes head)
 722 #       ..<hash>                - until hash (includes hash)
 723 #       <hash1>..<hash2>        - from hash to hash (inclusive)
 724 #
 725 # The output of this function is suitable to be passed to "git rev-list"
 726 munge_hash_range()
 727 {
 728         case "$1" in
 729                 *..*..*|*\ *)
 730                         # double .. or space is illegal
 731                         return 1;;
 732                 ..*)
 733                         # e.g., "..v0.10"
 734                         echo ${1#..};;
 735                 *..)
 736                         # e.g., "v0.19.."
 737                         echo ${1%..}..HEAD;;
 738                 *..*)
 739                         # e.g., "v0.19-rc1..v0.19"
 740                         echo ${1%%..*}..${1#*..};;
 741                 ?*)
 742                         # e.g., "v0.19"
 743                         echo $1^..$1;;
 744                 *)  # empty
 745                         return 1;;
 746         esac
 747         return 0
 748 }
 749
 750 # usage: get_tmp_file <prefix> [<opts>]
 751 #
 752 # Get a unique filename and create the file in a non-racy way
 753 get_tmp_file()
 754 {
 755         while true; do
 756                 mktemp $2 "/tmp/guilt.$1.XXXXXXXXXXXXXXX" && break
 757         done
 758 }
 759
 760 # usage: guilt_hook <hook name> <args....>
 761 guilt_hook()
 762 {
 763         __hookname="$1"
 764         [ ! -x "$GIT_DIR/hooks/guilt/$__hookname" ] && return 0
 765
 766         shift
 767
 768         "$GIT_DIR/hooks/guilt/$__hookname" "$@"
 769         return $?
 770 }
 771
 772 #
 773 # Some constants
 774 #
 775
 776 # used for: git apply -C <val>
 777 guilt_push_diff_context=1
 778
 779 # default diffstat value: true or false
 780 DIFFSTAT_DEFAULT="false"
 781
 782 #
 783 # Parse any part of .git/config that belongs to us
 784 #
 785
 786 # generate diffstat?
 787 diffstat=`git config --bool guilt.diffstat`
 788 [ -z "$diffstat" ] && diffstat=$DIFFSTAT_DEFAULT
 789
 790 #
 791 # The following gets run every time this file is source'd
 792 #
 793
 794 GUILT_DIR="$GIT_DIR/patches"
 795
 796 branch=`get_branch`
 797
 798 # most of the time we want to verify that the repo's branch has been
 799 # initialized, but every once in a blue moon (e.g., we want to run guilt-init),
 800 # we must avoid the checks
 801 if [ -z "$DO_NOT_CHECK_BRANCH_EXISTENCE" ]; then
 802         verify_branch
 803
 804         # do not check the status file format (guilt-repair needs this,
 805         # otherwise nothing can do what's necessary to bring the repo into a
 806         # useable state)
 807         if [ -z "$DO_NOT_CHECK_STATUS_FILE_FORMAT" ]; then
 808                 [ -s "$GIT_DIR/patches/$branch/status" ] &&
 809                         grep "^[0-9a-f]\{40\}:" "$GIT_DIR/patches/$branch/status" > /dev/null &&
 810                         die "Status file appears to use old format, try guilt-repair --status"
 811         fi
 812 fi
 813
 814 # very useful files
 815 series="$GUILT_DIR/$branch/series"
 816 applied="$GUILT_DIR/$branch/status"
 817 guards_file="$GUILT_DIR/$branch/guards"
 818
 819 # determine a pager to use for anything interactive (fall back to more)
 820 pager="more"
 821 [ ! -z "$PAGER" ] && pager="$PAGER"