# [PATCH] add get_sha1_with_mode

2 messages from 2007-04-23 to 2007-04-23. Participants: Martin Koegler, Junio C Hamano.
Thread: https://gitlist.dev/t/7803

## Martin Koegler, 2007-04-23 20:55

Subject: [PATCH] add get_sha1_with_mode
Message-ID: <11773617051833-git-send-email-mkoegler@auto.tuwien.ac.at>
URL: https://gitlist.dev/e/11773617051833-git-send-email-mkoegler%40auto.tuwien.ac.at

```
get_sha1_with_mode basically behaves as get_sha1. It has an additional
parameter for storing the mode of the object.

If the mode can not be determined, it stores S_IFINVALID.

Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at>
---
 cache.h     |    1 +
 sha1_name.c |   11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/cache.h b/cache.h
index b1adbe7..23e8f24 100644
--- a/cache.h
+++ b/cache.h
@@ -342,6 +342,7 @@ static inline unsigned int hexval(unsigned int c)
 #define DEFAULT_ABBREV 7
 
 extern int get_sha1(const char *str, unsigned char *sha1);
+extern int get_sha1_with_mode(const char *str, unsigned char *sha1, unsigned *mode);
 extern int get_sha1_hex(const char *hex, unsigned char *sha1);
 extern char *sha1_to_hex(const unsigned char *sha1);	/* static buffer result! */
 extern int read_ref(const char *filename, unsigned char *sha1);
diff --git a/sha1_name.c b/sha1_name.c
index b0b12bb..55f25a2 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -643,11 +643,17 @@ static int get_sha1_oneline(const char *prefix, unsigned char *sha1)
  */
 int get_sha1(const char *name, unsigned char *sha1)
 {
-	int ret, bracket_depth;
 	unsigned unused;
+	return get_sha1_with_mode(name, sha1, &unused);
+}
+
+int get_sha1_with_mode(const char *name, unsigned char *sha1, unsigned *mode)
+{
+	int ret, bracket_depth;
 	int namelen = strlen(name);
 	const char *cp;
 
+	*mode = S_IFINVALID;
 	prepare_alt_odb();
 	ret = get_sha1_1(name, namelen, sha1);
 	if (!ret)
@@ -685,6 +691,7 @@ int get_sha1(const char *name, unsigned char *sha1)
 				break;
 			if (ce_stage(ce) == stage) {
 				hashcpy(sha1, ce->sha1);
+				*mode = ntohl(ce->ce_mode);
 				return 0;
 			}
 			pos++;
@@ -703,7 +710,7 @@ int get_sha1(const char *name, unsigned char *sha1)
 		unsigned char tree_sha1[20];
 		if (!get_sha1_1(name, cp-name, tree_sha1))
 			return get_tree_entry(tree_sha1, cp+1, sha1,
-					      &unused);
+					      mode);
 	}
 	return ret;
 }
-- 
1.5.1.1.199.g1a18-dirty

```

## Junio C Hamano, 2007-04-23 21:19

Subject: Re: [PATCH] add get_sha1_with_mode
Message-ID: <7vr6qaeqlq.fsf@assigned-by-dhcp.cox.net>
URL: https://gitlist.dev/e/7vr6qaeqlq.fsf%40assigned-by-dhcp.cox.net
In-Reply-To: <11773617051833-git-send-email-mkoegler@auto.tuwien.ac.at>

```
I queued your previous one in 'pu' (proposed updates) already.
I'll replace it with this; thanks.

There in the 'pu' branch, I also have a fix-up patch on top of
your series to actually make "git diff tree1:path tree2:path"
work when there is only mode change between the blobs.

```