FilesExpand file tree

master

/

gitvimdiff

Copy path

Blame

More file actions

Blame

More file actions

Latest commit

 

History

History

History

74 lines (71 loc) · 2.02 KB

master

/

gitvimdiff

Copy path

Top

File metadata and controls

• Code
• Blame

74 lines (71 loc) · 2.02 KB

Raw

Copy raw file

Download raw file

Open symbols panel

Edit and raw actions

1

2

3

4

5

6

7

8

9

10

11

12

13

14

15

16

17

18

19

20

21

22

23

24

25

26

27

28

29

30

31

32

33

34

35

36

37

38

39

40

41

42

43

44

45

46

47

48

49

50

51

52

53

54

55

56

57

58

59

60

61

62

63

64

65

66

67

68

69

70

71

72

73

74

#!/bin/bash

#

# Copyright (C) 2007,

# Geoff Buchan <geoffrey.buchan@gmail.com>

# Based on the script cvsvimdiff, written by

# Stefano Zacchiroli <zack@cs.unibo.it>

# Enrico Tassi <tassi@cs.unibo.it>

#

# This is free software, you can redistribute it and/or modify it under the

# terms of the GNU General Public License version 2 as published by the Free

# Software Foundation.

#

vimdiff="vimdiff"

suffix="vimgitdiff"

if [[ $1 == "-g" ]] ; then

vimdiff="gvimdiff -f"

shift 1

fi

if [[ $# < 0 || $1 == "--help" || $1 == "-h" ]] ; then

echo "gitvimdiff - script to show git diff in vimdiff format"

echo ""

echo "gitvimdiff [options] file"

echo ""

echo "Option:"

echo "-g Use gvimdiff (graphical mode) instead of vimdiff"

echo "All other options are passed to git diff"

echo ""

echo "If file is omitted it will cycle through all changed files in"

echo "the current directory."

exit 1

fi

# Assume the last argument is the filename.

# Save everything to pass to svn diff

if (( $# > 0 )) ; then

shift_args=$(($# - 1))

else

shift_args=$#

fi

args=$*

shift $shift_args

files="$1"

patch=`tempfile --suffix $suffix`

tempfiles="$patch"

if [ -z $files ] || ! [ -f $files ] ; then

# No file given, so loop over all files svn st says have changed

files=$(git status 2> /dev/null | grep -e "modified:" | sed '{s/\tmodified://;}')

for f in $files; do

if ! [ -f $f ]; then break; fi

orig=`tempfile --suffix $suffix`

filename=`basename $f`

orig=$orig"."$filename

cp "$f" $orig

git diff $args $f > $patch

if ! [ $? -eq 0 ]; then break; fi

patch -R -p0 $orig $patch

$vimdiff $orig $f

tempfiles+=" $orig"

trap "rm -f $tempfiles" EXIT

done

else

# file given, so just work with that one

filename=`basename $files`

orig=$orig"."$filename

cp $files $orig

git diff $args > $patch

if ! [ $? -eq 0 ]; then break; fi

patch -R -p0 $orig $patch

$vimdiff $orig $files

tempfiles+=" $orig"

trap "rm -f $tempfiles" EXIT

fi